homebridge-econet-rheem 1.4.2 → 1.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md
CHANGED
|
@@ -11,7 +11,6 @@ This Homebridge plugin integrates Rheem EcoNet devices into Apple HomeKit.
|
|
|
11
11
|
|
|
12
12
|
## Limitations
|
|
13
13
|
|
|
14
|
-
* TODO Update this to discuss current water temp estimation
|
|
15
14
|
* Due to limitations in HomeKit, it is not possible to switch water heater modes, only enable/disable and adjust the desired temperature.
|
|
16
15
|
* Celcius should work but is untested
|
|
17
16
|
* *Let me know if you have successfully used ºC so I can remove this*
|
package/config.schema.json
CHANGED
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"description": "Rheem/Econet account password"
|
|
25
25
|
},
|
|
26
26
|
"wh_estimate": {
|
|
27
|
-
"title": "Estimate
|
|
27
|
+
"title": "Estimate Water Heater Temp (Beta)",
|
|
28
28
|
"type": "boolean",
|
|
29
29
|
"required": false,
|
|
30
30
|
"description": "Predict the current temp based on the set point, availability, and past recovery rates"
|
|
@@ -7,8 +7,8 @@ export declare class RecoverySimulator {
|
|
|
7
7
|
private recoveryRates;
|
|
8
8
|
private recoveryTimer;
|
|
9
9
|
private readonly serialNumber;
|
|
10
|
-
private setPoint;
|
|
11
10
|
private availability;
|
|
11
|
+
private setPoint;
|
|
12
12
|
private previousSetPoint;
|
|
13
13
|
private simulatedTemp;
|
|
14
14
|
private recoveryStartTime;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
2
|
import { fromCelsius, ONE_HOUR, safeGetItem, safeSetItem } from './utils.js';
|
|
3
|
+
const RECOVERY_FILE_PREFIX = 'whRecoveryRates_';
|
|
3
4
|
const DEFAULT_RECOVERY_RATE = 30; // in degrees Celsius per hour
|
|
4
5
|
const RECOVERY_TIMER_INTERVAL = 300000; // 5 minutes
|
|
5
6
|
export class RecoverySimulator {
|
|
@@ -9,8 +10,8 @@ export class RecoverySimulator {
|
|
|
9
10
|
recoveryRates;
|
|
10
11
|
recoveryTimer = null;
|
|
11
12
|
serialNumber;
|
|
12
|
-
setPoint;
|
|
13
13
|
availability;
|
|
14
|
+
setPoint;
|
|
14
15
|
previousSetPoint;
|
|
15
16
|
simulatedTemp;
|
|
16
17
|
recoveryStartTime = null;
|
|
@@ -36,16 +37,17 @@ export class RecoverySimulator {
|
|
|
36
37
|
return this.recoveryTimer !== null;
|
|
37
38
|
}
|
|
38
39
|
handleUpdate(waterHeater) {
|
|
39
|
-
|
|
40
|
-
|
|
40
|
+
if (this.setPoint !== waterHeater.setPoint) {
|
|
41
|
+
this.previousSetPoint = this.setPoint;
|
|
42
|
+
this.setPoint = waterHeater.setPoint;
|
|
43
|
+
}
|
|
41
44
|
this.availability = waterHeater.availability;
|
|
42
|
-
this.previousSetPoint = waterHeater.setPoint;
|
|
43
45
|
if (this.availability === 0 && !waterHeater.isRunning) {
|
|
44
46
|
this._stopRecoveryTimer();
|
|
45
47
|
return;
|
|
46
48
|
}
|
|
47
49
|
if (waterHeater.isRunning && !this.isRecovering) {
|
|
48
|
-
if (this.availability === 0 || this.setPoint > previousSetPoint) {
|
|
50
|
+
if (this.availability === 0 || this.setPoint > this.previousSetPoint) {
|
|
49
51
|
this._startRecoveryTimer();
|
|
50
52
|
}
|
|
51
53
|
return;
|
|
@@ -83,8 +85,7 @@ export class RecoverySimulator {
|
|
|
83
85
|
const tempIncrease = this.recoveryRate * (RECOVERY_TIMER_INTERVAL / ONE_HOUR);
|
|
84
86
|
this.simulatedTemp = Math.min(this.simulatedTemp + tempIncrease, this.setPoint);
|
|
85
87
|
if (this.simulatedTemp === this.setPoint) {
|
|
86
|
-
this.
|
|
87
|
-
this._stopRecoveryTimer();
|
|
88
|
+
this._endRecovery();
|
|
88
89
|
}
|
|
89
90
|
this.onUpdate();
|
|
90
91
|
}
|
|
@@ -98,6 +99,8 @@ export class RecoverySimulator {
|
|
|
98
99
|
}
|
|
99
100
|
const timeElapsed = (Date.now() - this.recoveryStartTime) / ONE_HOUR;
|
|
100
101
|
const tempDifference = this.setPoint - this.recoveryStartTemp;
|
|
102
|
+
this.recoveryStartTime = null;
|
|
103
|
+
this.recoveryStartTemp = null;
|
|
101
104
|
if (timeElapsed <= 0) {
|
|
102
105
|
return;
|
|
103
106
|
}
|
|
@@ -109,12 +112,12 @@ export class RecoverySimulator {
|
|
|
109
112
|
this._saveRecoveryRates();
|
|
110
113
|
}
|
|
111
114
|
_loadRecoveryRates() {
|
|
112
|
-
const key =
|
|
115
|
+
const key = `${RECOVERY_FILE_PREFIX}${this.serialNumber}`;
|
|
113
116
|
const stored = safeGetItem(this.recoveryRatesFilePath, key);
|
|
114
117
|
return stored ? JSON.parse(stored) : null;
|
|
115
118
|
}
|
|
116
119
|
_saveRecoveryRates() {
|
|
117
|
-
const key =
|
|
120
|
+
const key = `${RECOVERY_FILE_PREFIX}${this.serialNumber}`;
|
|
118
121
|
safeSetItem(this.recoveryRatesFilePath, key, JSON.stringify(this.recoveryRates));
|
|
119
122
|
}
|
|
120
123
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recoverySimulator.js","sourceRoot":"","sources":["../../src/model/recoverySimulator.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAG7E,MAAM,qBAAqB,GAAG,EAAE,CAAC,CAAC,8BAA8B;AAChE,MAAM,uBAAuB,GAAG,MAAM,CAAC,CAAC,YAAY;AAEpD,MAAM,OAAO,iBAAiB;IAoBT;IAEA;IApBF,qBAAqB,CAAS;IACvC,aAAa,CAAW;IAExB,aAAa,GAA0B,IAAI,CAAC;IAEnC,YAAY,CAAS;IAE9B,
|
|
1
|
+
{"version":3,"file":"recoverySimulator.js","sourceRoot":"","sources":["../../src/model/recoverySimulator.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAG7E,MAAM,oBAAoB,GAAG,kBAAkB,CAAC;AAChD,MAAM,qBAAqB,GAAG,EAAE,CAAC,CAAC,8BAA8B;AAChE,MAAM,uBAAuB,GAAG,MAAM,CAAC,CAAC,YAAY;AAEpD,MAAM,OAAO,iBAAiB;IAoBT;IAEA;IApBF,qBAAqB,CAAS;IACvC,aAAa,CAAW;IAExB,aAAa,GAA0B,IAAI,CAAC;IAEnC,YAAY,CAAS;IAE9B,YAAY,CAAS;IACrB,QAAQ,CAAS;IAEjB,gBAAgB,CAAS;IAEzB,aAAa,CAAS;IAEtB,iBAAiB,GAAkB,IAAI,CAAC;IACxC,iBAAiB,GAAkB,IAAI,CAAC;IAEhD,YACmB,GAAc,EAC/B,WAAwB,EACP,QAAoB;QAFpB,QAAG,GAAH,GAAG,CAAW;QAEd,aAAQ,GAAR,QAAQ,CAAY;QAGrC,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;QAE7C,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;QAC7C,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;QACrC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC;QAEtC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC;QAEnC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;QAC9E,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,WAAW,CAAC,qBAAqB,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5G,CAAC;IAED,WAAW,CAAC,SAAiB;QAE3B,IAAI,IAAI,CAAC,YAAY,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YAClD,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QACjC,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,IAAY,YAAY;QACtB,OAAO,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC;IACrC,CAAC;IAED,YAAY,CAAC,WAAwB;QAEnC,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,CAAC,QAAQ,EAAE,CAAC;YAC3C,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC;YACtC,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;QACvC,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;QAE7C,IAAI,IAAI,CAAC,YAAY,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;YACtD,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC1B,OAAO;QACT,CAAC;QAED,IAAI,WAAW,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YAChD,IAAI,IAAI,CAAC,YAAY,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACrE,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC7B,CAAC;YACD,OAAO;QACT,CAAC;QAED,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC7D,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC;YACnC,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,OAAO;QACT,CAAC;IACH,CAAC;IAED,IAAY,YAAY;QACtB,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;IACnF,CAAC;IAEO,mBAAmB;QAEzB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACpC,CAAC;QAED,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACpC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC;QAE5C,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE;YACpC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC9B,CAAC,EAAE,uBAAuB,CAAC,CAAC;IAC9B,CAAC;IAEO,kBAAkB;QACxB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAClC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC5B,CAAC;IACH,CAAC;IAEO,oBAAoB;QAE1B,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,GAAG,CAAC,uBAAuB,GAAG,QAAQ,CAAC,CAAC;QAC9E,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,GAAG,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEhF,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;YACzC,IAAI,CAAC,YAAY,EAAE,CAAC;QACtB,CAAC;QAED,IAAI,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;IAEO,YAAY;QAClB,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC5B,CAAC;IAEO,mBAAmB;QAEzB,IAAI,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvD,OAAO;QACT,CAAC;QAED,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,QAAQ,CAAC;QACrE,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAE9D,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC9B,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAE9B,IAAI,WAAW,IAAI,CAAC,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,MAAM,IAAI,GAAG,cAAc,GAAG,WAAW,CAAC;QAC1C,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE9B,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QAC7B,CAAC;QAED,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC5B,CAAC;IAEO,kBAAkB;QACxB,MAAM,GAAG,GAAG,GAAG,oBAAoB,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAC1D,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;QAC5D,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5C,CAAC;IAEO,kBAAkB;QACxB,MAAM,GAAG,GAAG,GAAG,oBAAoB,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAC1D,WAAW,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;IACnF,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"displayName": "Homebridge Econet Rheem",
|
|
5
5
|
"description": "Homebridge plugin based on pyeconet for control of Rheem water heaters",
|
|
6
6
|
"type": "module",
|
|
7
|
-
"version": "1.4.
|
|
7
|
+
"version": "1.4.3",
|
|
8
8
|
"homepage": "https://github.com/mpatfield/homebridge-econet-rheem#readme",
|
|
9
9
|
"repository": {
|
|
10
10
|
"type": "git",
|