iobroker.ebus 2.5.0 → 2.5.1

package/README.md

@@ -30,7 +30,7 @@ There is a possibillity to poll data which are not polled by ebusd directly. Com
 
 Another feature is to send any command to ebusd and receive answer to work with e.g. scripts.
 
-current supported ebusd-version: 21.2
+current supported ebusd-version: 21.3
 
 
 ## how to send commands to ebusd
@@ -52,7 +52,10 @@ Attention: command in datapoint ebus.0.cmd is deleted after executing of command
    
 ## Changelog
 
-### 2.5.0 (in progress)
+### 2.5.1 (in progress)
+* (René) adjustable retries to send data if arbitration error appeared
+
+### 2.5.0 (2021-12-28)
 * (René) see issue #62: support ebusd 21.3
 
 ### 2.4.5 (2021-11-07)

package/admin/index_m.html

@@ -273,30 +273,14 @@
                         <label for="parseTimeout" class="translate">parse_timeout</label>
                     </div>
                 </div>
+                <div class="row">
+                    <div class="input-field col s12 m4 l3">
+                        <input class="value number" id="maxretries" size="3" maxlength="3" type="number" min="0" max="10" />
+                        <label for="maxretries" class="translate">maxretries</label>
+                    </div>
+                </div>
 
-                <!--
-    <div class="row">
-        <div class="input-field col s6">
-            <textarea class="value materialize-textarea polled" id="PolledValues"></textarea>
-            <label class="translate" for="PolledValues">ListOfAllPolledValues</label>
-        </div>
-
-        <div class="col s6">
-            <span class="translate">hint_ebusd_polled</span>
-        </div>
-    </div>
-
-    <div class="row">
-        <div class="input-field col s6">
-            <textarea class="value materialize-textarea polled" id="HistoryValues"></textarea>
-            <label class="translate" for="HistoryValues">ListOfAllHistoryValues</label>
-        </div>
-
-        <div class="col s6">
-            <span class="translate">hint_ebusd_history</span>
-        </div>
-    </div>
-        -->
+                
 
             </div>
 

package/admin/words.js

@@ -16,4 +16,5 @@ systemDictionary = {
     "target_IP": {                                   "en": "target IP",                                       "de": "Ziel-IP",                                         "ru": "целевой IP-адрес",                                "pt": "IP alvo",                                         "nl": "doel-IP",                                         "fr": "cible IP",                                        "it": "IP di destinazione",                              "es": "IP objetivo",                                     "pl": "docelowy adres IP",                               "zh-cn": "目标IP"},
     "target_TelnetPort": {                           "en": "target telnet Port to write data",                "de": "target telnet Port zum Schreiben von Daten",      "ru": "целевой порт telnet для записи данных",           "pt": "destino telnet porta para escrever dados",        "nl": "doel telnet-poort om gegevens te schrijven",      "fr": "Port telnet cible pour écrire des données",       "it": "Porta telnet target per scrivere dati",           "es": "target telnet Port para escribir datos",          "pl": "docelowy port telnet do zapisu danych",           "zh-cn": "目标telnet用于写入数据的端口"},
     "useBoolean4Onoff": {                            "en": "use boolean instead string for datapoints with on/off values ", "de": "Verwenden Sie Boolean anstelle von Strings für Datenpunkte mit Ein-/Aus-Werten", "ru": "используйте логическое значение вместо строки для точек данных со значениями включения / выключения", "pt": "use booleano em vez de string para pontos de dados com valores on / off", "nl": "gebruik in plaats daarvan booleaanse string voor datapunten met aan/uit-waarden", "fr": "utiliser une chaîne booléenne à la place pour les points de données avec des valeurs activées/désactivées", "it": "usa la stringa booleana invece per i punti dati con valori on/off", "es": "use booleano en lugar de cadena para puntos de datos con valores de encendido / apagado", "pl": "użyj wartości logicznej zamiast ciągu dla punktów danych z wartościami włączonymi / wyłączonymi", "zh-cn": "对具有开/关值的数据点使用布尔值代替字符串"},
+    "maxretries": {                                  "en": "maximum number of retries to send a command ",    "de": "maximale Anzahl von Wiederholungen, um einen Befehl zu senden", "ru": "максимальное количество попыток отправки команды", "pt": "número máximo de tentativas para enviar um comando", "nl": "maximum aantal pogingen om een ​​opdracht te verzenden", "fr": "nombre maximum de tentatives pour envoyer une commande", "it": "numero massimo di tentativi per inviare un comando", "es": "número máximo de reintentos para enviar un comando", "pl": "maksymalna liczba ponownych prób wysłania polecenia", "zh-cn": "发送命令的最大重试次数"},
 };

