1.0.5 version fix basic, 4ch

Maxmudjon · Jun 15, 2020 · 0e4340e · 0e4340e
1 parent d3b88e2
commit 0e4340e
Show file tree

Hide file tree

Showing 6 changed files with 186 additions and 9 deletions.
diff --git a/app.json b/app.json
@@ -1,6 +1,6 @@
 {
   "id": "com.maxmudjon.ewelink",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "compatibility": ">=2.2.0",
   "sdk": 2,
   "name": {
@@ -2419,5 +2419,126 @@
         }
       ]
     }
-  ]
+  ],
+  "flow": {
+    "actions": [
+      {
+        "id": "secondChannelOn",
+        "title": {
+          "en": "Second channel turn on"
+        },
+        "args": [
+          {
+            "name": "device",
+            "type": "device",
+            "filter": "driver_id=sonoff-4ch-pro"
+          }
+        ]
+      },
+      {
+        "id": "secondChannelOff",
+        "title": {
+          "en": "Second channel turn off"
+        },
+        "args": [
+          {
+            "name": "device",
+            "type": "device",
+            "filter": "driver_id=sonoff-4ch-pro"
+          }
+        ]
+      },
+      {
+        "id": "secondChannelToggle",
+        "title": {
+          "en": "Second channel turn on or off"
+        },
+        "args": [
+          {
+            "name": "device",
+            "type": "device",
+            "filter": "driver_id=sonoff-4ch-pro"
+          }
+        ]
+      },
+      {
+        "id": "threeChannelOn",
+        "title": {
+          "en": "Three channel turn on"
+        },
+        "args": [
+          {
+            "name": "device",
+            "type": "device",
+            "filter": "driver_id=sonoff-4ch-pro"
+          }
+        ]
+      },
+      {
+        "id": "threeChannelOff",
+        "title": {
+          "en": "Three channel turn off"
+        },
+        "args": [
+          {
+            "name": "device",
+            "type": "device",
+            "filter": "driver_id=sonoff-4ch-pro"
+          }
+        ]
+      },
+      {
+        "id": "threeChannelToggle",
+        "title": {
+          "en": "Three channel turn on or off"
+        },
+        "args": [
+          {
+            "name": "device",
+            "type": "device",
+            "filter": "driver_id=sonoff-4ch-pro"
+          }
+        ]
+      },
+      {
+        "id": "fourChannelOn",
+        "title": {
+          "en": "Four channel turn on"
+        },
+        "args": [
+          {
+            "name": "device",
+            "type": "device",
+            "filter": "driver_id=sonoff-4ch-pro"
+          }
+        ]
+      },
+      {
+        "id": "fourChannelOff",
+        "title": {
+          "en": "Four channel turn off"
+        },
+        "args": [
+          {
+            "name": "device",
+            "type": "device",
+            "filter": "driver_id=sonoff-4ch-pro"
+          }
+        ]
+      },
+      {
+        "id": "fourChannelToggle",
+        "title": {
+          "en": "Four channel turn on or off"
+        },
+        "args": [
+          {
+            "name": "device",
+            "type": "device",
+            "filter": "driver_id=sonoff-4ch-pro"
+          }
+        ]
+      }
+    ]
+  }
 }
