fix an issue where Siri would return 2%

fix an issue where speed was incorrect when becoming active again
alexryd · Jan 1, 2021 · 9fc07cf · 9fc07cf
1 parent 12ccdcd
commit 9fc07cf
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/abilities/two-speed-fan.js b/abilities/two-speed-fan.js
@@ -45,8 +45,8 @@ module.exports = homebridge => {
         .getCharacteristic(Characteristic.RotationSpeed)
         .setProps({
           minValue: 0,
-          maxValue: 2,
-          minStep: 1
+          maxValue: 100,
+          minStep: 50
         })
         .on('get', this.getSpeed.bind(this))
         .on('set', this._targetSpeedSetHandler.bind(this))
@@ -70,9 +70,9 @@ module.exports = homebridge => {
 
     get speed() {
       if (this.device[this._speedTwoProperty]) {
-        return 2
+        return 100
       } else if (this.device[this._speedOneProperty]) {
-        return 1
+        return 50
       }
 
       return 0
@@ -104,6 +104,8 @@ module.exports = homebridge => {
       )
 
       try {
+        // Always keep track of the last speed set
+        this._lastSpeed = value
         await this._setSpeed(value)
         callback()
       } catch (e) {
@@ -144,24 +146,23 @@ module.exports = homebridge => {
     }
 
     _stateChangeHandler() {
-      // Always keep track of the last speed set
-      this._lastSpeed = this.speed
-
-      this.platformAccessory
-        .getService(Service.Fanv2)
-        .getCharacteristic(Characteristic.RotationSpeed)
-        .setValue(this.speed, null, 'shelly')
-
       this.platformAccessory
         .getService(Service.Fanv2)
         .getCharacteristic(Characteristic.Active)
         .setValue(this.active, null, 'shelly')
+
+      if (this.active > 0) {
+        this.platformAccessory
+          .getService(Service.Fanv2)
+          .getCharacteristic(Characteristic.RotationSpeed)
+          .setValue(this.speed, null, 'shelly')
+      }
     }
 
-    async _targetActiveSetHandler(value, callback, context) {
+    async _targetActiveSetHandler(newValue, callback, context) {
       const d = this.device
 
-      if (context === 'shelly' || this.active === value) {
+      if (context === 'shelly' || this.active === newValue) {
         callback()
         return
       }
@@ -172,11 +173,13 @@ module.exports = homebridge => {
         d.type,
         d.id,
         'to',
-        value
+        newValue
       )
 
       try {
-        if (value === 0) {
+        if (newValue === 0) {
+          // Always keep track of the last speed set
+          this._lastSpeed = this.speed
           await this._setSpeed(0)
         } else {
           await this._setSpeed(this._lastSpeed)

diff --git a/accessories/fan.js b/accessories/fan.js
@@ -33,11 +33,11 @@ module.exports = homebridge => {
           await this.device.setRelay(this.index, false)
           await this.device.setRelay(this.index + 1, false)
           break
-        case 1:
+        case 50:
           await this.device.setRelay(this.index, true)
           await this.device.setRelay(this.index + 1, false)
           break
-        case 2:
+        case 100:
           await this.device.setRelay(this.index, false)
           await this.device.setRelay(this.index + 1, true)
           break