iobroker.sprinklecontrol 0.2.14 → 0.2.16

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "sprinklecontrol",
-    "version": "0.2.14",
+    "version": "0.2.16",
     "titleLang": {
       "en": "Sprinkler Control",
       "de": "Sprinklersteuerung",
@@ -19,6 +19,32 @@
       "Dirk Peter <dirk.peter@freenet.de>"
     ],
     "news": {
+      "0.2.16": {
+        "en": "issue #95 Pump lead time added",
+        "de": "ausgabe #95 Pumpe Lieferzeit hinzugefügt",
+        "ru": "#95 Время работы насоса добавлено",
+        "pt": "número de edição #95 Tempo de lançamento da bomba adicionado",
+        "nl": "nummer #95 Pump doorlooptijd toegevoegd",
+        "fr": "numéro 95 Temps d'avance de la pompe ajouté",
+        "it": "numero #95 Pump lead time aggiunto",
+        "es": "#95 Tiempo de inicio de bomba añadido",
+        "pl": "wydanie # 95 Dodany czas ołowiu pompy",
+        "uk": "problem #95 Насос додано час",
+        "zh-cn": "增加了泵前准备时间"
+      },
+      "0.2.15": {
+        "en": "Readme updated\nFixed an error when switching off with autoOnOff\nioBroker-Bot [W028]",
+        "de": "Reader aktualisiert\nFehler beim Ausschalten mit autoOnOff behoben\nioBroker-Bot [W028]",
+        "ru": "Readme обновлено\nИсправлена ошибка при выключении с помощью autoOnOff\nioBroker-Bot [W028]",
+        "pt": "Readme atualizado\nCorrigido um erro ao desligar com autoOnOff\nioBroker-Bot [W028]",
+        "nl": "Readme bijgewerkt\nEen fout hersteld bij het uitschakelen met autoOnOff\nioBroker-Bot [W028]",
+        "fr": "Lire mise à jour\nCorrection d'une erreur lors de l'arrêt automatique\nioBoker-Bot [W028]",
+        "it": "Readme aggiornato\nRisolto un errore durante l'accensione con autoOnOff\nioBroker-Bot [W028]",
+        "es": "Readme updated\nSe corrigió un error al apagarse con autoOnOff\nioBroker-Bot [W028]",
+        "pl": "Readme zaktualizowany\nNaprawiono błąd podczas wyłączania autoOnOff\njoBroker- Bot [W028]",
+        "uk": "Читати далі\nВиправлено помилку при вимкненні з автоматичноOnOff\nioBroker-Bot [W028]",
+        "zh-cn": "更新我\n用 autoOnOff 关闭时修补错误\nioBroker-Bot [W028] (英语)"
+      },
       "0.2.14": {
         "en": "eslint-config added\nDependencies updated\nUpdate License\nissue #92 Sprinkler im Gewächshaus solved\nadd Button control.autoStart",
         "de": "eslint-config hinzugefügt\nAusgaben aktualisiert\nLizenz aktualisieren\nausgabe #92 Sprinkler im Gewächshaus gelöst\nbutton Control.autoStart",
@@ -83,32 +109,6 @@
         "pl": "- nawadnianie ręczne ograniczone do maksymalnie 100%; - Naprawiono błąd wiadomości WhatsApp",
         "uk": "- ручний полив обмежений максимум на 100%; - Виправлено повідомлення про помилку WhatsApp",
         "zh-cn": "- 手动浇水限制为最大 100%； - 错误whatsapp消息已修复"
-      },
-      "0.2.9": {
-        "en": "Bug initialization routine",
-        "de": "Bug-Initialisierungsroutine",
-        "ru": "Процедура инициализации ошибки",
-        "pt": "Rotina de inicialização de bugs",
-        "nl": "Bug initialisatie routine",
-        "fr": "Routine d'initialisation de bogue",
-        "it": "Routine di inizializzazione dei bug",
-        "es": "Rutina de inicialización de errores",
-        "pl": "Procedura inicjowania błędów",
-        "uk": "Процедура ініціалізації помилок",
-        "zh-cn": "错误初始化例程"
-      },
-      "0.2.8": {
-        "en": "Adaptation for js controller 4; switched main.js to async",
-        "de": "Anpassung für js-Controller 4; main.js auf async umgestellt",
-        "ru": "Адаптация для js контроллера 4; переключил main.js на асинхронный",
-        "pt": "Adaptação para controlador js 4; mudou main.js para assíncrono",
-        "nl": "Aanpassing voor js-controller 4; main.js overgeschakeld naar async",
-        "fr": "Adaptation pour le contrôleur js 4 ; a basculé main.js en asynchrone",
-        "it": "Adattamento per js controller 4; cambiato main.js in asincrono",
-        "es": "Adaptación para controlador js 4; cambió main.js a asíncrono",
-        "pl": "Adaptacja pod kontroler js 4; przełączył main.js na asynchroniczny",
-        "uk": "Адаптація під js контролер 4; переключив main.js на асинхронний",
-        "zh-cn": "适配js控制器4；将 main.js 切换为异步"
       }
     },
     "desc": {
@@ -172,9 +172,11 @@
     "switchingDistance": "300",
     "triggerMainPump": "hm-rpc.0.MEQ1234567.1.STATE",
     "triggerMainPumpPower": "2000",
+    "mainPumpLeadTime": "15",
     "cisternSettings": false,
     "triggerCisternPump": "",
     "triggerCisternPumpPower": "1800",
+    "cisternPumpLeadTime": "10",
     "actualValueLevel": "",
     "triggerMinCisternLevel": "25",
     "wateringStartTime": "livingGoldenHourEnd",

package/lib/evaporation.js

@@ -194,7 +194,10 @@ function calcEvaporation (timeDifference) {
      */
     const eTp = (( m6 * m5 + 0.65 * m7 * ( m1 - m2 )) / ( m6 + 0.65 )) - 0.5;
 
-    adapter.setState('evaporation.ETpCurrent', { val: Math.round(eTp * 10000) / 10000, ack: true });
+    adapter.setState('evaporation.ETpCurrent', { 
+        val: Math.round(eTp * 10000) / 10000, 
+        ack: true 
+    });
 
     addEvaporation(eTp * timeDifference);
 }
@@ -203,7 +206,10 @@ function addEvaporation (value) {
     if (value < 2) {       // um Fehler in der Auswertung beim Neustart zu löschen
         ETpTodayNum += value;
     }
-    adapter.setState('evaporation.ETpToday', { val: Math.round(ETpTodayNum * 10000) / 10000, ack: true });
+    adapter.setState('evaporation.ETpToday', { 
+        val: Math.round(ETpTodayNum * 10000) / 10000, 
+        ack: true 
+    });
 
     myConfig.applyEvaporation (value);
 }
@@ -419,9 +425,15 @@ const evaporation = {
     setNewDay () {
         extraTerStr();
         setTimeout(() => {
-            adapter.setState('evaporation.ETpYesterday', { val: Math.round(ETpTodayNum * 10000) / 10000, ack: true });
+            adapter.setState('evaporation.ETpYesterday', { 
+                val: Math.round(ETpTodayNum * 10000) / 10000, 
+                ack: true 
+            });
             ETpTodayNum = 0;
-            adapter.setState('evaporation.ETpToday', { val: 0, ack: true });
+            adapter.setState('evaporation.ETpToday', { 
+                val: 0, 
+                ack: true 
+            });
         }, 100);
     },
     /**

package/lib/myConfig.js

@@ -164,9 +164,9 @@ const myConfig = {
                     booster: res.booster,
                     endIrrigation: res.endIrrigation,
                     autoOn: true,
-                    autoOnID: `${adapter.namespace  }.sprinkle.${  objectName  }.autoOn`,                                           // sprinklecontrol.0.sprinkle.Rasenumrandung.autoOnID
+                    autoOnID: `${adapter.namespace}.sprinkle.${objectName}.autoOn`,                                           // sprinklecontrol.0.sprinkle.Rasenumrandung.autoOnID
                     objectName: objectName,		                                                                                    // z.B. Rasenumrandung 
-                    objectID: `${adapter.namespace  }.sprinkle.${  objectName  }.runningTime`,	                                    // sprinklecontrol.0.sprinkle.Rasenumrandung.runningTime 
+                    objectID: `${adapter.namespace}.sprinkle.${objectName}.runningTime`,	                                    // sprinklecontrol.0.sprinkle.Rasenumrandung.runningTime 
                     idState: res.name,                                                                                              // "hm-rpc.0.MEQ1234567.3.STATE" 
                     updateStateTimerID: null,                                                                                       // Timer wird gelöscht wenn Rückmeldung erfolgte 
                     sprinkleID: myConfig.config.length,		                                                                        // Array[0...] 
@@ -251,7 +251,7 @@ const myConfig = {
     setSoilMoistPct100: (mySprinkleID) => {
         myConfig.config[mySprinkleID].soilMoisture.val = myConfig.config[mySprinkleID].soilMoisture.maxIrrigation;
         myConfig.config[mySprinkleID].soilMoisture.pct = 100;
-        adapter.setState(`sprinkle.${  myConfig.config[mySprinkleID].objectName  }.actualSoilMoisture`, {
+        adapter.setState(`sprinkle.${myConfig.config[mySprinkleID].objectName}.actualSoilMoisture`, {
             val: myConfig.config[mySprinkleID].soilMoisture.pct,
             ack: true
         });
@@ -266,7 +266,7 @@ const myConfig = {
         if (myConfig.config[mySprinkleID].methodControlSM === 'bistable') {
             if (typeof newVal === 'boolean') {
                 myConfig.config[mySprinkleID].soilMoisture.bool = newVal;
-                adapter.setState(`sprinkle.${  [myConfig.config[mySprinkleID].objectName]  }.actualSoilMoisture`, {
+                adapter.setState(`sprinkle.${[myConfig.config[mySprinkleID].objectName]}.actualSoilMoisture`, {
                     val: myConfig.config[mySprinkleID].soilMoisture.bool,
                     ack: true
                 });
@@ -313,7 +313,7 @@ const myConfig = {
                 }
 
                 myConfig.config[mySprinkleID].soilMoisture.pct = Math.round(10 * trend(myConfig.config[mySprinkleID].analogZPct, myConfig.config[mySprinkleID].analogOHPct, 0, 100, myVal)) / 10;
-                adapter.setState(`sprinkle.${  [myConfig.config[mySprinkleID].objectName]  }.actualSoilMoisture`, {
+                adapter.setState(`sprinkle.${[myConfig.config[mySprinkleID].objectName]}.actualSoilMoisture`, {
                     val: myConfig.config[mySprinkleID].soilMoisture.pct,
                     ack: true
                 });
@@ -340,7 +340,7 @@ const myConfig = {
 
         myConfig.config[mySprinkleID].soilMoisture.pct = Math.round(1000 * myConfig.config[mySprinkleID].soilMoisture.val
             / myConfig.config[mySprinkleID].soilMoisture.maxIrrigation) / 10;	// Berechnung in %
-        adapter.setState(`sprinkle.${  myConfig.config[mySprinkleID].objectName  }.actualSoilMoisture`, {
+        adapter.setState(`sprinkle.${myConfig.config[mySprinkleID].objectName}.actualSoilMoisture`, {
             val: myConfig.config[mySprinkleID].soilMoisture.pct,
             ack: true
         });
@@ -361,11 +361,10 @@ const myConfig = {
                 myConfig.config[mySprinkleID].startFixDay[curDay] = false;
                 nextDay = (+ curDay + 1 > 6) ? (+ curDay-6) : (+ curDay+1);
                 myConfig.config[mySprinkleID].startFixDay[nextDay] = true;
-                adapter.setStateAsync(
-                    `${id}`,
-                    nextDay,
-                    true
-                ).catch((e) => adapter.log.warn(`postponeByOneDay setStateAsync: ${e}`));
+                adapter.setStateAsync(`${id}`, {
+                    val: nextDay,
+                    ack: true
+                }).catch((e) => adapter.log.warn(`postponeByOneDay setStateAsync: ${e}`));
             }
         }
     }

package/lib/valveControl.js

@@ -176,12 +176,15 @@ function boostKill (sprinkleID) {
 
 /**
  * Schaltintervall der Ventile, Schaltabstand ist in der Config hinterlegt
+ *
+ * @param delay wenn keine Zeit eingegeben ist, wird der Schaltabstand der Config verwendet
  */
-const valveDelay = () => {
+const valveDelay = (delay = parseInt(adapter.config.switchingDistance)) => {
     return new Promise (
-        resolve => setTimeout (resolve, parseInt(adapter.config.switchingDistance))
+        resolve => setTimeout (resolve, delay)
     );
 };
+
 /**
  * Ausschalten der Ventile mit Schaltabstand
  *
@@ -219,7 +222,7 @@ const switchTheValvesOffOn = async (threadList, parallel) => {
         }
     }
     if (currentPumpUse.pumpName !== '') {
-        setPumpOnOff(parallel > 0);
+        await setPumpOnOff(parallel > 0);
         await valveDelay ();
     }
     if (adapter.config.triggerControlVoltage) {
@@ -306,8 +309,8 @@ function updateList () {
         }
         entry.count ++;
         if ((entry.count < entry.wateringTime)	// Zeit noch nicht abgelaufen?
-            && (!entry.calcOn       // Vergleich nur bei Berechnung der Verdunstung
-                || !entry.autoOn	// Vergleich nur bei Automatik
+            && (!entry.calcOn       // alles ausser Berechnung der Verdunstung
+                || !entry.autoOn	// Handbetrieb
                 || (myConfig.config[entry.sprinkleID].soilMoisture.val < myConfig.config[entry.sprinkleID].soilMoisture.maxIrrigation))		// Bodenfeuchte noch nicht erreicht? (z.B. beim Regen)
         ) {     /* Zeit läuft */
             adapter.setState(`sprinkle.${entry.sprinkleName}.countdown`, {
@@ -322,7 +325,7 @@ function updateList () {
             }
             /* Intervall-Beregnung wenn angegeben (onOffTime > 0) */
             if ((entry.onOffTime > 0) && !(entry.count % entry.onOffTime)) {
-                adapter.log.info(`Intervall-Beregnung, onOffTime: ${entry.onOffTime}, count: ${entry.count}, count % onOffTime: ${entry.count % entry.onOffTime}`);
+                adapter.log.info(`Intervall-Beregnung, onOffTime: ${entry.onOffTime}, count: ${entry.count}`);
                 entry.enabled = false;
                 entry.myBreak = true;
                 /* Zustand des Ventils im Thread < 0 > off, < 1 > wait, < 2 > on, <<< 3 >>> break, < 4 > Boost(on), < 5 > off(Boost) */
@@ -496,6 +499,7 @@ function setActualPump () {
                 currentPumpUse.pumpCistern = false;
                 currentPumpUse.pumpName = adapter.config.triggerMainPump || '';
                 currentPumpUse.pumpPower = parseInt(adapter.config.triggerMainPumpPower);
+                currentPumpUse.leadTime = parseInt(adapter.config.mainPumpLeadTime)*1000 || 1000;
                 adapter.setForeignState(currentPumpUse.pumpName, {
                     val: true,
                     ack: false
@@ -531,6 +535,7 @@ function setActualPump () {
                 currentPumpUse.pumpCistern = true;
                 currentPumpUse.pumpName = adapter.config.triggerCisternPump || '';
                 currentPumpUse.pumpPower = parseInt(adapter.config.triggerCisternPumpPower);
+                currentPumpUse.leadTime = parseInt(adapter.config.cisternPumpLeadTime)*1000 || 1000;
                 adapter.setState('control.restFlow', {
                     val: `${currentPumpUse.pumpPower} (${currentPumpUse.pumpPower} Zisterne)`,
                     ack: true
@@ -544,6 +549,7 @@ function setActualPump () {
                 currentPumpUse.pumpCistern = false;
                 currentPumpUse.pumpName = adapter.config.triggerMainPump || '';
                 currentPumpUse.pumpPower = parseInt(adapter.config.triggerMainPumpPower);
+                currentPumpUse.leadTime = parseInt(adapter.config.mainPumpLeadTime)*1000 || 1000;
                 adapter.setState('control.restFlow', {
                     val: `${currentPumpUse.pumpPower} (${currentPumpUse.pumpPower} Grundwasser)`,
                     ack: true
@@ -568,21 +574,23 @@ function setActualPump () {
  * 
  * @param pumpOnOff ; Pumpe on = true
  */
-function setPumpOnOff(pumpOnOff) {
+const setPumpOnOff = async (pumpOnOff) => {
     if (currentPumpUse.pumpName !== '') {
-        adapter.getForeignState(currentPumpUse.pumpName, (err, state) => {
-            if (state) {
+        try {
+            const curPumpState = await adapter.getForeignStateAsync(currentPumpUse.pumpName);
+            if (curPumpState) {
                 if (pumpOnOff) {
-                    if (state.val === false) {
+                    if (curPumpState.val === false) {
                         adapter.setForeignState(currentPumpUse.pumpName, {
                             val: true,
                             ack: false
                         });
                         currentPumpUse.enable = true;
                         adapter.log.info('Set (pump) on');
+                        await valveDelay(currentPumpUse.leadTime);
                     }
                 } else {
-                    if (state.val !== false) {
+                    if (curPumpState.val !== false) {
                         adapter.setForeignState(currentPumpUse.pumpName, {
                             val: false,
                             ack: false
@@ -591,10 +599,10 @@ function setPumpOnOff(pumpOnOff) {
                         adapter.log.info('Set (pump) off');
                     }
                 }
-            } else if (err) {
-                adapter.log.error(`triggerMainPump ${currentPumpUse.pumpName} is not available (ist nicht erreichbar): ${err}`);
             }
-        });
+        } catch (error) {
+            adapter.log.error(`triggerMainPump ${currentPumpUse.pumpName} is not available (ist nicht erreichbar): ${error}`);
+        }
     }
 }   // End setPumpOnOff
 
@@ -690,6 +698,7 @@ const valveControl = {
         currentPumpUse.pumpCistern = false;
         currentPumpUse.pumpName = adapter.config.triggerMainPump || '';
         currentPumpUse.pumpPower = parseInt(adapter.config.triggerMainPumpPower) || 0;
+        currentPumpUse.leadTime = parseInt(adapter.config.mainPumpLeadTime)*1000 || 1000;
         maxParallel = parseInt(adapter.config.maximumParallelValves);
         /* Objekt control.restFlow befüllen */
         adapter.setState('control.restFlow', {
@@ -701,11 +710,22 @@ const valveControl = {
             val: `0 : ${adapter.config.maximumParallelValves}`,
             ack: true
         });
+        /* 24V ausschalter, wenn vorhanden */
+        if (adapter.config.triggerControlVoltage !== '') {
+            adapter.getForeignState('adapter.config.triggerControlVoltage', (err, state) => {
+                if (state && state.val === true) {
+                    adapter.setForeignState(adapter.config.triggerControlVoltage, {
+                        val: false,
+                        ack: false
+                    });
+                }
+            });
+        }
         /* Pumpe ausschalter, wenn vorhanden */
         if (adapter.config.triggerMainPump !== '') {
-            adapter.getState('adapter.config.triggerMainPump', (err, state) => {
-                if (state) {
-                    adapter.setState(adapter.config.triggerMainPump, {
+            adapter.getForeignState('adapter.config.triggerMainPump', (err, state) => {
+                if (state && state.val === true) {
+                    adapter.setForeignState(adapter.config.triggerMainPump, {
                         val: false,
                         ack: false
                     });
@@ -714,9 +734,9 @@ const valveControl = {
         }
         /* Pumpe (Zisterne) ausschalter, wenn vorhanden */
         if (adapter.config.triggerCisternPump !== '') {
-            adapter.getState('adapter.config.triggerCisternPump', (err, state) => {
-                if (state) {
-                    adapter.setState(adapter.config.triggerCisternPump, {
+            adapter.getForeignState('adapter.config.triggerCisternPump', (err, state) => {
+                if (state && state.val === true) {
+                    adapter.setForeignState(adapter.config.triggerCisternPump, {
                         val: false,
                         ack: false
                     });
@@ -727,9 +747,9 @@ const valveControl = {
         const result = adapter.config.events;
         if (result) {
             for (const res of result) {
-                adapter.getState(res.name, (err, state) => {
-                    if (state) {
-                        adapter.setState(res.name, {
+                adapter.getForeignState(res.name, (err, state) => {
+                    if (state && state.val === true) {
+                        adapter.setForeignState(res.name, {
                             val: false,
                             ack: false
                         });
@@ -772,6 +792,15 @@ const valveControl = {
                         });
                         addDone = true;		// Sprinkle found
                         adapter.log.debug(`update ID: ${entry.sprinkleName} new time: ${addTime(res.wateringTime)}`);
+                        // Wenn aktueller Spränger im BoostOn ausgeschaltet werden soll (ersten 30s)
+                        if (boostOn
+                            && myConfig.config[res.sprinkleID].booster
+                            && entry.wateringTime <= 0
+                        ) {
+                            boostKill(res.sprinkleID);
+                            boostReady = true;
+                            adapter.log.debug(`ID: ${res.sprinkleName} BoostKill Sprinkle Off: boostReady = ${boostReady}`);
+                        }
                         break;
                     }
                 }
@@ -820,8 +849,8 @@ const valveControl = {
                     soilMoisture15s: 15 * (myConfig.config[res.sprinkleID].soilMoisture.maxIrrigation - myConfig.config[res.sprinkleID].soilMoisture.triggersIrrigation)
                                                 / (60 * myConfig.config[res.sprinkleID].wateringTime),
                     times: {
-                        boostTime1: null,  // boost start 
-                        boostTime2: null,  // boost ende
+                        boostTime1: null,  // boost start in die Zwangspause schicken in 0,25s
+                        boostTime2: null,  // boost ende aus der Zwangspause holen nach 31s
                     },       // hinterlegen der verschiedenen Zeiten von timeout für gezieltes späteres löschen  
                     id: threadList.length || 0,
                     };
@@ -849,6 +878,8 @@ const valveControl = {
         setVoltageOnOff(false);
         setPumpOnOff(false);
         if (boostListTimer) {
+            boostReady = true;
+            boostOn = false;
             clearTimeout(boostListTimer);
         }
         // let bValveFound = false;	// Ventil gefunden
@@ -860,7 +891,7 @@ const valveControl = {
                 adapter.log.info(`Set Valve (SprinkleControl: off) ID: ${entry.sprinkleName}, value: false`);
                 adapter.setForeignState(entry.idState, {
                     val: false,
-                    ack: true
+                    ack: false
                 });
             }
             /* Zustand des Ventils im Thread <<< 0 >>> off, < 1 > wait, < 2 > on, < 3 > break, < 4 > Boost(on), < 5 > off(Boost) */