iobroker.ebus 3.2.5 → 3.2.6
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 +4 -0
- package/io-package.json +14 -1
- package/main.js +26 -26
- package/package.json +4 -4
package/README.md
CHANGED
|
@@ -69,6 +69,10 @@ Attention: command in datapoint ebus.0.cmd is deleted after executing of command
|
|
|
69
69
|
Placeholder for the next version (at the beginning of the line):
|
|
70
70
|
### **WORK IN PROGRESS**
|
|
71
71
|
-->
|
|
72
|
+
### 3.2.6 (2024-02-11)
|
|
73
|
+
* (René) see issue #245: support ebusd 23.3
|
|
74
|
+
* (René) fixes reported by eslint
|
|
75
|
+
|
|
72
76
|
### 3.2.5 (2024-01-12)
|
|
73
77
|
* (René) dependencies updated
|
|
74
78
|
|
package/io-package.json
CHANGED
|
@@ -1,8 +1,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "ebus",
|
|
4
|
-
"version": "3.2.
|
|
4
|
+
"version": "3.2.6",
|
|
5
5
|
"news": {
|
|
6
|
+
"3.2.6": {
|
|
7
|
+
"en": "(René) see issue #245: support ebusd 23.3\n(René) fixes reported by eslint",
|
|
8
|
+
"de": "(René) siehe Ausgabe #245: Unterstützung ebusd 23.3\n(René)",
|
|
9
|
+
"ru": "#245: поддержка ebusd 23.3\n(René) исправлений, сообщаемых eslint",
|
|
10
|
+
"pt": "(René) veja a edição #245: suporte ebusd 23.3\n(René) correções relatadas por eslint",
|
|
11
|
+
"nl": "(René) zie nummer #245: support ebusd 23.3\n(René) fixes gerapporteerd door eslint",
|
|
12
|
+
"fr": "(René) voir le numéro #245: soutien ebusd 23,3\n(René) corrections rapportées par eslint",
|
|
13
|
+
"it": "(René) vedi numero #245: supporto ebusd 23.3\n(René) correzioni segnalate da eslint",
|
|
14
|
+
"es": "(René) ver número #245: apoyo ebusd 23.3\n(René) fixes reported by eslint",
|
|
15
|
+
"pl": "(René) see issue # 245: support ebudd 23.3\n(René) poprawki zgłoszone przez eslint",
|
|
16
|
+
"uk": "(René) див. питання #245: підтримка ebusd 23.3\n(René) фіксує eslint",
|
|
17
|
+
"zh-cn": "(René)参见问题245:支持ebusd 23.3\nEslint报告的(René)修复"
|
|
18
|
+
},
|
|
6
19
|
"3.2.5": {
|
|
7
20
|
"en": "(René) dependencies updated",
|
|
8
21
|
"de": "(René)",
|
package/main.js
CHANGED
|
@@ -15,9 +15,9 @@
|
|
|
15
15
|
|
|
16
16
|
|
|
17
17
|
const utils = require("@iobroker/adapter-core");
|
|
18
|
-
const ebusdMinVersion = [23,
|
|
19
|
-
|
|
20
|
-
|
|
18
|
+
const ebusdMinVersion = [23, 3];
|
|
19
|
+
const ebusdVersion = [0, 0];
|
|
20
|
+
const ebusdUpdateVersion = [0, 0];
|
|
21
21
|
|
|
22
22
|
let adapter;
|
|
23
23
|
function startAdapter(options) {
|
|
@@ -83,7 +83,7 @@ function startAdapter(options) {
|
|
|
83
83
|
}
|
|
84
84
|
|
|
85
85
|
|
|
86
|
-
const axios = require(
|
|
86
|
+
const axios = require("axios");
|
|
87
87
|
const net = require("net");
|
|
88
88
|
const { PromiseSocket } = require("promise-socket");
|
|
89
89
|
|
|
@@ -190,7 +190,7 @@ async function DataRequest() {
|
|
|
190
190
|
}
|
|
191
191
|
|
|
192
192
|
|
|
193
|
-
|
|
193
|
+
const oPolledVars = [];
|
|
194
194
|
function FillPolledVars() {
|
|
195
195
|
|
|
196
196
|
if ( adapter.config.PolledDPs !== undefined && adapter.config.PolledDPs != null && adapter.config.PolledDPs.length > 0) {
|
|
@@ -218,7 +218,7 @@ function FillPolledVars() {
|
|
|
218
218
|
circuit: "",
|
|
219
219
|
name: oPolled[i],
|
|
220
220
|
parameter: ""
|
|
221
|
-
}
|
|
221
|
+
};
|
|
222
222
|
oPolledVars.push(value);
|
|
223
223
|
}
|
|
224
224
|
}
|
|
@@ -245,10 +245,10 @@ function FillHistoryVars() {
|
|
|
245
245
|
|
|
246
246
|
for (let i = 0; i < oHistory.length; i++) {
|
|
247
247
|
if (oHistory[i].length > 0) {
|
|
248
|
-
console.log(
|
|
248
|
+
console.log("add " + oHistory[i]);
|
|
249
249
|
const value = {
|
|
250
250
|
name: oHistory[i],
|
|
251
|
-
}
|
|
251
|
+
};
|
|
252
252
|
oHistoryVars.push(value);
|
|
253
253
|
}
|
|
254
254
|
}
|
|
@@ -348,14 +348,14 @@ async function ebusd_find(){
|
|
|
348
348
|
adapter.log.debug("received " + typeof data + " " + data);
|
|
349
349
|
}
|
|
350
350
|
|
|
351
|
-
|
|
352
|
-
|
|
351
|
+
const str = new TextDecoder().decode(data);
|
|
352
|
+
const datas = str.split(/\r?\n/);
|
|
353
353
|
|
|
354
354
|
for (let i = 0; i < datas.length; i++) {
|
|
355
355
|
|
|
356
356
|
//adapter.log.debug(JSON.stringify(datas[i]));
|
|
357
357
|
|
|
358
|
-
|
|
358
|
+
const names = datas[i].split(",");
|
|
359
359
|
|
|
360
360
|
//circuit,name,comment
|
|
361
361
|
await UpdateDP(names[0], names[1], names[2]);
|
|
@@ -430,7 +430,7 @@ async function CreateObject(key, obj) {
|
|
|
430
430
|
//circuit,name,comment
|
|
431
431
|
async function UpdateDP(circuit, name, comment) {
|
|
432
432
|
|
|
433
|
-
|
|
433
|
+
const key = circuit + ".messages." + name;
|
|
434
434
|
adapter.log.debug("update check for " + key);
|
|
435
435
|
|
|
436
436
|
|
|
@@ -651,8 +651,8 @@ async function ebusd_ReceiveData() {
|
|
|
651
651
|
|
|
652
652
|
if (key.includes("[") || key.includes("]")) {
|
|
653
653
|
adapter.log.debug("found unsupported chars in " + key);
|
|
654
|
-
const start = key.indexOf(
|
|
655
|
-
const end = key.lastIndexOf(
|
|
654
|
+
const start = key.indexOf("[");
|
|
655
|
+
const end = key.lastIndexOf("]");
|
|
656
656
|
|
|
657
657
|
if (start > 0 && end > 0) {
|
|
658
658
|
const toReplace = key.slice(start, end + 1);
|
|
@@ -672,7 +672,7 @@ async function ebusd_ReceiveData() {
|
|
|
672
672
|
if (key.includes("global.version")) {
|
|
673
673
|
const value = newData[org_key];
|
|
674
674
|
//adapter.log.info("in version, value " + value);
|
|
675
|
-
const versionInfo = value.split(
|
|
675
|
+
const versionInfo = value.split(".");
|
|
676
676
|
if (versionInfo.length > 1) {
|
|
677
677
|
adapter.log.info("installed ebusd version is " + versionInfo[0] + "." + versionInfo[1]);
|
|
678
678
|
|
|
@@ -691,7 +691,7 @@ async function ebusd_ReceiveData() {
|
|
|
691
691
|
value = value.replace("revision v", "");
|
|
692
692
|
value = value.replace(" available", "");
|
|
693
693
|
|
|
694
|
-
const versionInfo = value.split(
|
|
694
|
+
const versionInfo = value.split(".");
|
|
695
695
|
if (versionInfo.length > 1) {
|
|
696
696
|
adapter.log.info("found ebusd update version " + versionInfo[0] + "." + versionInfo[1]);
|
|
697
697
|
|
|
@@ -713,7 +713,7 @@ async function ebusd_ReceiveData() {
|
|
|
713
713
|
let value = newData[org_key];
|
|
714
714
|
|
|
715
715
|
if (value == null || value === undefined) {
|
|
716
|
-
adapter.log.debug(
|
|
716
|
+
adapter.log.debug("Key : " + key + ", Value : " + newData[org_key] + " name " + name);
|
|
717
717
|
}
|
|
718
718
|
|
|
719
719
|
|
|
@@ -735,7 +735,7 @@ async function ebusd_ReceiveData() {
|
|
|
735
735
|
|
|
736
736
|
if (adapter.config.useBoolean4Onoff) {
|
|
737
737
|
if (type == "string" && (value == "on" || value == "off")) {
|
|
738
|
-
adapter.log.debug(
|
|
738
|
+
adapter.log.debug("Key " + key + " change to boolean " + value);
|
|
739
739
|
//Key mc.messages.Status.fields.1.value could be boolean off
|
|
740
740
|
|
|
741
741
|
type = "boolean";
|
|
@@ -806,7 +806,7 @@ async function ebusd_ReceiveData() {
|
|
|
806
806
|
subnames[0].includes("ehp") ||
|
|
807
807
|
(subnames.length>2 && subnames[2].includes("currenterror"))
|
|
808
808
|
|
|
809
|
-
|
|
809
|
+
) {
|
|
810
810
|
bSkip = true;
|
|
811
811
|
}
|
|
812
812
|
if (temp > 2) {
|
|
@@ -1157,10 +1157,10 @@ async function FindParams(obj) {
|
|
|
1157
1157
|
|
|
1158
1158
|
adapter.log.debug("FindParams " + JSON.stringify(obj));
|
|
1159
1159
|
|
|
1160
|
-
|
|
1160
|
+
const list = [];
|
|
1161
1161
|
|
|
1162
1162
|
try {
|
|
1163
|
-
|
|
1163
|
+
const circuit = obj.message;
|
|
1164
1164
|
|
|
1165
1165
|
const socket = new net.Socket();
|
|
1166
1166
|
const promiseSocket = new PromiseSocket(socket);
|
|
@@ -1182,14 +1182,14 @@ async function FindParams(obj) {
|
|
|
1182
1182
|
/*
|
|
1183
1183
|
received object ehp,AccelerationTestModeehp,AccelerationTestModeehp,ActualEnvironmentPowerehp,ActualEnvironmentPowerehp,ActualEnvironmentPowerPercentageehp,ActualEnvironmentPowerPercentageehp,ApplianceCodeehp,ApplianceCodeehp,Backupehp,Backupehp,BackupHoursehp,BackupHoursHcehp,BackupHoursHwcehp,BackupHysteresisehp,BackupIntegralehp,BackupModeHcehp,BackupModeHwcehp,BackupPowerCutehp,BackupStartsehp,BackupStartsHcehp,BackupStartsHwcehp,BackupTypeehp,BivalentTempehp,Bleedingehp,Bleedingehp,CirPumpehp,CirPumpehp,Code1ehp,Code1Code2Validehp,Code2ehp,Compehp,Compehp,CompControlStateehp,CompCutPressHighCountehp,CompCutPressLowCountehp,CompCutTempCountehp,CompDemandehp,CompHoursehp,CompHoursHcehp,CompHoursHwcehp,CompHysteresisehp,CompIntegralehp,CompPressHighehp,CompPressHighehp,CompPressLowehp,CompPressLowehp,CompStartsehp,CompStartsHcehp,CompStartsHwcehp,CompStateehp,CondensorTempehp,CondensorTempehp,currenterrorehp,Dateehp,DateTimeehp,DeltaTempT6T7ehp,ElectricWiringDiagramehp,ElectricWiringDiagramehp,EnergyBalancingReleaseehp,errorhistoryehp,FlowTempehp,FlowTempehp,FlowtempCoolingMinehp,FlowTempOffsetehp,Hc1Pumpehp,Hc1Pumpehp,Hc1PumpHoursehp,Hc1PumpPortehp,Hc1PumpStartsehp,Hc2Pumpehp,Hc2PumpHoursehp,HcFlowTempehp,HcFlowTempOffsetehp,HcModeDemandHoursehp,HcModeFulfilledHoursehp,HcParallelStorageFillingEnabledehp,HcPressehp,HcReturnTempehp,HcReturnTempehp,HcReturnTempOffsetehp,HeatPumpStatusehp,HeatPumpStatusehp,HeatpumpTypeehp,HwcHcValveehp,HwcHcValveehp,HwcHcValveStartsehp,HwcLaggingTimeehp,HwcLoadingDelayehp,HwcModeDemandHoursehp,HwcModeFulfilledHoursehp,HwcPumpStartsehp,HwcSwitchehp,HwcTempehp,HwcTempehp,HwcTempOffsetehp,HydraulicSchemeehp,ICLOutehp,ICLOutehp,Injectionehp,Integralehp,Mixer1DutyCycleehp,NumberCompStartsehp,OutsideTempehp,OutsideTempOffsetehp,OverpressureThresholdehp,PhaseOrderehp,PhaseOrderehp,PhaseStatusehp,PhaseStatusehp,PowerCutehp,PowerCutPreloadingehp,PressSwitchehp,PressSwitchehp,RebootCounterehp,ReturnTempMaxehp,SetModeehp,SoftwareCodeehp,Source2PumpHoursehp,Sourceehp,Sourceehp,SourceHoursehp,SourcePortehp,SourcePressehp,SourcePumpPrerunTimeehp,SourceStartsehp,SourceSwitchehp,SourceSwitchehp,SourceTempInputehp,SourceTempInputehp,SourceTempInputOffsetehp,SourceTempOutputehp,SourceTempOutputehp,SourceTempOutputOffsetehp,SourceTempOutputT8Minehp,StateSoftwareCodeehp,StateSoftwareCodeehp,Status01ehp,Status02ehp,Status16ehp,Statusehp,StatusCirPumpehp,StorageTempBottomehp,StorageTempBottomehp,StorageTempBottomOffsetehp,StorageTempTopehp,StorageTempTopehp,StorageTempTopOffsetehp,Subcoolingehp,Superheatehp,T19MaxToCompOffehp,TempInputehp,TempInputehp,TempInputOffsetehp,TempOutputehp,TempOutputehp,TempOutputOffsetehp,Timeehp,TimeBetweenTwoCompStartsMinehp,TimeCompOffMinehp,TimeCompOnMinehp,TimeOfNextPredictedPowerCutehp,TimeOfNextPredictedPowerCutehp,Weekdayehp,YieldTotalehp,YieldTotal
|
|
1184
1184
|
*/
|
|
1185
|
-
|
|
1186
|
-
|
|
1185
|
+
const str = new TextDecoder().decode(data);
|
|
1186
|
+
const datas = str.split(/\r?\n/);
|
|
1187
1187
|
|
|
1188
1188
|
for (let i = 0; i < datas.length; i++) {
|
|
1189
1189
|
|
|
1190
1190
|
//adapter.log.debug(JSON.stringify(datas[i]));
|
|
1191
1191
|
|
|
1192
|
-
|
|
1192
|
+
const names = datas[i].split(",");
|
|
1193
1193
|
|
|
1194
1194
|
//doppelte und leere herausfiltern
|
|
1195
1195
|
let add = true;
|
|
@@ -1209,11 +1209,11 @@ async function FindParams(obj) {
|
|
|
1209
1209
|
}
|
|
1210
1210
|
|
|
1211
1211
|
if (add) {
|
|
1212
|
-
|
|
1212
|
+
const entry = {
|
|
1213
1213
|
active: false,
|
|
1214
1214
|
circuit: names[0],
|
|
1215
1215
|
name: names[1]
|
|
1216
|
-
}
|
|
1216
|
+
};
|
|
1217
1217
|
|
|
1218
1218
|
list.push(entry);
|
|
1219
1219
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "iobroker.ebus",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.6",
|
|
4
4
|
"description": "ioBroker ebus Adapter",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "René G.",
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"net": "1.0.2",
|
|
29
29
|
"promise-socket": "7.0.0",
|
|
30
30
|
"cron": "3.1.6",
|
|
31
|
-
"axios": "1.6.
|
|
31
|
+
"axios": "1.6.7"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@alcalzone/release-script": "3.7.0",
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"@types/chai-as-promised": "7.1.8",
|
|
41
41
|
"@types/gulp": "4.0.17",
|
|
42
42
|
"@types/mocha": "10.0.6",
|
|
43
|
-
"@types/node": "20.11.
|
|
43
|
+
"@types/node": "20.11.17",
|
|
44
44
|
"@types/proxyquire": "1.3.31",
|
|
45
45
|
"@types/request-promise-native": "1.0.21",
|
|
46
46
|
"@types/sinon": "17.0.3",
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
"chai-as-promised": "7.1.1",
|
|
51
51
|
"eslint": "8.56.0",
|
|
52
52
|
"gulp": "4.0.2",
|
|
53
|
-
"mocha": "10.
|
|
53
|
+
"mocha": "10.3.0",
|
|
54
54
|
"proxyquire": "2.1.3",
|
|
55
55
|
"sinon": "17.0.1",
|
|
56
56
|
"sinon-chai": "3.7.0"
|