smll modifications

nicoduj · Apr 25, 2020 · fcb6697 · fcb6697
1 parent acf9b65
commit fcb6697
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.3.1
+
+- [FIX] code improvments
+
 ## 1.3.0
 
 **You need to cleanCache if you had installed before, with option cleanCache . Remember to remove it after restart - sorry for that**

diff --git a/autoMowerAPI.js b/autoMowerAPI.js
@@ -137,18 +137,13 @@ AutoMowerAPI.prototype = {
     });
   },
 
-  sendCommand: function (homebridgeAccessory, command, characteristic, callback) {
+  sendCommand: function (command, callback) {
     const that = this;
-    var currentValue = characteristic.value;
-    var commandURL;
 
-    commandURL = this.trackApiUrl + 'mowers/' + homebridgeAccessory.mowerID + command;
+    var commandURL = this.trackApiUrl + 'mowers/' + command;
 
     this.authenticate((error) => {
       if (error) {
-        setTimeout(function () {
-          characteristic.updateValue(currentValue);
-        }, 200);
         callback(error);
       } else {
         request(
@@ -163,15 +158,9 @@ AutoMowerAPI.prototype = {
             that.log.debug('INFO - Body received : ' + JSON.stringify(body));
             if (error) {
               that.log(error.message);
-              setTimeout(function () {
-                characteristic.updateValue(currentValue);
-              }, 200);
               callback(error);
             } else if (response && response.statusCode !== 200) {
               that.log('ERROR - sendCommand -  No 200 return ' + response.statusCode);
-              setTimeout(function () {
-                characteristic.updateValue(currentValue);
-              }, 200);
               callback(error);
             } else {
               callback();

diff --git a/index.js b/index.js
@@ -333,11 +333,20 @@ myAutoMowerPlatform.prototype = {
   },
   setSwitchOnCharacteristic: function (homebridgeAccessory, characteristic, value, callback) {
     this.log.debug('INFO - setSwitchOnCharacteristic - ' + value);
+
+    var currentValue = characteristic.value;
+    callback();
+
     this.autoMowerAPI.sendCommand(
-      homebridgeAccessory,
-      value ? AutoMowerConst.START_COMMAND : AutoMowerConst.PARK_COMMAND,
-      characteristic,
-      callback
+      homebridgeAccessory.mowerID +
+        (value ? AutoMowerConst.START_COMMAND : AutoMowerConst.PARK_COMMAND),
+      function (error) {
+        if (error) {
+          setTimeout(function () {
+            characteristic.updateValue(currentValue);
+          }, 200);
+        }
+      }
     );
   },
 
@@ -363,11 +372,21 @@ myAutoMowerPlatform.prototype = {
   },
   setMowerOnCharacteristic: function (homebridgeAccessory, characteristic, value, callback) {
     this.log.debug('setMowerOnCharacteristic -' + value);
+
+    var currentValue = characteristic.value;
+
+    callback();
+
     this.autoMowerAPI.sendCommand(
-      homebridgeAccessory,
-      value ? AutoMowerConst.START_COMMAND : AutoMowerConst.PAUSE_COMMAND,
-      characteristic,
-      callback
+      homebridgeAccessory.mowerID +
+        (value ? AutoMowerConst.START_COMMAND : AutoMowerConst.PAUSE_COMMAND),
+      function (error) {
+        if (error) {
+          setTimeout(function () {
+            characteristic.updateValue(currentValue);
+          }, 200);
+        }
+      }
     );
   },
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-automower",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "author": "Nicolas Dujardin",
   "description": "Publish your automower as an homekit accessory",
   "main": "index.js",