diff --git a/drivers/sonoff-4ch-pro/device.js b/drivers/sonoff-4ch-pro/device.js
@@ -7,19 +7,30 @@ class Sonoff4CHPro extends Homey.Device {
     this.log("Sonoff Basic has been inited");
     this.driver = this.getDriver();
     this.data = this.getData();
+    this.handleStateChange = this.handleStateChange.bind(this);
     this.registerStateChangeListener();
     this.registerChannelToggle("onoff");
     this.registerChannelToggle("onoff.1");
     this.registerChannelToggle("onoff.2");
     this.registerChannelToggle("onoff.3");
     this.saving = false;
+    const { actions } = this.driver;
+    this.registerToggleAction("onoff.1", actions.secondChannelOn);
+    this.registerToggleAction("onoff.1", actions.secondChannelOff);
+    this.registerToggleAction("onoff.1", actions.secondChannelToggle);
+    this.registerToggleAction("onoff.2", actions.threeChannelOn);
+    this.registerToggleAction("onoff.2", actions.threeChannelOff);
+    this.registerToggleAction("onoff.2", actions.threeChannelToggle);
+    this.registerToggleAction("onoff.3", actions.fourChannelOn);
+    this.registerToggleAction("onoff.3", actions.fourChannelOff);
+    this.registerToggleAction("onoff.3", actions.fourChannelToggle);
   }
 
   handleStateChange(device) {
-    console.log("TCL: Sonoff4CHPro -> handleStateChange -> device", device);
     if (device.params) {
       if (device.params.switch == "on") this.updateCapabilityValue("onoff", true);
       if (device.params.switch == "off") this.updateCapabilityValue("onoff", false);
+
       if (device.params.startup && !this.saving)
         this.setSettings({
           powerResponse: device.params.startup
@@ -109,12 +120,42 @@ class Sonoff4CHPro extends Homey.Device {
     });
   }
 
+  registerToggleAction(name, action) {
+    action.registerRunListener(async (args, state) => {
+      let channels = [{ outlet: 0, switch: "on" }, { outlet: 1, switch: "on" }, { outlet: 2, switch: "on" }, { outlet: 3, switch: "on" }];
+      if (name == "onoff") {
+        channels[0].switch = value ? "on" : "off";
+        channels[1].switch = args.device.getCapabilityValue("onoff.1") ? "on" : "off";
+        channels[2].switch = args.device.getCapabilityValue("onoff.2") ? "on" : "off";
+        channels[3].switch = args.device.getCapabilityValue("onoff.3") ? "on" : "off";
+      } else if (name == "onoff.1") {
+        channels[0].switch = args.device.getCapabilityValue("onoff") ? "on" : "off";
+        channels[1].switch = value ? "on" : "off";
+        channels[2].switch = args.device.getCapabilityValue("onoff.2") ? "on" : "off";
+        channels[3].switch = args.device.getCapabilityValue("onoff.3") ? "on" : "off";
+      } else if (name == "onoff.2") {
+        channels[0].switch = args.device.getCapabilityValue("onoff") ? "on" : "off";
+        channels[1].switch = args.device.getCapabilityValue("onoff.1") ? "on" : "off";
+        channels[2].switch = value ? "on" : "off";
+        channels[3].switch = args.device.getCapabilityValue("onoff.3") ? "on" : "off";
+      } else if (name == "onoff.3") {
+        channels[0].switch = args.device.getCapabilityValue("onoff") ? "on" : "off";
+        channels[1].switch = args.device.getCapabilityValue("onoff.1") ? "on" : "off";
+        channels[2].switch = args.device.getCapabilityValue("onoff.2") ? "on" : "off";
+        channels[3].switch = value ? "on" : "off";
+      }
+
+      Homey.app.ewelinkApi.setPower2State(data, channels);
+      return true;
+    });
+  }
+
   registerStateChangeListener() {
-    Homey.app.ewelinkApi.on(this.data.deviceid, event => this.handleStateChange(event));
+    Homey.app.ewelinkApi.on(this.data.deviceid, this.handleStateChange);
   }
 
   unregisterStateChangeListener() {
-    Homey.app.ewelinkApi.removeListener(this.data.deviceid, event => this.handleStateChange(event));
+    Homey.app.ewelinkApi.removeListener(this.data.deviceid, this.handleStateChange);
   }
 
   onDeleted() {

diff --git a/drivers/sonoff-4ch-pro/driver.js b/drivers/sonoff-4ch-pro/driver.js
@@ -4,6 +4,20 @@ const Homey = require("homey");
 const models = ["4CH Pro"];
 
 class Sonoff4CHPro extends Homey.Driver {
+  onInit() {
+    this.actions = {
+      secondChannelOn: new Homey.FlowCardAction("secondChannelOn").register(),
+      secondChannelOff: new Homey.FlowCardAction("secondChannelOff").register(),
+      secondChannelToggle: new Homey.FlowCardAction("secondChannelToggle").register(),
+      threeChannelOn: new Homey.FlowCardAction("threeChannelOn").register(),
+      threeChannelOff: new Homey.FlowCardAction("threeChannelOff").register(),
+      threeChannelToggle: new Homey.FlowCardAction("threeChannelToggle").register(),
+      fourChannelOn: new Homey.FlowCardAction("fourChannelOn").register(),
+      fourChannelOff: new Homey.FlowCardAction("fourChannelOff").register(),
+      fourChannelToggle: new Homey.FlowCardAction("fourChannelToggle").register()
+    };
+  }
+
   async onPairListDevices(data, callback) {
     await Homey.app.ewelinkApi
       .getDevices()

diff --git a/drivers/sonoff-basic/device.js b/drivers/sonoff-basic/device.js
@@ -5,6 +5,7 @@ const Homey = require("homey");
 class SonoffBasic extends Homey.Device {
   onInit() {
     this.log("Sonoff Basic has been inited");
+    this.handleStateChange = this.handleStateChange.bind(this);
     this.driver = this.getDriver();
     this.data = this.getData();
     this.registerStateChangeListener();

diff --git a/drivers/sonoff-t4-1c/device.js b/drivers/sonoff-t4-1c/device.js
@@ -7,13 +7,13 @@ class SonoffT41C extends Homey.Device {
     this.log("Sonoff Basic has been inited");
     this.driver = this.getDriver();
     this.data = this.getData();
+    this.handleStateChange = this.handleStateChange.bind(this);
     this.registerStateChangeListener();
     this.registerToggle("onoff");
     this.saving = false;
   }
 
   handleStateChange(device) {
-    console.log("[INFO]: SonoffT41C -> handleStateChange -> device", device);
     if (device.params) {
       if (device.params.switch == "on") this.updateCapabilityValue("onoff", true);
       if (device.params.switch == "off") this.updateCapabilityValue("onoff", false);
@@ -70,11 +70,11 @@ class SonoffT41C extends Homey.Device {
   }
 
   registerStateChangeListener() {
-    Homey.app.ewelinkApi.on(this.data.deviceid, event => this.handleStateChange(event));
+    Homey.app.ewelinkApi.on(this.data.deviceid, this.handleStateChange);
   }
 
   unregisterStateChangeListener() {
-    Homey.app.ewelinkApi.removeListener(this.data.deviceid, event => this.handleStateChange(event));
+    Homey.app.ewelinkApi.removeListener(this.data.deviceid, this.handleStateChange);
   }
 
   onDeleted() {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.maxmudjon.ewelink",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "ewelink",
   "main": "app.js",
   "dependencies": {