iobroker.ebus 3.0.3 → 3.0.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 -1
- package/io-package.json +2 -2
- package/main.js +6 -3
- package/package.json +1 -1
- package/widgets/ebus.html +28 -4
package/README.md
CHANGED
|
@@ -55,7 +55,10 @@ Attention: command in datapoint ebus.0.cmd is deleted after executing of command
|
|
|
55
55
|
|
|
56
56
|
## Changelog
|
|
57
57
|
|
|
58
|
-
### 3.0.
|
|
58
|
+
### 3.0.6 (2022-08-19)
|
|
59
|
+
* (René) bug fix in tooltip in wizard
|
|
60
|
+
|
|
61
|
+
### 3.0.4 (2022-08-18)
|
|
59
62
|
* (René) tooltip in wizard added
|
|
60
63
|
* (René) flot and dependencies updated
|
|
61
64
|
* (René) errors from ebusd are shown as warning here in adapter, details schould be checked in logs of ebusd
|
package/io-package.json
CHANGED
package/main.js
CHANGED
|
@@ -261,7 +261,7 @@ async function ebusd_Command() {
|
|
|
261
261
|
const data = await promiseSocket.read();
|
|
262
262
|
|
|
263
263
|
if (data.includes("ERR")) {
|
|
264
|
-
adapter.log.warn("sent " + oCmds[n] + ", received " + data + " please check ebusd logs for details!";
|
|
264
|
+
adapter.log.warn("sent " + oCmds[n] + ", received " + data + " please check ebusd logs for details!");
|
|
265
265
|
}
|
|
266
266
|
else {
|
|
267
267
|
adapter.log.debug("received " + data);
|
|
@@ -653,7 +653,10 @@ async function ebusd_ReceiveData() {
|
|
|
653
653
|
let bSkip = false;
|
|
654
654
|
|
|
655
655
|
if (subnames[0].includes("scan") ||
|
|
656
|
-
subnames[0].includes("ehp")
|
|
656
|
+
subnames[0].includes("ehp") ||
|
|
657
|
+
(subnames.length>2 && subnames[2].includes("currenterror"))
|
|
658
|
+
|
|
659
|
+
) {
|
|
657
660
|
bSkip = true;
|
|
658
661
|
}
|
|
659
662
|
if (temp > 2) {
|
|
@@ -672,7 +675,7 @@ async function ebusd_ReceiveData() {
|
|
|
672
675
|
else {
|
|
673
676
|
sError += sError1;
|
|
674
677
|
}
|
|
675
|
-
adapter.log.
|
|
678
|
+
adapter.log.warn(sError1);
|
|
676
679
|
}
|
|
677
680
|
|
|
678
681
|
|
package/package.json
CHANGED
package/widgets/ebus.html
CHANGED
|
@@ -1372,12 +1372,35 @@
|
|
|
1372
1372
|
function SetMarkingColor(color) {
|
|
1373
1373
|
MarkingColor = color;
|
|
1374
1374
|
}
|
|
1375
|
-
function noneFormatter(
|
|
1376
|
-
|
|
1375
|
+
function noneFormatter(val, axis) {
|
|
1376
|
+
|
|
1377
|
+
let myval;
|
|
1378
|
+
if (typeof val == "string") {
|
|
1379
|
+
console.log('noneFormatter convert to number ');
|
|
1380
|
+
myval = Number(val);
|
|
1381
|
+
}
|
|
1382
|
+
else {
|
|
1383
|
+
myval = val;
|
|
1384
|
+
}
|
|
1385
|
+
|
|
1386
|
+
console.log('noneFormatter for ' + val + " " + typeof val);
|
|
1387
|
+
|
|
1388
|
+
return (myval * 1).toFixed(axis.tickDecimals);
|
|
1377
1389
|
}
|
|
1378
1390
|
|
|
1379
|
-
function degreeFormatter(
|
|
1380
|
-
|
|
1391
|
+
function degreeFormatter(val, axis) {
|
|
1392
|
+
let myval;
|
|
1393
|
+
if (typeof val == "string") {
|
|
1394
|
+
console.log('degreeFormatter convert to number ');
|
|
1395
|
+
myval = Number(val);
|
|
1396
|
+
}
|
|
1397
|
+
else {
|
|
1398
|
+
myval = val;
|
|
1399
|
+
}
|
|
1400
|
+
|
|
1401
|
+
console.log('degreeFormatter for ' + val + " " + typeof val);
|
|
1402
|
+
|
|
1403
|
+
return (myval * 1).toFixed(axis.tickDecimals) + "°C";
|
|
1381
1404
|
}
|
|
1382
1405
|
|
|
1383
1406
|
function xwhFormatter(val, axis) {
|
|
@@ -1399,6 +1422,7 @@
|
|
|
1399
1422
|
else
|
|
1400
1423
|
return (myval*1).toFixed(axis.tickDecimals) + " Wh";
|
|
1401
1424
|
}
|
|
1425
|
+
|
|
1402
1426
|
function xwFormatter(val, axis) {
|
|
1403
1427
|
|
|
1404
1428
|
let myval;
|