iobroker.sprinklecontrol 0.2.15 → 0.2.16

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "sprinklecontrol",
-    "version": "0.2.15",
+    "version": "0.2.16",
     "titleLang": {
       "en": "Sprinkler Control",
       "de": "Sprinklersteuerung",
@@ -19,6 +19,19 @@
       "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]",
@@ -96,19 +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": "错误初始化例程"
       }
     },
     "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/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) {
@@ -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', {
@@ -783,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;
                     }
                 }
@@ -831,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,
                     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sprinklecontrol",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "Control of several sprinklers depending on weather conditions and pump performance.",
   "author": {
     "name": "Dirk Peter",