iobroker.sprinklecontrol 1.0.3 → 1.0.5

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "sprinklecontrol",
-    "version": "1.0.3",
+    "version": "1.0.5",
     "titleLang": {
       "en": "Sprinkler Control",
       "de": "Sprinklersteuerung",
@@ -19,6 +19,32 @@
       "Dirk Peter <dirk.peter@freenet.de>"
     ],
     "news": {
+      "1.0.5": {
+        "en": "Adapter benötigt jetzt node.js >= 22\nSecond start time added\nbug fixed in sprinklerState",
+        "de": "Adapter benötigt jetzt node.js >= 22\nZweite Startzeit hinzugefügt\nfehler behoben in SprinklerState",
+        "ru": "Адаптер benötigt jetzt node.js >= 22\nДобавлено второе время\nбаг фиксируется в SprinklerState",
+        "pt": "Adaptador benötigt jetzt node.js >= 22\nSegunda hora de início adicionada\nerro corrigido no aspersorState",
+        "nl": "Voor de toepassing van deze onderverdeling wordt verstaan onder:\nTweede starttijd toegevoegd\nbug vast in sprinklerState",
+        "fr": "Adaptateur benötigt jetzt node.js >= 22\nDeuxième heure de départ ajoutée\nbug corrigé dans l'état arroseur",
+        "it": "Adattatore Benötigt jetzt node.js >= 22\nTempo di partenza aggiunto\nbug fisso in sprinkler",
+        "es": "Adaptador benötigt jetzt node.js ⇩= 22\nSegundo tiempo de inicio añadido\nbug fijado en sprinklerState",
+        "pl": "Adapter benötigt jetzt node.js > = 22\nDodano drugi czas rozpoczęcia\nbłąd zainstalowany w zraszaczu Stan",
+        "uk": "Адаптер benötigt jetzt node.js >= 22\nДругий час запуску\nвиправлено помилку в sprinklerState",
+        "zh-cn": "Benötigt喷气式喷气式喷气式喷气式喷气式喷气式喷气式喷气式喷气式喷气式喷雾器\n第二次开始时间添加\n在喷洒状态中修正错误"
+      },
+      "1.0.4": {
+        "en": "GitHub error message #274",
+        "de": "GitHub Fehlermeldung #274",
+        "ru": "Сообщение об ошибке GitHub #274",
+        "pt": "Mensagem de erro do GitHub # 274",
+        "nl": "GitHub foutmelding #274",
+        "fr": "Message d'erreur GitHub #274",
+        "it": "Messaggio di errore GitHub #274",
+        "es": "Mensaje de error GitHub #274",
+        "pl": "Komunikat błędu GitHub # 274",
+        "uk": "Повідомлення про помилку GitHub #274",
+        "zh-cn": "GitHub 错误消息 # 274"
+      },
       "1.0.3": {
         "en": "Pressure relief valve added after irrigation.",
         "de": "Druckentlastungsventil nach Bewässerung hinzugefügt.",
@@ -83,32 +109,6 @@
         "pl": "Przełączanie hysterezy cysterny jest teraz przechowywane w konfiguracji.",
         "uk": "У конфігурації тепер зберігається комутаційний гістерезис цистерни.",
         "zh-cn": "晶体的开关式歇斯底里现保存在配置中."
-      },
-      "0.2.18": {
-        "en": "Hysteresis switch-on value of the cistern changed to 20%",
-        "de": "Hysterese Einschaltwert der Zisterne auf 20% geändert",
-        "ru": "Значение Hysteresis switch-on цистерны изменилось до 20%",
-        "pt": "O valor da histerese da cisterna mudou para 20%",
-        "nl": "Hysterese schakelaar waarde van de cisterne veranderd in 20%",
-        "fr": "La valeur d'activation de l'hystérie de la citerne est passée à 20%",
-        "it": "Il valore di commutazione della cisterna di Hysteresis è cambiato al 20%",
-        "es": "El valor de conmutación de la histeria cambió al 20%",
-        "pl": "Zmiana wartości hysterezy cysterny na 20%",
-        "uk": "Гістерез змінився на 20%",
-        "zh-cn": "贮器的开关值改为20%"
-      },
-      "0.2.17": {
-        "en": "Valve timing corrected",
-        "de": "Ventilzeit korrigiert",
-        "ru": "Время клапана скорректировано",
-        "pt": "Regulação da válvula",
-        "nl": "Gecorrigeerde kleptijd",
-        "fr": "Réglage de la vanne",
-        "it": "Valvola tempistica corretta",
-        "es": "Tiempo de válvula corregido",
-        "pl": "Skorygowany czas zaworu",
-        "uk": "Терміни клапана, виправлені",
-        "zh-cn": "阀门时间得到纠正"
       }
     },
     "desc": {
@@ -184,6 +184,7 @@
     "wateringStartTime": "livingGoldenHourEnd",
     "timeShift": "0",
     "weekLiving": "06:30",
+    "secondStartTime": "8:00",
     "selectAddStartTime": "noAddStartTime",
     "triggerAddStartTimeETpCur": "3.5",
     "triggerAddStartTimeETpToday": "30",
@@ -202,12 +203,12 @@
     "sensorWindSpeed": "",
     "sensorBrightness": "",
     "sensorRainfall": "",
-    "switchingBehavior": "standard",
-    "weatherForecastService": "dasWetter",
+    "switchingBehavior": "noResponse",
+    "weatherForecastService": "noWeatherData",
     "weatherForInstance": "",
     "pathRainForecast": "",
     "thresholdRain": "2",
-    "notificationsType": "Telegram",
+    "notificationsType": "noNotification",
     "telegramInstance": "",
     "telegramNoticeType": "longTelegramNotice",
     "telegramUser": "",
@@ -237,6 +238,7 @@
         "sprinkleName": "sprinkle example",
         "name": "hm-rpc.0.MEQ1234567.3.STATE",
         "triggerID": "",
+        "startTimeSelection": "firstStartTime",
         "wateringTime": "10",
         "wateringAdd": "200",
         "wateringIntervalOff": "0",
@@ -249,7 +251,7 @@
         "pipeFlow": "1100",
         "booster": false,
         "endIrrigation": true,
-        "methodControlSM": "calculation",
+        "methodControlSM": "fixDay",
         "triggerSM": "",
         "inGreenhouse": false,
         "analogZPct": "0",

package/lib/myConfig.js

@@ -39,7 +39,9 @@ const myConfig = {
 
                     const newEntry = {
                         // Schaltzustand des Ventils
-                        enabled: res.enabled || false,                                                                                              
+                        enabled: res.enabled || false,
+                        // Auswahl der Startzeit (firstStartTime = Startzeit 1, secondStartTime = Startzeit 2)
+                        startTimeSelection: res.startTimeSelection || "firstStartTime",	
                         booster: res.booster,
                         autoOn: true,
                         // sprinklecontrol.0.sprinkle.Rasenumrandung.autoOnID

package/lib/valveControl.js

@@ -104,6 +104,16 @@ const setValve = async (thread, val) => {
                 ack: false
             });
             thread.enable = val;
+            if (thread.name !== 'Cistern pump' && thread.name !== 'Main pump' && thread.name !== '24V' && thread.name !== 'no Pump') {
+                adapter.setStateAsync(`sprinkle.${thread.name}.sprinklerState`, {
+                    val: thread.state,
+                    ack: true
+                });
+                adapter.setStateAsync(`sprinkle.${thread.name}.valveOn`, {
+                    val: thread.enable,
+                    ack: true
+                });
+            }
             adapter.log.info(`setValve ${ thread.name }: ${ val }, ${ thread.wateringTime > 0 && val === true ? `${ tools.addTime(thread.wateringTime,'') }, ` : '' }`);
             return thread.control.idState;
         } catch (error) {
@@ -194,11 +204,12 @@ const setValve = async (thread, val) => {
         `);
         if (thread.ac.acSetValveCancelTimeout.aborted === false) thread.ac.acSetValveCancelTimeout.abort();
     }
-    adapter.setStateAsync(`sprinkle.${thread.name}.sprinklerState`, {
-        val: thread.state,
-        ack: true
-    });
+
     if (thread.name !== 'Cistern pump' && thread.name !== 'Main pump' && thread.name !== '24V' && thread.name !== 'no Pump') {
+        adapter.setStateAsync(`sprinkle.${thread.name}.sprinklerState`, {
+            val: thread.state,
+            ack: true
+        });
         adapter.setStateAsync(`sprinkle.${thread.name}.valveOn`, {
             val: thread.enable,
             ack: true
@@ -356,6 +367,7 @@ const countSprinkleTime = async (entry) => {
 
             /* Alle 15s die Bodenfeuchte anpassen */
             if (entry.calcOn            // Vergleich nur bei Berechnung der Verdunstung
+                && entry.autoOn         // Vergleich nur bei Automatik
                 && !(entry.count % 15)	// alle 15s ausführen
             ) {
                 myConfig.addSoilMoistVal(entry.sprinkleID, entry.soilMoisture15s);
@@ -701,33 +713,33 @@ const updateList = async () => {
                     adapter.setStateAsync(currentPumpUse.id,{
                         val: currentPumpUse.enable, 
                         ack: true
-                    });
-                    await asyncTime.setTimeout(switchingDistanceMS, undefined, undefined);
-                }                 
+                    });  
+                }
+                await asyncTime.setTimeout(switchingDistanceMS, undefined, undefined);                
             } catch (error) {
                 adapter.log.error(`Error trigger current Pump [${currentPumpUse.idState}]: ${error}`);
-            }            
-        }
+            }
 
-        if (adapter.config.pressureRelief === true          // Druckentlastungsventil aktiviert
-            && adapter.config.pumpSelection !== 'noPump'    // && Pumpe vorhanden
-        ) {
-            try {
-                const empty = await findPressureReliefValve();
-                if (empty) {
-                    pressureReliefValve.name = empty.objectName;
-                    pressureReliefValve.wateringTime = 10;
-                    pressureReliefValve.pipeFlow = empty.pipeFlow;
-                    pressureReliefValve.enable = false;
-                    pressureReliefValve.control = empty.control;
-                    adapter.log.info(`Pressure relief valve: ${pressureReliefValve.name} with pipeFlow ${pressureReliefValve.pipeFlow} l/h for 10s opened!`);
-                    await setValve(pressureReliefValve, true);
-                    await asyncTime.setTimeout(1000 * pressureReliefValve.wateringTime, undefined, undefined);
-                    await setValve(pressureReliefValve, false);
-                    await asyncTime.setTimeout(switchingDistanceMS, undefined, undefined);
+            // Druckentlastungsventil ansteuern wenn in Konfiguration aktiv
+            if (adapter.config.pressureRelief === true          // Druckentlastungsventil aktiviert
+            ) {
+                try {
+                    const empty = await findPressureReliefValve();
+                    if (empty) {
+                        pressureReliefValve.name = empty.objectName;
+                        pressureReliefValve.wateringTime = 10;
+                        pressureReliefValve.pipeFlow = empty.pipeFlow;
+                        pressureReliefValve.enable = false;
+                        pressureReliefValve.control = empty.control;
+                        adapter.log.info(`Pressure relief valve: ${pressureReliefValve.name} with pipeFlow ${pressureReliefValve.pipeFlow} l/h for 10s opened!`);
+                        await setValve(pressureReliefValve, true);
+                        await asyncTime.setTimeout(1000 * pressureReliefValve.wateringTime, undefined, undefined);
+                        await setValve(pressureReliefValve, false);
+                        await asyncTime.setTimeout(switchingDistanceMS, undefined, undefined);
+                    }
+                } catch (error) {
+                    adapter.log.error(`Error trigger pressure relief valve: ${error}`);
                 }
-            } catch (error) {
-                adapter.log.error(`Error trigger pressure relief valve: ${error}`);
             }
         }
 
@@ -1517,9 +1529,11 @@ const valveControl = {
      */
     clearEntireList: async function () {
         try {
-            await setValve(controlVoltage, false);
-            await setValve(currentPumpUse, false);
-            // let bValveFound = false;	// Ventil gefunden
+            if (controlVoltage?.control?.idState) await setValve(controlVoltage, false);
+            if (currentPumpUse?.control?.idState) await setValve(currentPumpUse, false);
+            boostReady = true;
+            boostOn = false;
+            if (threadList.length === 0) return true;   // keine Ventile in der Liste => Exit
             for (let counter = threadList.length - 1;	// Loop über das Array
                 counter >= 0;
                 counter--) {
@@ -1528,18 +1542,18 @@ const valveControl = {
                 entry.state = 'off';    //0
                 if (entry.enable) {
                     await setValve(entry, false);
-                    adapter.log.info(`Set Valve (SprinkleControl: off) ID: ${entry.name}, value: false`);
+                    adapter.log.info(`Set Valve (SprinkleControl: off) ID: ${ entry.name }, value: false`);
                 } else {
-                    adapter.setStateAsync(`sprinkle.${entry.name}.sprinklerState`, {
+                    adapter.setStateAsync(`sprinkle.${ entry.name}.sprinklerState`, {
                         val: entry.state,
                         ack: true
                     });                    
                 }
-                adapter.setStateAsync(`sprinkle.${entry.name}.runningTime`, {
+                adapter.setStateAsync(`sprinkle.${ entry.name }.runningTime`, {
                     val: '00:00',
                     ack: true
                 });
-                adapter.setStateAsync(`sprinkle.${entry.name}.countdown`, {
+                adapter.setStateAsync(`sprinkle.${ entry.name }.countdown`, {
                     val: '0',
                     ack: true
                 });
@@ -1556,19 +1570,17 @@ const valveControl = {
                 if (entry?.ac?.acUpdateListBoostOn?.aborted === false) entry.ac.acUpdateListBoostOn.abort();       // UpdateList Ausschalten der Ventile bei BoostOn
                 if (entry?.ac?.acOnOffTimeoutOff?.aborted === false) entry.ac.acOnOffTimeoutOff.abort();         // OnOffTimeoutOff Ausschaltdauer bei on-off-Betrieb
 
-                adapter.log.debug(`order deleted Stop all ID: ${entry.name} ( rest orders: ${threadList.length} )`);
+                adapter.log.debug(`order deleted Stop all ID: ${ entry.name } ( rest orders: ${ threadList.length } )`);
                 threadList.pop();   // del last array
             }
-            boostReady = true;
-            boostOn = false;
             const _currentConsumption = await currentConsumption(true);
-            if (_currentConsumption.parallel > 0) throw new Error(`clearEntireList: Not all valves in the list have been deleted`);        // Nicht alle Ventile in der Liste wurden gelöscht
+            if (_currentConsumption?.parallel > 0) throw new Error(`Not all valves in the list have been deleted`);        // Nicht alle Ventile in der Liste wurden gelöscht
             return true;
         } catch (error) {
             if (error) {
-                adapter.log.warn(`valveControl.clearEntireList() => ${error}`);
+                adapter.log.warn(`valveControl.clearEntireList() => ${ error }`);
             }
-            return false;
+                return false;
         }
         
     }, // End clearEntireList