iobroker.ebus 2.4.2 → 2.5.0

package/README.md

@@ -52,6 +52,20 @@ Attention: command in datapoint ebus.0.cmd is deleted after executing of command
    
 ## Changelog
 
+### 2.5.0 (in progress)
+* (René) see issue #62: support ebusd 21.3
+
+### 2.4.5 (2021-11-07)
+* (René) bug fix color of labels in widget
+
+### 2.4.4 (2021-10-30)
+* (René) see issue #59: avoid endless loop
+* (René) update flot to 4.2.2
+* (René) bug fix missing space in command when using circuit name
+
+## 2.4.3 (2021-10-21)
+* (René) see issue #58: bug fix for Warn: ignoring history value 1 (invalid)" when no history values set
+
 ## 2.4.2 (2021-10-19)
 * (René) see issue #55: bug fix
 

package/admin/index_m.html

@@ -102,16 +102,18 @@
 
                 var newValues = [];
                 for (let i = 0; i < values.length; i++) {
-                    console.log('add ' + values[i]);
-                    const value = {
-                        circuit: "",
-                        name: values[i],
-                        parameter: "",
+                    if (values[i].length > 0) {
+                        console.log('add ' + values[i]);
+                        const value = {
+                            circuit: "",
+                            name: values[i],
+                            parameter: "",
+                        }
+                        newValues.push(value);
                     }
-                    newValues.push(value);
                 }
                 values2table('polledDP', newValues, OnChange, tablePolledDPOnReady);
-                console.log('using PolledValues from settings ' + JSON.stringify(settings.PolledValues) + " " + JSON.stringify(newValues));
+                console.log('using PolledValues from old settings ' + JSON.stringify(settings.PolledValues) + " " + JSON.stringify(newValues));
                 
             }
 
@@ -150,14 +152,16 @@
 
                 var newValues = [];
                 for (let i = 0; i < values.length; i++) {
-                    console.log('add ' + values[i]);
-                    const value = {
-                        name: values[i],
+                    if (values[i].length > 0) {
+                        console.log('add ' + values[i]);
+                        const value = {
+                            name: values[i],
+                        }
+                        newValues.push(value);
                     }
-                    newValues.push(value);
                 }
                 values2table('historyDP', newValues, OnChange, tableHistoryDPOnReady);
-                console.log('using HistoryValues from settings ' + JSON.stringify(settings.HistoryValues) + " " + JSON.stringify(newValues));
+                console.log('using HistoryValues from old settings ' + JSON.stringify(settings.HistoryValues) + " " + JSON.stringify(newValues));
                 
             }
         } 
@@ -184,7 +188,10 @@
             });
 
             obj.PolledDPs = table2values('polledDP');
+            console.log('saving polledDP ' + JSON.stringify(obj.PolledDPs));
+
             obj.HistoryDPs = table2values('historyDP');
+            console.log('saving historyDP ' + JSON.stringify(obj.HistoryDPs));
 
             obj.PolledValues = "";
             obj.HistoryValues = "";

package/io-package.json