package/io-package.json

@@ -1,8 +1,20 @@
 {
     "common": {
         "name": "ebus",
-        "version": "2.5.0",
+        "version": "2.5.1",
         "news": {
+            "2.5.1": {
+                "en": "maximum retries to send data in case of arbitration error",
+                "de": "maximale Wiederholungsversuche zum Senden von Daten im Falle eines Vermittlungsfehlers",
+                "ru": "максимальное количество попыток отправки данных в случае ошибки арбитража",
+                "pt": "máximo de tentativas para enviar dados em caso de erro de arbitragem",
+                "nl": "maximaal aantal pogingen om gegevens te verzenden in geval van arbitragefout",
+                "fr": "nombre maximum de tentatives d'envoi de données en cas d'erreur d'arbitrage",
+                "it": "numero massimo di tentativi di invio dei dati in caso di errore di arbitrato",
+                "es": "reintentos máximos para enviar datos en caso de error de arbitraje",
+                "pl": "maksymalna liczba prób wysłania danych w przypadku błędu arbitrażu",
+                "zh-cn": "仲裁错误时发送数据的最大重试次数"
+            },
             "2.5.0": {
                 "en": "support ebusd 21.3",
                 "de": "ebusd 21,3 . unterstützen",
@@ -229,6 +241,7 @@
         "parseTimeout": 60,
         "useBoolean4Onoff": false,
         "PolledDPs": [],
-        "HistoryDPs": []
+        "HistoryDPs": [],
+        "maxretries": 5
     }
 }

package/main.js

@@ -844,10 +844,6 @@ read -f YieldTotal,read LegioProtectionEnabled,read -f -c broadcast outsidetemp
 //here we need a loop over all configured read data in admin-page
 async function ebusd_ReadValues() {
 
-    
-
-
-
     if (oPolledVars.length > 0) {
 
         adapter.log.debug("to poll ctr " + oPolledVars.length + " vals:  " + JSON.stringify(oPolledVars));
@@ -860,6 +856,7 @@ async function ebusd_ReadValues() {
             adapter.log.debug("telnet connected to poll variables " + adapter.config.targetIP + " port " + adapter.config.targetTelnetPort);
             promiseSocket.setTimeout(5000);
 
+            let retries = 0;
             for (let nCtr = 0; nCtr < oPolledVars.length; nCtr++) {
 
                 let circuit = "";
@@ -887,7 +884,16 @@ async function ebusd_ReadValues() {
                     * sent read -f YieldLastYear, received ERR: arbitration lost for {"circuit":"","name":"YieldLastYear","parameter":""}
                     * */
                     if (data.includes("arbitration lost")) {
-                        nCtr--;
+
+                        retries++;
+                        if (retries > adapter.config.maxretries) {
+                            adapter.log.error("max retries, skip cmd " + cmd);
+                            retries = 0;
+                        }
+                        else {
+                            nCtr--;
+                            adapter.log.debug("retry to send data ");
+                        }
                     }
                 }
                 else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.ebus",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "ioBroker ebus Adapter",
   "author": {
     "name": "René G.",