homebridge-tuya-plus 3.9.0 → 3.10.0

package/lib/AirConditionerAccessory.js

@@ -1,7 +1,5 @@
 const BaseAccessory = require('./BaseAccessory');
 
-const STATE_OTHER = 9;
-
 class AirConditionerAccessory extends BaseAccessory {
     static getCategory(Categories) {
         return Categories.AIR_CONDITIONER;
@@ -28,8 +26,6 @@ class AirConditionerAccessory extends BaseAccessory {
             else throw new Error('The cmdAuto doesn\'t appear to be valid: ' + this.device.context.cmdAuto);
         }
 
-        this.device.context.noAuto = true;
-
         if (!this.device.context.noRotationSpeed) {
             const fanSpeedSteps = (this.device.context.fanSpeedSteps && isFinite(this.device.context.fanSpeedSteps) && this.device.context.fanSpeedSteps > 0 && this.device.context.fanSpeedSteps < 100) ? this.device.context.fanSpeedSteps : 100;
             this._rotationSteps = [0];
@@ -65,7 +61,7 @@ class AirConditionerAccessory extends BaseAccessory {
         this.dpSwingMode = this._getCustomDP(this.device.context.dpSwingMode) || '104';
 
         const characteristicActive = service.getCharacteristic(Characteristic.Active)
-            .updateValue(this._getActive(this.dpActive))
+            .updateValue(this._getActive(dps[this.dpActive]))
             .onGet(() => this.getActive())
             .onSet(value => this.setActive(value));
 
@@ -73,13 +69,13 @@ class AirConditionerAccessory extends BaseAccessory {
             .updateValue(this._getCurrentHeaterCoolerState(dps))
             .onGet(() => this.getCurrentHeaterCoolerState());
 
-        const _validTargetHeaterCoolerStateValues = [STATE_OTHER];
-        if (!this.device.context.noCool) _validTargetHeaterCoolerStateValues.unshift(Characteristic.TargetHeaterCoolerState.COOL);
-        if (!this.device.context.noHeat) _validTargetHeaterCoolerStateValues.unshift(Characteristic.TargetHeaterCoolerState.HEAT);
-        if (!this.device.context.noAuto) _validTargetHeaterCoolerStateValues.unshift(Characteristic.TargetHeaterCoolerState.AUTO);
+        const _validTargetHeaterCoolerStateValues = [];
+        if (!this.device.context.noAuto) _validTargetHeaterCoolerStateValues.push(Characteristic.TargetHeaterCoolerState.AUTO);
+        if (!this.device.context.noHeat) _validTargetHeaterCoolerStateValues.push(Characteristic.TargetHeaterCoolerState.HEAT);
+        if (!this.device.context.noCool) _validTargetHeaterCoolerStateValues.push(Characteristic.TargetHeaterCoolerState.COOL);
 
         const characteristicTargetHeaterCoolerState = service.getCharacteristic(Characteristic.TargetHeaterCoolerState)
-            .setProps({ maxValue: 9, validValues: _validTargetHeaterCoolerStateValues })
+            .setProps({ validValues: _validTargetHeaterCoolerStateValues })
             .updateValue(this._getTargetHeaterCoolerState(dps[this.dpMode]))
             .onGet(() => this.getTargetHeaterCoolerState())
             .onSet(value => this.setTargetHeaterCoolerState(value));
@@ -112,7 +108,7 @@ class AirConditionerAccessory extends BaseAccessory {
                     maxValue: this.device.context.maxTemperature || 35,
                     minStep: this.device.context.minTemperatureSteps || 1
                 })
-                .updateValue(this.dpThreshold)
+                .updateValue(dps[this.dpThreshold])
                 .onGet(() => this.getStateAsync(this.dpThreshold))
                 .onSet(value => this.setTargetThresholdTemperature('cool', value));
         } else this._removeCharacteristic(service, Characteristic.CoolingThresholdTemperature);
@@ -256,17 +252,20 @@ class AirConditionerAccessory extends BaseAccessory {
         const {Characteristic} = this.hap;
         switch (dp) {
             case this.cmdCool:
-                if (this.device.context.noCool) return STATE_OTHER;
-                return Characteristic.TargetHeaterCoolerState.COOL;
+                if (!this.device.context.noCool) return Characteristic.TargetHeaterCoolerState.COOL;
+                break;
             case this.cmdHeat:
-                if (this.device.context.noHeat) return STATE_OTHER;
-                return Characteristic.TargetHeaterCoolerState.HEAT;
+                if (!this.device.context.noHeat) return Characteristic.TargetHeaterCoolerState.HEAT;
+                break;
             case this.cmdAuto:
-                if (this.device.context.noAuto) return STATE_OTHER;
-                return Characteristic.TargetHeaterCoolerState.AUTO;
-            default:
-                return STATE_OTHER;
+                if (!this.device.context.noAuto) return Characteristic.TargetHeaterCoolerState.AUTO;
+                break;
         }
+        // Fall back to the first allowed mode rather than publishing a value
+        // that isn't in validValues — HomeKit would reject it otherwise.
+        if (!this.device.context.noCool) return Characteristic.TargetHeaterCoolerState.COOL;
+        if (!this.device.context.noHeat) return Characteristic.TargetHeaterCoolerState.HEAT;
+        return Characteristic.TargetHeaterCoolerState.AUTO;
     }
 
     setTargetHeaterCoolerState(value) {
@@ -274,13 +273,13 @@ class AirConditionerAccessory extends BaseAccessory {
         switch (value) {
             case Characteristic.TargetHeaterCoolerState.COOL:
                 if (this.device.context.noCool) return;
-                return this.setStateAsync(this.dpMode, this.cmdCool);
+                return this.setMultiStateLegacyAsync({[this.dpActive]: true, [this.dpMode]: this.cmdCool});
             case Characteristic.TargetHeaterCoolerState.HEAT:
                 if (this.device.context.noHeat) return;
-                return this.setStateAsync(this.dpMode, this.cmdHeat);
+                return this.setMultiStateLegacyAsync({[this.dpActive]: true, [this.dpMode]: this.cmdHeat});
             case Characteristic.TargetHeaterCoolerState.AUTO:
                 if (this.device.context.noAuto) return;
-                return this.setStateAsync(this.dpMode, this.cmdAuto);
+                return this.setMultiStateLegacyAsync({[this.dpActive]: true, [this.dpMode]: this.cmdAuto});
         }
     }
 
@@ -305,7 +304,7 @@ class AirConditionerAccessory extends BaseAccessory {
     }
 
     async setTargetThresholdTemperature(mode, value) {
-        await this.setStateAsync(this.dpThreshold, value);
+        await this.setMultiStateLegacyAsync({[this.dpActive]: true, [this.dpThreshold]: value});
         if (mode === 'cool' && !this.device.context.noHeat && this.characteristicHeatingThresholdTemperature) {
             this.characteristicHeatingThresholdTemperature.updateValue(value);
         } else if (mode === 'heat' && !this.device.context.noCool && this.characteristicCoolingThresholdTemperature) {

package/lib/SimpleHeaterAccessory.js

@@ -29,6 +29,14 @@ class SimpleHeaterAccessory extends BaseAccessory {
         this.temperatureDivisor = parseInt(this.device.context.temperatureDivisor) || 1;
         this.thresholdTemperatureDivisor = parseInt(this.device.context.thresholdTemperatureDivisor) || 1;
         this.temperatureOffset = parseInt(this.device.context.temperatureOffset) || 0;
+        // currentTemperatureOffset shifts only the displayed current temperature
+        // (not the threshold/setpoint). Use for devices whose onboard sensor
+        // reads systematically off from real ambient (e.g. wall-mounted patio
+        // heaters with sensor against the housing/wall). Defaults to
+        // temperatureOffset for backwards compatibility.
+        this.currentTemperatureOffset = this.device.context.currentTemperatureOffset !== undefined
+            ? parseInt(this.device.context.currentTemperatureOffset)
+            : this.temperatureOffset;
 
         const characteristicActive = service.getCharacteristic(Characteristic.Active)
             .updateValue(this._getActive(dps[this.dpActive]))
@@ -50,8 +58,8 @@ class SimpleHeaterAccessory extends BaseAccessory {
             .onSet(() => this.setStateAsync(this.dpActive, true));
 
         const characteristicCurrentTemperature = service.getCharacteristic(Characteristic.CurrentTemperature)
-            .updateValue(this._getDividedState(dps[this.dpCurrentTemperature], this.temperatureDivisor))
-            .onGet(() => this.getDividedStateAsync(this.dpCurrentTemperature, this.temperatureDivisor));
+            .updateValue(this._getDividedState(dps[this.dpCurrentTemperature], this.temperatureDivisor, this.currentTemperatureOffset))
+            .onGet(() => this._getCurrentTempAsync());
 
         const characteristicHeatingThresholdTemperature = service.getCharacteristic(Characteristic.HeatingThresholdTemperature)
             .setProps({
@@ -79,7 +87,7 @@ class SimpleHeaterAccessory extends BaseAccessory {
             }
 
             if (changes.hasOwnProperty(this.dpCurrentTemperature) && characteristicCurrentTemperature.value !== changes[this.dpCurrentTemperature])
-                characteristicCurrentTemperature.updateValue(this._getDividedState(changes[this.dpCurrentTemperature], this.temperatureDivisor));
+                characteristicCurrentTemperature.updateValue(this._getDividedState(changes[this.dpCurrentTemperature], this.temperatureDivisor, this.currentTemperatureOffset));
 
             characteristicCurrentHeaterCoolerState.updateValue(this._getCurrentHeaterCoolerState(state));
             this.log.info('SimpleHeater changed: ' + JSON.stringify(state));
@@ -132,8 +140,15 @@ class SimpleHeaterAccessory extends BaseAccessory {
         }
     }
 
-    _getDividedState(dp, divisor) {
-        return ((parseFloat(dp) / divisor) + this.temperatureOffset) || 0;
+    _getDividedState(dp, divisor, offsetOverride) {
+        const offset = offsetOverride !== undefined ? offsetOverride : this.temperatureOffset;
+        return ((parseFloat(dp) / divisor) + offset) || 0;
+    }
+
+    _getCurrentTempAsync() {
+        const data = this.getStateAsync(this.dpCurrentTemperature);
+        if (!isFinite(data)) throw new Error('Invalid state');
+        return this._getDividedState(data, this.temperatureDivisor, this.currentTemperatureOffset);
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-tuya-plus",
-  "version": "3.9.0",
+  "version": "3.10.0",
   "description": "A community-maintained Homebridge plugin for controlling Tuya devices locally over LAN. Includes new features, fixes, and updated device support.",
   "main": "index.js",
   "scripts": {