gpio: Refactor to align upcoming adc

Reorder in before out to minimise diff

Use self instead of _this generated by babel.js for IoT.js

Change-Id: I53a9d97f645be63d33e942706105ffbc7ddc0d46
Signed-off-by: Philippe Coval <[email protected]>

Author: rzr

example/platform/gpio/gpio-property.js

@@ -22,93 +22,90 @@ const {
 
 const gpio = require('gpio');
 
-class GpioOutProperty extends Property {
+class GpioInProperty extends Property {
   constructor(thing, name, value, metadata, config) {
-    const valueObject = new Value(value, (value) => {
-      this.handleValueChanged && this.handleValueChanged(value);
+    const valueObject = new Value(Boolean(value), () => {
     });
     super(thing, name, valueObject,
           {
-            '@type': 'OnOffProperty',
+            '@type': 'BooleanProperty',
             label: (metadata && metadata.label) || `On/Off: ${name}`,
             type: 'boolean',
-            description: (metadata && metadata.description) ||
-              (`GPIO Actuator on pin=${config.pin}`),
+            readOnly: true,
+            description:
+            (metadata && metadata.description) ||
+              (`GPIO Sensor on pin=${config.pin}`),
           });
-    const _this = this;
+    const self = this;
     this.config = config;
-
+    const callback = () => {
+      log(`log: GPIO: ${self.getName()}: open:`);
+      self.port.on('change', (value) => {
+        value = Boolean(value);
+        log(`log: GPIO: ${self.getName()}: change: ${value}`);
+        self.value.notifyOfExternalUpdate(value);
+      });
+    };
     this.port = gpio.export(config.pin,
-                            {direction: 'out',
-                             ready: () => {
-                               log(`log: GPIO: ${_this.getName()}: open:`);
-                               _this.handleValueChanged = (value) => {
-                                 try {
-                                   log(`log: GPIO: ${_this.getName()}: \
-writing: ${value}`);
-                                   _this.port.set(value);
-                                 } catch (err) {
-                                   console.error(`error: GPIO: 
-${_this.getName()}: Fail to write: ${err}`);
-                                   return err;
-                                 }
-                               };
-                             }});
+                            {direction: 'in', ready: callback});
   }
 
   close() {
-    const _this = this;
     try {
       this.port && this.port.unexport(this.config.pin);
     } catch (err) {
-      console.error(`error: GPIO: ${this.getName()}: Fail to close: ${err}`);
+      console.error(`error: GPIO: ${this.getName()} close:${err}`);
       return err;
     }
-    log(`log: GPIO: ${_this.getName()}: close:`);
+    log(`log: GPIO: ${this.getName()}: close:`);
   }
 }
 
-
-class GpioInProperty extends Property {
+class GpioOutProperty extends Property {
   constructor(thing, name, value, metadata, config) {
-    super(thing, name, new Value(Boolean(value)),
+    const valueObject = new Value(value, (value) => {
+      this.handleValueChanged && this.handleValueChanged(value);
+    });
+    super(thing, name, valueObject,
           {
-            '@type': 'BooleanProperty',
+            '@type': 'OnOffProperty',
             label: (metadata && metadata.label) || `On/Off: ${name}`,
             type: 'boolean',
-            readOnly: true,
-            description:
-            (metadata && metadata.description) ||
-              (`GPIO Sensor on pin=${config.pin}`),
+            description: (metadata && metadata.description) ||
+              (`GPIO Actuator on pin=${config.pin}`),
           });
-    const _this = this;
+    const self = this;
     this.config = config;
-    const callback = () => {
-      log(`log: GPIO: ${_this.getName()}: open:`);
-      _this.port.on('change', (value) => {
-        value = Boolean(value);
-        log(`log: GPIO: ${_this.getName()}: change: ${value}`);
-        _this.value.notifyOfExternalUpdate(value);
-      });
-    };
+
     this.port = gpio.export(config.pin,
-                            {direction: 'in', ready: callback});
+                            {direction: 'out',
+                             ready: () => {
+                               log(`log: GPIO: ${self.getName()}: open:`);
+                               self.handleValueChanged = (value) => {
+                                 try {
+                                   log(`log: GPIO: ${self.getName()}: \
+writing: ${value}`);
+                                   self.port.set(value);
+                                 } catch (err) {
+                                   console.error(`error: GPIO: 
+${self.getName()}: Fail to write: ${err}`);
+                                   return err;
+                                 }
+                               };
+                             }});
   }
 
   close() {
-    const _this = this;
     try {
-      this.inverval && clearInterval(this.inverval);
       this.port && this.port.unexport(this.config.pin);
     } catch (err) {
-      console.error(`error: GPIO: ${this.getName()} close:${err}`);
+      console.error(`error: GPIO: ${this.getName()}: Fail to close: ${err}`);
       return err;
     }
-    log(`log: GPIO: ${_this.getName()}: close:`);
+    log(`log: GPIO: ${self.getName()}: close:`);
   }
 }
 
-
 function GpioProperty(thing, name, value, metadata, config) {
   if (config.direction === 'out') {
     return new GpioOutProperty(thing, name, value, metadata, config);