Merge pull request #258 from iRayanKhan/revert-251-main

Revert "split factor variable for heater temperatures"
iRayanKhan · Apr 24, 2021 · 5111d0c · 5111d0c
2 parents ac5bf19 + bb06b72
commit 5111d0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/config.schema.json b/config.schema.json
@@ -413,20 +413,6 @@
                   "functionBody": "return model.devices && model.devices[arrayIndices] && ['SimpleHeater'].includes(model.devices[arrayIndices].type);"
                 }
               },
-              "thresholdTemperatureDivisor": {
-                "type": "integer",
-                "placeholder": "1",
-                "condition": {
-                  "functionBody": "return model.devices && model.devices[arrayIndices] && ['SimpleHeater'].includes(model.devices[arrayIndices].type);"
-                }
-              },
-              "targetTemperatureDivisor": {
-                "type": "integer",
-                "placeholder": "1",
-                "condition": {
-                  "functionBody": "return model.devices && model.devices[arrayIndices] && ['SimpleHeater'].includes(model.devices[arrayIndices].type);"
-                }
-              },
               "dpAction": {
                 "type": "integer",
                 "placeholder": "1",

diff --git a/lib/SimpleHeaterAccessory.js b/lib/SimpleHeaterAccessory.js
@@ -26,8 +26,6 @@ class SimpleHeaterAccessory extends BaseAccessory {
         this.dpDesiredTemperature = this._getCustomDP(this.device.context.dpDesiredTemperature) || '2';
         this.dpCurrentTemperature = this._getCustomDP(this.device.context.dpCurrentTemperature) || '3';
         this.temperatureDivisor = parseInt(this.device.context.temperatureDivisor) || 1;
-        this.thresholdTemperatureDivisor = parseInt(this.device.context.thresholdTemperatureDivisor) || 1;
-        this.targetTemperatureDivisor = parseInt(this.device.context.targetTemperatureDivisor) || 1;
 
         const characteristicActive = service.getCharacteristic(Characteristic.Active)
             .updateValue(this._getActive(dps[this.dpActive]))
@@ -59,8 +57,8 @@ class SimpleHeaterAccessory extends BaseAccessory {
                 maxValue: this.device.context.maxTemperature || 35,
                 minStep: this.device.context.minTemperatureSteps || 1
             })
-            .updateValue(this._getDividedState(dps[this.dpDesiredTemperature], this.thresholdTemperatureDivisor))
-            .on('get', this.getDividedState.bind(this, this.dpDesiredTemperature, this.thresholdTemperatureDivisor))
+            .updateValue(this._getDividedState(dps[this.dpDesiredTemperature], this.temperatureDivisor))
+            .on('get', this.getDividedState.bind(this, this.dpDesiredTemperature, this.temperatureDivisor))
             .on('set', this.setTargetThresholdTemperature.bind(this));
 
         this.characteristicHeatingThresholdTemperature = characteristicHeatingThresholdTemperature;
@@ -75,7 +73,7 @@ class SimpleHeaterAccessory extends BaseAccessory {
 
             if (changes.hasOwnProperty(this.dpDesiredTemperature)) {
                 if (characteristicHeatingThresholdTemperature.value !== changes[this.dpDesiredTemperature])
-                    characteristicHeatingThresholdTemperature.updateValue(changes[this.dpDesiredTemperature * this.targetTemperatureDivisor]);
+                    characteristicHeatingThresholdTemperature.updateValue(changes[this.dpDesiredTemperature * this.temperatureDivisor]);
             }
 
             if (changes.hasOwnProperty(this.dpCurrentTemperature) && characteristicCurrentTemperature.value !== changes[this.dpCurrentTemperature]) characteristicCurrentTemperature.updateValue(this._getDividedState(changes[this.dpCurrentTemperature], this.temperatureDivisor));
@@ -139,7 +137,7 @@ class SimpleHeaterAccessory extends BaseAccessory {
     }
 
     setTargetThresholdTemperature(value, callback) {
-        this.setState(this.dpDesiredTemperature, value * this.thresholdTemperatureDivisor, err => {
+        this.setState(this.dpDesiredTemperature, value * this.temperatureDivisor, err => {
             if (err) return callback(err);
 
             if (this.characteristicHeatingThresholdTemperature) {