@@ -1,9 +1,45 @@
 {
     "common": {
         "name": "ebus",
-        "version": "2.4.2",
+        "version": "2.5.0",
         "news": {
-            "2.4.2": {
+            "2.5.0": {
+                "en": "support ebusd 21.3",
+                "de": "ebusd 21,3 . unterstützen",
+                "ru": "поддержка ebusd 21.3",
+                "pt": "suporte ebusd 21.3",
+                "nl": "ondersteuning ebusd 21.3",
+                "fr": "soutien ebusd 21.3",
+                "it": "supporto ebusd 21.3",
+                "es": "soporte ebusd 21.3",
+                "pl": "wsparcie ebusd 21.3",
+                "zh-cn": "支持 ebusd 21.3"
+            },
+            "2.4.5": {
+                "en": "bug fix color of labels in widget",
+                "de": "Fehlerkorrektur Farbe der Labels im Widget",
+                "ru": "исправлена ​​ошибка цвета меток в виджете",
+                "pt": "correção de bug de cor de rótulos no widget",
+                "nl": "bug fix kleur van labels in widget",
+                "fr": "correction de bogues couleur des étiquettes dans le widget",
+                "it": "bug fix colore delle etichette nel widget",
+                "es": "corrección de errores de color de las etiquetas en el widget",
+                "pl": "naprawa błędu koloru etykiet w widżecie",
+                "zh-cn": "错误修复小部件中标签的颜色"
+            },
+            "2.4.4": {
+                "en": "avoid endles loops",
+                "de": "Endlosschleifen vermeiden",
+                "ru": "избегать петель endles",
+                "pt": "evite loops de endles",
+                "nl": "vermijd eindeloze lussen",
+                "fr": "éviter les boucles sans fin",
+                "it": "evita i loop infiniti",
+                "es": "evitar bucles endles",
+                "pl": "unikaj niekończących się pętli",
+                "zh-cn": "避免无限循环"
+            },
+            "2.4.3": {
                 "en": "small bugs solved",
                 "de": "kleine Fehler behoben",
                 "ru": "исправлены мелкие ошибки",

package/main.js

@@ -11,8 +11,11 @@
 /*jslint node: true */
 "use strict";
 
+
+
+
 const utils = require("@iobroker/adapter-core");
-const ebusdMinVersion = [21, 2];
+const ebusdMinVersion = [21, 3];
 let ebusdVersion = [0, 0];
 let ebusdUpdateVersion = [0, 0];
 
@@ -101,13 +104,15 @@ function FillPolledVars() {
         if (oPolled.length > 0) {
 
             for (let i = 0; i < oPolled.length; i++) {
-                console.log('add ' + oPolled[i]);
-                const value = {
-                    circuit: "",
-                    name: oPolled[i],
-                    parameter: ""
+                if (oPolled[i].length > 0) {
+                    console.log('add ' + oPolled[i]);
+                    const value = {
+                        circuit: "",
+                        name: oPolled[i],
+                        parameter: ""
+                    }
+                    oPolledVars.push(value);
                 }
-                oPolledVars.push(value);
             }
         }
     }
@@ -128,11 +133,13 @@ function FillHistoryVars() {
         if (oHistory.length > 0) {
 
             for (let i = 0; i < oHistory.length; i++) {
-                console.log('add ' + oHistory[i]);
-                const value = {
-                    name: oHistory[i],
+                if (oHistory[i].length > 0) {
+                    console.log('add ' + oHistory[i]);
+                    const value = {
+                        name: oHistory[i],
+                    }
+                    oHistoryVars.push(value);
                 }
-                oHistoryVars.push(value);
             }
         }
     }
@@ -858,7 +865,7 @@ async function ebusd_ReadValues() {
                 let circuit = "";
                 let params = "";
                 if (oPolledVars[nCtr].circuit != null && oPolledVars[nCtr].circuit.length > 0) {
-                    circuit = "-c " + oPolledVars[nCtr].circuit;
+                    circuit = "-c " + oPolledVars[nCtr].circuit + " ";
                 }
                 if (oPolledVars[nCtr].parameter != null && oPolledVars[nCtr].parameter.length > 0) {
                     params = " " + oPolledVars[nCtr].parameter;
@@ -875,6 +882,13 @@ async function ebusd_ReadValues() {
                 //received ERR: arbitration lost for YieldThisYear
                 if (data.includes("ERR")) {
                     adapter.log.error("sent " + cmd + ", received " + data + " for " + JSON.stringify(oPolledVars[nCtr]));
+
+                    /*
+                    * sent read -f YieldLastYear, received ERR: arbitration lost for {"circuit":"","name":"YieldLastYear","parameter":""}
+                    * */
+                    if (data.includes("arbitration lost")) {
+                        nCtr--;
+                    }
                 }
                 else {
                     adapter.log.debug("received " + data + " for " + JSON.stringify(oPolledVars[nCtr]));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.ebus",
-  "version": "2.4.2",
+  "version": "2.5.0",
   "description": "ioBroker ebus Adapter",
   "author": {
     "name": "René G.",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "2.5.1",
-    "@sentry/node": "6.13.3",
+    "@sentry/node": "6.16.1",
     "bent": "7.3.12",
     "flat": "5.0.2",
     "net": "1.0.2",
@@ -29,23 +29,23 @@
   },
   "devDependencies": {
     "@iobroker/testing": "2.5.2",
-    "@types/chai": "4.2.22",
+    "@types/chai": "4.3.0",
     "@types/chai-as-promised": "7.1.4",
     "@types/gulp": "4.0.9",
     "@types/mocha": "9.0.0",
-    "@types/node": "12.20.33",
+    "@types/node": "16.11.14",
     "@types/proxyquire": "1.3.28",
     "@types/request-promise-native": "1.0.18",
-    "@types/sinon": "10.0.4",
-    "@types/sinon-chai": "3.2.5",
-    "axios": "0.23.0",
+    "@types/sinon": "10.0.6",
+    "@types/sinon-chai": "3.2.6",
+    "axios": "0.24.0",
     "chai": "4.3.4",
     "chai-as-promised": "7.1.1",
-    "eslint": "8.0.1",
+    "eslint": "8.5.0",
     "gulp": "4.0.2",
     "mocha": "9.1.3",
     "proxyquire": "2.1.3",
-    "sinon": "11.1.2",
+    "sinon": "12.0.1",
     "sinon-chai": "3.7.0"
   },
   "main": "main.js",

package/widgets/ebus/lib/js/flot/jquery.canvaswrapper.js

@@ -175,7 +175,7 @@ don't work unless the canvas is attached to the DOM.
         }
     };
 
-    /*
+    /**
     - getSVGLayer(classes)
 
      Creates (if necessary) and returns the SVG overlay container.
@@ -226,7 +226,7 @@ don't work unless the canvas is attached to the DOM.
         return layer;
     };
 
-    /*
+    /**
     - getTextInfo(layer, text, font, angle, width)
 
      Creates (if necessary) and returns a text info object.
@@ -354,7 +354,7 @@ don't work unless the canvas is attached to the DOM.
         }
     }
 
-    /*
+    /**
     - addText (layer, x, y, text, font, angle, width, halign, valign, transforms)
 
      Adds a text string to the canvas text overlay.
@@ -367,8 +367,8 @@ don't work unless the canvas is attached to the DOM.
      and text is the string to draw
     */
     Canvas.prototype.addText = function(layer, x, y, text, font, angle, width, halign, valign, transforms) {
-        var info = this.getTextInfo(layer, text, font, angle, width);
-        positions = info.positions;
+        var info = this.getTextInfo(layer, text, font, angle, width),
+            positions = info.positions;
 
         // Tweak the div's position to match the text's alignment
 
@@ -388,7 +388,6 @@ don't work unless the canvas is attached to the DOM.
 
         y += 0.75 * info.height;
 
-
         // Determine whether this text already exists at this position.
         // If so, mark it for inclusion in the next render pass.
 
@@ -449,7 +448,7 @@ don't work unless the canvas is attached to the DOM.
         position.element.style.textAlign = halign;
         // update the transforms
         updateTransforms(position.element, transforms);
-   };
+    };
 
     var addTspanElements = function(text, element, x) {
         var lines = text.split('<br>'),
@@ -463,7 +462,7 @@ don't work unless the canvas is attached to the DOM.
                 tspan = element.childNodes[i];
             }
             tspan.textContent = lines[i];
-            offset = i * 1 + 'em';
+            offset = (i === 0 ? 0 : 1) + 'em';
             tspan.setAttributeNS(null, 'dy', offset);
             tspan.setAttributeNS(null, 'x', x);
         }

package/widgets/ebus/lib/js/flot/jquery.flot.axislabels.js

@@ -0,0 +1,215 @@
+/*
+Axis label plugin for flot
+
+Derived from:
+Axis Labels Plugin for flot.
+http://github.com/markrcote/flot-axislabels
+
+Original code is Copyright (c) 2010 Xuan Luo.
+Original code was released under the GPLv3 license by Xuan Luo, September 2010.
+Original code was rereleased under the MIT license by Xuan Luo, April 2012.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+(function($) {
+    "use strict";
+
+    var options = {
+        axisLabels: {
+            show: true
+        }
+    };
+
+    function AxisLabel(axisName, position, padding, placeholder, axisLabel, surface) {
+        this.axisName = axisName;
+        this.position = position;
+        this.padding = padding;
+        this.placeholder = placeholder;
+        this.axisLabel = axisLabel;
+        this.surface = surface;
+        this.width = 0;
+        this.height = 0;
+        this.elem = null;
+    }
+
+    AxisLabel.prototype.calculateSize = function() {
+        var axisId = this.axisName + 'Label',
+            layerId = axisId + 'Layer',
+            className = axisId + ' axisLabels';
+
+        var info = this.surface.getTextInfo(layerId, this.axisLabel, className);
+        this.labelWidth = info.width;
+        this.labelHeight = info.height;
+
+        if (this.position === 'left' || this.position === 'right') {
+            this.width = this.labelHeight + this.padding;
+            this.height = 0;
+        } else {
+            this.width = 0;
+            this.height = this.labelHeight + this.padding;
+        }
+    };
+
+    AxisLabel.prototype.transforms = function(degrees, x, y, svgLayer) {
+        var transforms = [], translate, rotate;
+        if (x !== 0 || y !== 0) {
+            translate = svgLayer.createSVGTransform();
+            translate.setTranslate(x, y);
+            transforms.push(translate);
+        }
+        if (degrees !== 0) {
+            rotate = svgLayer.createSVGTransform();
+            var centerX = Math.round(this.labelWidth / 2),
+                centerY = 0;
+            rotate.setRotate(degrees, centerX, centerY);
+            transforms.push(rotate);
+        }
+
+        return transforms;
+    };
+
+    AxisLabel.prototype.calculateOffsets = function(box) {
+        var offsets = {
+            x: 0,
+            y: 0,
+            degrees: 0
+        };
+        if (this.position === 'bottom') {
+            offsets.x = box.left + box.width / 2 - this.labelWidth / 2;
+            offsets.y = box.top + box.height - this.labelHeight;
+        } else if (this.position === 'top') {
+            offsets.x = box.left + box.width / 2 - this.labelWidth / 2;
+            offsets.y = box.top;
+        } else if (this.position === 'left') {
+            offsets.degrees = -90;
+            offsets.x = box.left - this.labelWidth / 2;
+            offsets.y = box.height / 2 + box.top;
+        } else if (this.position === 'right') {
+            offsets.degrees = 90;
+            offsets.x = box.left + box.width - this.labelWidth / 2;
+            offsets.y = box.height / 2 + box.top;
+        }
+        offsets.x = Math.round(offsets.x);
+        offsets.y = Math.round(offsets.y);
+
+        return offsets;
+    };
+
+    AxisLabel.prototype.cleanup = function() {
+        var axisId = this.axisName + 'Label',
+            layerId = axisId + 'Layer',
+            className = axisId + ' axisLabels';
+        this.surface.removeText(layerId, 0, 0, this.axisLabel, className);
+    };
+
+    AxisLabel.prototype.draw = function(box) {
+        var axisId = this.axisName + 'Label',
+            layerId = axisId + 'Layer',
+            className = axisId + ' axisLabels',
+            offsets = this.calculateOffsets(box),
+            style = {
+                position: 'absolute',
+                bottom: '',
+                right: '',
+                display: 'inline-block',
+                'white-space': 'nowrap'
+            };
+
+        var layer = this.surface.getSVGLayer(layerId);
+        var transforms = this.transforms(offsets.degrees, offsets.x, offsets.y, layer.parentNode);
+
+        this.surface.addText(layerId, 0, 0, this.axisLabel, className, undefined, undefined, undefined, undefined, transforms);
+        this.surface.render();
+        Object.keys(style).forEach(function(key) {
+            layer.style[key] = style[key];
+        });
+    };
+
+    function init(plot) {
+        plot.hooks.processOptions.push(function (plot, options) {
+
+            console.log('??????? ');
+
+            if (!options.axisLabels.show) {
+                return;
+            }
+
+            var axisLabels = {};
+            var defaultPadding = 2; // padding between axis and tick labels
+
+            plot.hooks.axisReserveSpace.push(function(plot, axis) {
+                var opts = axis.options;
+                var axisName = axis.direction + axis.n;
+
+                axis.labelHeight += axis.boxPosition.centerY;
+                axis.labelWidth += axis.boxPosition.centerX;
+
+                if (!opts || !opts.axisLabel || !axis.show) {
+                    return;
+                }
+
+                var padding = opts.axisLabelPadding === undefined
+                    ? defaultPadding
+                    : opts.axisLabelPadding;
+
+                var axisLabel = axisLabels[axisName];
+                if (!axisLabel) {
+                    axisLabel = new AxisLabel(axisName,
+                        opts.position, padding,
+                        plot.getPlaceholder()[0], opts.axisLabel, plot.getSurface());
+                    axisLabels[axisName] = axisLabel;
+                }
+
+                axisLabel.calculateSize();
+
+                // Incrementing the sizes of the tick labels.
+                axis.labelHeight += axisLabel.height;
+                axis.labelWidth += axisLabel.width;
+            });
+
+            // TODO - use the drawAxis hook
+            plot.hooks.draw.push(function(plot, ctx) {
+                $.each(plot.getAxes(), function(flotAxisName, axis) {
+                    var opts = axis.options;
+                    if (!opts || !opts.axisLabel || !axis.show) {
+                        return;
+                    }
+
+                    var axisName = axis.direction + axis.n;
+                    axisLabels[axisName].draw(axis.box);
+                });
+            });
+
+            plot.hooks.shutdown.push(function(plot, eventHolder) {
+                for (var axisName in axisLabels) {
+                    axisLabels[axisName].cleanup();
+                }
+            });
+        });
+    };
+
+    $.plot.plugins.push({
+        init: init,
+        options: options,
+        name: 'axisLabels',
+        version: '3.0'
+    });
+})(jQuery);

package/widgets/ebus/lib/js/flot/jquery.flot.drawSeries.js

@@ -42,7 +42,7 @@ This plugin is used by flot for drawing lines, plots, bars or area.
                     continue;
                 }
 
-                if(steps){
+                if (steps) {
                     if (mx !== null && my !== null) {
                         // if middle point exists, transfer p2 -> p1 and p1 -> mp
                         x2 = x1;
@@ -202,7 +202,7 @@ This plugin is used by flot for drawing lines, plots, bars or area.
                     continue;
                 }
 
-                if(steps){
+                if (steps) {
                     if (mx !== null && my !== null) {
                         // if middle point exists, transfer p2 -> p1 and p1 -> mp
                         x2 = x1;
@@ -482,8 +482,7 @@ This plugin is used by flot for drawing lines, plots, bars or area.
                     drawLeft = true;
                     drawRight = false;
                 }
-            }
-            else {
+            } else {
                 drawLeft = drawRight = drawTop = true;
                 drawBottom = false;
                 left = x + barLeft;

package/widgets/ebus/lib/js/flot/jquery.flot.fillbetween.js

@@ -32,7 +32,7 @@ jquery.flot.stack.js plugin, possibly some code could be shared.
 (function ($) {
     var options = {
         series: {
-            fillBetween: null    // or number
+            fillBetween: null // or number
         }
     };
 
@@ -60,11 +60,11 @@ jquery.flot.stack.js plugin, possibly some code could be shared.
             if (s.fillBetween == null) {
                 return;
             }
-            
-            format = datapoints.format;
+
+            var format = datapoints.format;
             var plotHasId = function(id) {
                 var plotData = plot.getData();
-                for (i = 0; i < plotData.length; i++) {
+                for (var i = 0; i < plotData.length; i++) {
                     if (plotData[i].id === id) {
                         return true;
                     }
@@ -76,17 +76,17 @@ jquery.flot.stack.js plugin, possibly some code could be shared.
             if (!format) {
                 format = [];
 
-                format.push({ 
-                    x: true, 
-                    number: true, 
+                format.push({
+                    x: true,
+                    number: true,
                     computeRange: s.xaxis.options.autoScale !== 'none',
-                    required: true 
+                    required: true
                 });
-                format.push({ 
-                    y: true, 
-                    number: true, 
+                format.push({
+                    y: true,
+                    number: true,
                     computeRange: s.yaxis.options.autoScale !== 'none',
-                    required: true 
+                    required: true
                 });
 
                 if (s.fillBetween !== undefined && s.fillBetween !== '' && plotHasId(s.fillBetween) && s.fillBetween !== s.id) {

package/widgets/ebus/lib/js/flot/jquery.flot.hover.js

@@ -79,7 +79,6 @@ the tooltip from webcharts).
             highlights = [];
         }
 
-
         function generatePlothoverEvent(e) {
             var o = plot.getOptions(),
                 newEvent = new CustomEvent('mouseevent');
@@ -98,10 +97,10 @@ the tooltip from webcharts).
 
         function doTriggerClickHoverEvent(event, eventType, searchDistance) {
             var series = plot.getData();
-            if (event !== undefined
-                && series.length > 0
-                && series[0].xaxis.c2p !== undefined
-                && series[0].yaxis.c2p !== undefined) {
+            if (event !== undefined &&
+                series.length > 0 &&
+                series[0].xaxis.c2p !== undefined &&
+                series[0].yaxis.c2p !== undefined) {
                 var eventToTrigger = "plot" + eventType;
                 var seriesFlag = eventType + "able";
                 triggerClickHoverEvent(eventToTrigger, event,
@@ -155,8 +154,8 @@ the tooltip from webcharts).
             var items = plot.findNearbyItems(canvasX, canvasY, seriesFilter, distance);
             var item = items[0];
 
-            for (var i = 1; i < items.length; ++i) {
-                if (item.distance === undefined || 
+            for (let i = 1; i < items.length; ++i) {
+                if (item.distance === undefined ||
                     items[i].distance < item.distance) {
                     item = items[i];
                 }
@@ -172,7 +171,7 @@ the tooltip from webcharts).
 
             if (options.grid.autoHighlight) {
                 // clear auto-highlights
-                for (var i = 0; i < highlights.length; ++i) {
+                for (let i = 0; i < highlights.length; ++i) {
                     var h = highlights[i];
                     if ((h.auto === eventname &&
                         !(item && h.series === item.series &&