1.0.8 version minor fixes

Maxmudjon · Dec 1, 2019 · 098b182 · 098b182
1 parent e088107
commit 098b182
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 Added support for Mi Gateways child devices.
 
-## Version 1.0.7 - Supported devices:
+## Version 1.0.8 - Supported devices:
 
 ### Zigbee subdevices Xiaomi Gateway
 
@@ -124,6 +124,10 @@ Added support for Mi Gateways child devices.
 
 ## Version logs
 
+### 1.0.8 (1.12.2019)
+
+1. minor fixes.
+
 ### 1.0.7 (23.11.2019)
 
 1. minor fixes.

diff --git a/app.json b/app.json
@@ -1,6 +1,6 @@
 {
   "id": "com.maxmudjon.mihomey",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "compatibility": ">=2.0.0",
   "sdk": 2,
   "name": {
@@ -34,7 +34,7 @@
   "contributing": {
     "donate": {
       "paypal": {
-        "username": "maxmudjon"
+        "username": "Sallo"
       }
     }
   },

diff --git a/drivers/curtain/device.js b/drivers/curtain/device.js
@@ -23,7 +23,7 @@ class Curtain extends Homey.Device {
 
   registerCapabilities() {
     const { triggers } = this.driver;
-    this.registerToggle("onoff", "open", "close", triggers.power);
+    this.registerToggle("onoff");
     this.registerDim("dim");
     this.registerCovering("windowcoverings_state");
   }
@@ -35,7 +35,7 @@ class Curtain extends Homey.Device {
 
   registerActions() {
     const { actions } = this.driver;
-    this.registerToggleAction("onoff", "open", "close", actions.power);
+    this.registerToggleAction("onoff", actions.power);
   }
 
   handleStateChange(device) {
@@ -106,13 +106,17 @@ class Curtain extends Homey.Device {
     }
   }
 
-  registerToggle(name, valueOn = true, valueOff = false, trigger) {
+  registerToggle(name) {
     let sid = this.data.sid;
     this.registerCapabilityListener(name, async value => {
-      const newValue = value ? valueOn : valueOff;
-      const data = { curtain_status: newValue };
-      await Homey.app.mihub.sendWrite(sid, data);
-      this.triggerFlow(trigger, name, value);
+      const settings = this.getSettings();
+      if (value) {
+        const data = { curtain_status: settings.reverted ? "open" : "close" };
+        await Homey.app.mihub.sendWrite(sid, data);
+      } else {
+        const data = { curtain_status: settings.reverted ? "close" : "open" };
+        await Homey.app.mihub.sendWrite(sid, data);
+      }
     });
   }
 
@@ -148,15 +152,16 @@ class Curtain extends Homey.Device {
     condition.registerRunListener((args, state) => Promise.resolve(this.getCapabilityValue(name)));
   }
 
-  registerToggleAction(name, valueOn = true, valueOff = false, action) {
+  registerToggleAction(name, action) {
     let sid = this.data.sid;
+    const settings = this.getSettings();
     action.on.registerRunListener(async (args, state) => {
-      const data = { status: valueOn };
+      const data = { status: settings.reverted ? "open" : "close" };
       await Homey.app.mihub.sendWrite(sid, data);
       return true;
     });
     action.off.registerRunListener(async (args, state) => {
-      const data = { status: valueOff };
+      const data = { status: settings.reverted ? "close" : "open" };
       await Homey.app.mihub.sendWrite(sid, data);
       return true;
     });

diff --git a/drivers/wleak_sensor/device.js b/drivers/wleak_sensor/device.js
@@ -23,6 +23,7 @@ class WleakSensor extends Homey.Device {
       var battery = (device["data"]["voltage"] - 2800) / 5;
       this.updateCapabilityValue("measure_battery", battery > 100 ? 100 : battery);
       this.updateCapabilityValue("alarm_battery", battery <= 20 ? true : false);
+      if (this.getCapabilityValue("alarm_water")) this.updateCapabilityValue("alarm_water", false);
     }
 
     if (device["data"]["status"] == "leak") {