Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add heating capacity support for SimpleHeaterAccessory #416

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add heating capacity support for SimpleHeaterAccessory #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions config.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,22 @@
"functionBody": "return model.devices && model.devices[arrayIndices] && ['Convector'].includes(model.devices[arrayIndices].type);"
}
},
"dpHeatingCapacity": {
"type": "integer",
"placeholder": "",
"description": "If your heater doesn't have a heating capacity, leave this empty.",
"condition": {
"functionBody": "return model.devices && model.devices[arrayIndices] && ['SimpleHeater'].includes(model.devices[arrayIndices].type);"
}
},
"dpHeatingCapacityIdleValue": {
"type": "integer",
"placeholder": "0",
"description": "Value of heating capacity when the heater is idle.",
"condition": {
"functionBody": "return model.devices && model.devices[arrayIndices] && ['SimpleHeater'].includes(model.devices[arrayIndices].type);"
}
},
"dpChildLock": {
"type": "integer",
"placeholder": "6",
Expand Down
27 changes: 23 additions & 4 deletions lib/SimpleHeaterAccessory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ class SimpleHeaterAccessory extends BaseAccessory {
this.dpActive = this._getCustomDP(this.device.context.dpActive) || '1';
this.dpDesiredTemperature = this._getCustomDP(this.device.context.dpDesiredTemperature) || '2';
this.dpCurrentTemperature = this._getCustomDP(this.device.context.dpCurrentTemperature) || '3';
this.dpHeatingCapacity = this._getCustomDP(this.device.context.dpHeatingCapacity) || null;
this.dpHeatingCapacityIdleValue = this._getCustomDP(this.device.context.dpHeatingCapacityIdleValue) || 0;
this.temperatureDivisor = parseInt(this.device.context.temperatureDivisor) || 1;
this.thresholdTemperatureDivisor = parseInt(this.device.context.thresholdTemperatureDivisor) || 1;
this.targetTemperatureDivisor = parseInt(this.device.context.targetTemperatureDivisor) || 1;
Expand All @@ -34,9 +36,10 @@ class SimpleHeaterAccessory extends BaseAccessory {
.on('get', this.getActive.bind(this))
.on('set', this.setActive.bind(this));

service.getCharacteristic(Characteristic.CurrentHeaterCoolerState)
const characteristicCurrentHeaterCoolerState = service.getCharacteristic(Characteristic.CurrentHeaterCoolerState)
.updateValue(this._getCurrentHeaterCoolerState(dps))
.on('get', this.getCurrentHeaterCoolerState.bind(this));
this.characteristicCurrentHeaterCoolerState = characteristicCurrentHeaterCoolerState;

service.getCharacteristic(Characteristic.TargetHeaterCoolerState)
.setProps({
Expand Down Expand Up @@ -80,6 +83,13 @@ class SimpleHeaterAccessory extends BaseAccessory {

if (changes.hasOwnProperty(this.dpCurrentTemperature) && characteristicCurrentTemperature.value !== changes[this.dpCurrentTemperature]) characteristicCurrentTemperature.updateValue(this._getDividedState(changes[this.dpCurrentTemperature], this.temperatureDivisor));

if (changes.hasOwnProperty(this.dpActive) ||
changes.hasOwnProperty(this.dpDesiredTemperature) ||
changes.hasOwnProperty(this.dpCurrentTemperature) ||
(this.dpHeatingCapacity != null && changes.hasOwnProperty(this.dpHeatingCapacity))) {
this.characteristicCurrentHeaterCoolerState.updateValue(this._getCurrentHeaterCoolerState(state));
}

console.log('[Tuya] SimpleHeater changed: ' + JSON.stringify(state));
});
}
Expand Down Expand Up @@ -113,16 +123,25 @@ class SimpleHeaterAccessory extends BaseAccessory {
}

getCurrentHeaterCoolerState(callback) {
this.getState([this.dpActive], (err, dps) => {
let dps = [this.dpActive, this.dpCurrentTemperature, this.dpDesiredTemperature]
if (this.dpHeatingCapacity != null) dps.push(this.dpHeatingCapacity)
this.getState(dps, (err, dps_values) => {
if (err) return callback(err);

callback(null, this._getCurrentHeaterCoolerState(dps));
callback(null, this._getCurrentHeaterCoolerState(dps_values));
});
}

_getCurrentHeaterCoolerState(dps) {
const {Characteristic} = this.hap;
return dps[this.dpActive] ? Characteristic.CurrentHeaterCoolerState.HEATING : Characteristic.CurrentHeaterCoolerState.INACTIVE;

if (!dps[this.dpActive]) return Characteristic.CurrentHeaterCoolerState.INACTIVE;

if (this.dpHeatingCapacity == null) { // If dpHeatingCapacity isn't provided, we assume that the heater is heating when currentTemp <= desiredTemp and idle otherwise
return dps[this.dpCurrentTemperature] <= dps[this.dpDesiredTemperature] ? Characteristic.CurrentHeaterCoolerState.HEATING : Characteristic.CurrentHeaterCoolerState.IDLE;
} else { // If dpHeatingCapacity is provided, we assume that the heater is heating when heatingCapacity != idleValue and idle otherwise
return dps[this.dpHeatingCapacity] != this.dpHeatingCapacityIdleValue ? Characteristic.CurrentHeaterCoolerState.HEATING : Characteristic.CurrentHeaterCoolerState.IDLE;
}
}

getTargetHeaterCoolerState(callback) {
Expand Down