iobroker.sprinklecontrol 0.2.17 → 0.2.19

package/README.md

@@ -33,6 +33,12 @@ Wetterabhängige automatische Steuerung der Gartenbewässerung
   Placeholder for the next version (at the beginning of the line):
   ### **WORK IN PROGRESS**
 -->
+### 0.2.19 (2025-07-02)
+* (Dirk-Peter-md) The switch-on hysteresis of the cistern is now stored in the configuration.
+
+### 0.2.18 (2025-06-30)
+* (Dirk-Peter-md) Hysteresis switch-on value of the cistern changed to 20%
+
 ### 0.2.17 (2025-06-15)
 * (Dirk-Peter-md) Valve timing corrected
 
@@ -44,17 +50,6 @@ Wetterabhängige automatische Steuerung der Gartenbewässerung
 * (Dirk-Peter-md) Fixed an error when switching off with autoOnOff
 * (Dirk-Peter-md) ioBroker-Bot [W028]
 
-### 0.2.14 (2025-03-15)
-* (Dirk-Peter-md) eslint-config added
-* (Dirk-Peter-md) Dependencies updated
-* (Dirk-Peter-md) Update License
-* (Dirk-Peter-md) issue #92 Sprinkler im Gewächshaus solved
-* (Dirk-Peter-md) add Button control.autoStart
-
-### 0.2.13 (2022-09-06)
-* (Dirk-Peter-md) various bugs fixed
-* (Dirk-Peter-md) Preparing the stable release
-
 ## License
 MIT License
 

package/admin/i18n/de/translations.json

@@ -132,5 +132,6 @@
     "start with a fixed start time": "Beginnen Sie mit einer festen Startzeit",
     "weather forecast service": "Wettervorhersagedienst",
     "Lead time of the main pump in s": "Vorlaufzeit der Hauptpumpe in s",
-    "Lead time of the cistern pump in s": "Vorlaufzeit der Zisternepumpe in s"
+    "Lead time of the cistern pump in s": "Vorlaufzeit der Zisternepumpe in s",
+    "Switch-on hysteresis in %": "Einschalthysterese in %"
 }

package/admin/i18n/en/translations.json

@@ -82,6 +82,7 @@
     "Start, with external signal": "Start, with external signal",
     "Starting conditions": "Starting conditions",
     "Sunday": "Sunday",
+    "Switch-on hysteresis in %": "Switch-on hysteresis in %",
     "Switch-on point (soil moisture) of the additional irrigation valves in %": "Switch-on point (soil moisture) of the additional irrigation valves in %",
     "Switch-on point (soil moisture) of the irrigation valves in %": "Switch-on point (soil moisture) of the irrigation valves in %",
     "Switch-on point for watering": "Switch-on point for watering",

package/admin/i18n/es/translations.json

@@ -132,5 +132,6 @@
     "start with a fixed start time": "comenzar con una hora de inicio fija",
     "weather forecast service": "servicio de pronóstico del tiempo",
     "Lead time of the main pump in s": "Tiempo de entrega de la bomba principal en S",
-    "Lead time of the cistern pump in s": "Tiempo de entrega de la bomba de cisterna en S"
+    "Lead time of the cistern pump in s": "Tiempo de entrega de la bomba de cisterna en S",
+    "Switch-on hysteresis in %": "Histéresis de encendido en %"
 }

package/admin/i18n/fr/translations.json

@@ -132,5 +132,6 @@
     "start with a fixed start time": "commencer avec une heure de début fixe",
     "weather forecast service": "service de prévisions météorologiques",
     "Lead time of the main pump in s": "Temps de livraison de la pompe principale en s",
-    "Lead time of the cistern pump in s": "Temps de livraison de la pompe de la citerne en s"
+    "Lead time of the cistern pump in s": "Temps de livraison de la pompe de la citerne en s",
+    "Switch-on hysteresis in %": "Hystérésis de réaction dans%"
 }

package/admin/i18n/it/translations.json

@@ -132,5 +132,6 @@
     "start with a fixed start time": "iniziare con un orario di inizio fisso",
     "weather forecast service": "servizio di previsioni del tempo",
     "Lead time of the main pump in s": "Tempo di consegna della pompa principale in s",
-    "Lead time of the cistern pump in s": "Tempo di consegna della pompa di cisterna in s"
+    "Lead time of the cistern pump in s": "Tempo di consegna della pompa di cisterna in s",
+    "Switch-on hysteresis in %": "Isteresi di accensione in %"
 }

package/admin/i18n/nl/translations.json

@@ -132,5 +132,6 @@
     "start with a fixed start time": "begin met een vaste starttijd",
     "weather forecast service": "weersvoorspellingsservice",
     "Lead time of the main pump in s": "Doorlooptijd van de hoofdpomp in S",
-    "Lead time of the cistern pump in s": "Doorlooptijd van de reserveurpomp in S"
+    "Lead time of the cistern pump in s": "Doorlooptijd van de reserveurpomp in S",
+    "Switch-on hysteresis in %": "Schakel hysterese in % in"
 }

package/admin/i18n/pl/translations.json

@@ -132,5 +132,6 @@
     "start with a fixed start time": "zacznij od ustalonego czasu rozpoczęcia",
     "weather forecast service": "usługa prognozy pogody",
     "Lead time of the main pump in s": "Czas realizacji pompy głównej w s",
-    "Lead time of the cistern pump in s": "Czas realizacji pompy cysterna w s"
+    "Lead time of the cistern pump in s": "Czas realizacji pompy cysterna w s",
+    "Switch-on hysteresis in %": "Histereza przełączania w %"
 }

package/admin/i18n/pt/translations.json

@@ -132,5 +132,6 @@
     "start with a fixed start time": "comece com um horário de início fixo",
     "weather forecast service": "serviço de previsão do tempo",
     "Lead time of the main pump in s": "Líder do tempo da bomba principal em S",
-    "Lead time of the cistern pump in s": "Líder do tempo da bomba cisterna em S"
+    "Lead time of the cistern pump in s": "Líder do tempo da bomba cisterna em S",
+    "Switch-on hysteresis in %": "HISTERESESES EXPUTADAS EM %"
 }

package/admin/i18n/ru/translations.json

@@ -132,5 +132,6 @@
     "start with a fixed start time": "начать с фиксированного времени начала",
     "weather forecast service": "служба прогноза погоды",
     "Lead time of the main pump in s": "Время выполнения основного насоса в s",
-    "Lead time of the cistern pump in s": "Время заказа цистернного насоса в s"
+    "Lead time of the cistern pump in s": "Время заказа цистернного насоса в s",
+    "Switch-on hysteresis in %": "Включение гистерезиса в %"
 }

package/admin/i18n/uk/translations.json

@@ -132,5 +132,6 @@
     "start with a fixed start time": "почати з фіксованим часом початку",
     "weather forecast service": "служба прогнозу погоди",
     "Lead time of the main pump in s": "Час виконання головного насоса в S",
-    "Lead time of the cistern pump in s": "Час виконання цистернного насоса в s"
+    "Lead time of the cistern pump in s": "Час виконання цистернного насоса в s",
+    "Switch-on hysteresis in %": "Гістерезис перемикання в %"
 }

package/admin/i18n/zh-cn/translations.json

@@ -132,5 +132,6 @@
     "start with a fixed start time": "从固定的开始时间开始",
     "weather forecast service": "天气预报服务",
     "Lead time of the main pump in s": "主泵的交货时间",
-    "Lead time of the cistern pump in s": "s泵的交货时间"
+    "Lead time of the cistern pump in s": "s泵的交货时间",
+    "Switch-on hysteresis in %": "以％的切换滞后"
 }

package/admin/index_m.html

@@ -200,6 +200,11 @@
                                     <input type="number" class="value" id="triggerMinCisternLevel" min=0 max=100 placeholder="0-100" step="5" />
                                     <label for="triggerMinCisternLevel" class="translate"></label>
                                     <span class="translate">Minimum fill level of the cysts in %</span>
+                                </div>
+                                <div class="col s6 m4 l2 input-field">
+                                    <input type="number" class="value" id="switchOnLevelCistern" min=5 max=100 placeholder="5-100" step="5" value="10" />
+                                    <label for="switchOnLevelCistern" class="translate"></label>
+                                    <span class="translate">Switch-on hysteresis in %</span>
                                 </div>                              
                             </div>
                         </div>

package/admin/words.js

@@ -142,4 +142,5 @@ systemDictionary = {
     "weather forecast service": {                     "en": "weather forecast service",                         "de": "Wettervorhersagedienst",                           "ru": "служба прогноза погоды",                           "pt": "serviço de previsão do tempo",                     "nl": "weersvoorspellingsservice",                        "fr": "service de prévisions météorologiques",            "it": "servizio di previsioni del tempo",                 "es": "servicio de pronóstico del tiempo",                "pl": "usługa prognozy pogody",                           "uk": "служба прогнозу погоди",                           "zh-cn": "天气预报服务"},
     "Lead time of the main pump in s": {              "en": "Lead time of the main pump in s",                  "de": "Vorlaufzeit der Hauptpumpe in s",                  "ru": "Время выполнения основного насоса в s",            "pt": "Líder do tempo da bomba principal em S",           "nl": "Doorlooptijd van de hoofdpomp in S",               "fr": "Temps de livraison de la pompe principale en s",   "it": "Tempo di consegna della pompa principale in s",    "es": "Tiempo de entrega de la bomba principal en S",     "pl": "Czas realizacji pompy głównej w s",                "uk": "Час виконання головного насоса в S",               "zh-cn": "主泵的交货时间"},
     "Lead time of the cistern pump in s": {           "en": "Lead time of the cistern pump in s",               "de": "Vorlaufzeit der Zisternepumpe in s",               "ru": "Время заказа цистернного насоса в s",              "pt": "Líder do tempo da bomba cisterna em S",            "nl": "Doorlooptijd van de reserveurpomp in S",           "fr": "Temps de livraison de la pompe de la citerne en s", "it": "Tempo di consegna della pompa di cisterna in s",   "es": "Tiempo de entrega de la bomba de cisterna en S",   "pl": "Czas realizacji pompy cysterna w s",               "uk": "Час виконання цистернного насоса в s",             "zh-cn": "s泵的交货时间"},
+    "Switch-on hysteresis in %": {                    "en": "Switch-on hysteresis in %",                        "de": "Einschalthysterese in %",                          "ru": "Включение гистерезиса в %",                        "pt": "HISTERESESES EXPUTADAS EM %",                      "nl": "Schakel hysterese in % in",                        "fr": "Hystérésis de réaction dans%",                     "it": "Isteresi di accensione in %",                      "es": "Histéresis de encendido en %",                     "pl": "Histereza przełączania w %",                       "uk": "Гістерезис перемикання в %",                       "zh-cn": "以％的切换滞后"},
 };

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "sprinklecontrol",
-    "version": "0.2.17",
+    "version": "0.2.19",
     "titleLang": {
       "en": "Sprinkler Control",
       "de": "Sprinklersteuerung",
@@ -19,6 +19,32 @@
       "Dirk Peter <dirk.peter@freenet.de>"
     ],
     "news": {
+      "0.2.19": {
+        "en": "The switch-on hysteresis of the cistern is now stored in the configuration.",
+        "de": "Die Einschalthysterese der Zisterne wird nun in der Konfiguration gespeichert.",
+        "ru": "Гистерезис цистерны теперь хранится в конфигурации.",
+        "pt": "A histerese da cisterna é agora armazenada na configuração.",
+        "nl": "De inschakelhysterese van de cisterne wordt nu opgeslagen in de configuratie.",
+        "fr": "L'hystérie de la citerne est maintenant stockée dans la configuration.",
+        "it": "L'isteresi di commutazione della cisterna è ora memorizzata nella configurazione.",
+        "es": "La histeresis de la cisterna se almacena ahora en la configuración.",
+        "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",
@@ -83,32 +109,6 @@
         "pl": "różne trąbki ustalono; Preparowanie stabilnego wydania",
         "uk": "виправлено різні помилки; Підготовка стабільного випуску",
         "zh-cn": "(a) 固定地点; 准备稳定释放"
-      },
-      "0.2.12": {
-        "en": "fixDay(twoNd,threeRd) => postpone by one day; Bug fixed => autoOn; Additional post-watering => in case of high evaporation / switchable externally",
-        "de": "fixDay(twoNd,threeRd) => Verschiebung um einen Tag; Bug fix => autoOn; Zusätzliche Nachbewässerung => bei hoher Verdampfung / schaltbar extern",
-        "ru": "fixDay(дваNd,триRd) => откладываться на один день; Bug Fixed => autoOn; Дополнительный пост-вода => в случае высокой испарения / переключаемый внешне",
-        "pt": "fixDay(twoNd,threeRd) => adiar por um dia; Bug corrigido => autoOn; Post-watering adicional => em caso de alta evaporação / comutável externamente",
-        "nl": "fixDay(tweeNd,drieRd) => één dag uitstellen; Bug opgelost => autoAan; Extra nabewatering => bij hoge verdamping / extern schakelbaar",
-        "fr": "correctionDay(twoNd, threeRd) = repousser d'un jour; Bug corrigé = vaccin autoOn; Additionnel post-arrosage = clinique en cas d'évaporation élevée / commutable extérieurement",
-        "it": "fixDay(twoNd,treRd) => rinviare entro un giorno; Bug fisso => autoOn; Ulteriori post-irrigazione => in caso di alta evaporazione / commutabile esternamente",
-        "es": "fixDay(twoNd,threeRd) = confianza posponer por un día; Bug fijo = prenda autoOn; Pos-aguas adicionales = prenda en caso de alta evaporación / conmutable externamente",
-        "pl": "fixDay(twoNd, tripleRd) =>. Odroczony przez jeden dzień; Bug fixed => autoOn; dodatkowy post-watering => w przypadku dużego odparowania i przełącznika zewnętrznego",
-        "uk": "fixDay(twoNd,threeRd) => відкласти на один день; Виправлено помилку => autoOn; Додатковий дополив => у разі високого випаровування / перемикається зовні",
-        "zh-cn": "fix Day(两名Nd,三Rd)=> 一天推迟;Bug固定=汽车;额外的水事后=在高度疏散/外部可转换的情况下。"
-      },
-      "0.2.11": {
-        "en": "Bug fixed => analogue soil moisture sensor with negative characteristic; Attention => maximum soil moisture in rain now in %",
-        "de": "Fehler behoben => analoger Bodenfeuchtesensor mit negativer Kennlinie; Achtung => maximale Bodenfeuchte bei Regen jetzt in %",
-        "ru": "Исправлена ошибка => аналоговый датчик влажности почвы с отрицательной характеристикой; Внимание => максимальная влажность почвы в дождь теперь в %",
-        "pt": "Bug corrigido => sensor analógico de umidade do solo com característica negativa; Atenção => umidade máxima do solo na chuva agora em %",
-        "nl": "Bug opgelost => analoge bodemvochtsensor met negatieve karakteristiek; Let op => maximale bodemvochtigheid bij regen nu in %",
-        "fr": "Bug corrigé => capteur d'humidité du sol analogique avec caractéristique négative ; Attention => humidité maximale du sol sous la pluie maintenant en %",
-        "it": "Bug risolto => sensore di umidità del suolo analogico con caratteristica negativa; Attenzione => umidità massima del suolo sotto la pioggia ora in %",
-        "es": "Error solucionado => sensor de humedad del suelo analógico con característica negativa; Atención => humedad máxima del suelo en lluvia ahora en %",
-        "pl": "Poprawiony błąd => analogowy czujnik wilgotności gleby o charakterystyce ujemnej; Uwaga => maksymalna wilgotność gleby w deszczu teraz w %",
-        "uk": "Виправлено помилку => аналоговий датчик вологості ґрунту з негативною характеристикою; Увага => максимальна вологість ґрунту під час дощу зараз у %",
-        "zh-cn": "错误修复 => 具有负特性的模拟土壤湿度传感器；注意 => 现在雨中的最大土壤水分百分比"
       }
     },
     "desc": {
@@ -179,6 +179,7 @@
     "cisternPumpLeadTime": "10",
     "actualValueLevel": "",
     "triggerMinCisternLevel": "25",
+    "switchOnLevelCistern": "10",
     "wateringStartTime": "livingGoldenHourEnd",
     "timeShift": "0",
     "weekLiving": "06:30",

package/lib/valveControl.js

@@ -498,11 +498,23 @@ function updateList () {
  * → Festlegen der aktuellen Pumpe zur Bewässerung
  */
 function setActualPump () {
+    let switchOnLevelCistern = (parseFloat(adapter.config.triggerMinCisternLevel) + parseFloat(adapter.config.switchOnLevelCistern)) || 5;
+    if (switchOnLevelCistern > 100) {
+        switchOnLevelCistern = 100;
+        adapter.log.info(`Switch-on point limited to 100%`);
+    }
+    if (switchOnLevelCistern < 5) {
+        switchOnLevelCistern = 5;
+        adapter.log.info(`Switch-on point increased to 5%`);
+    }
+
+    /* Zisternen-Bewässerung Einstellung in der config (2. Pumpe) aktiviert */
     if (adapter.config.cisternSettings === true) {
-        /* Zisternen-Bewässerung Einstellung in der config (2. Pumpe) aktiviert */
         if (currentPumpUse.enable === true) {
             /* Bewässerungspumpen aktiv */
-            if ((fillLevelCistern < parseFloat(adapter.config.triggerMinCisternLevel)) && (currentPumpUse.pumpCistern === true)) {
+            if ((fillLevelCistern < parseFloat(adapter.config.triggerMinCisternLevel))
+                 && (currentPumpUse.pumpCistern === true)
+                ) {
                 /* (Zisterne unter Minimum) && (ZisternenPumpe läuft) */
                 adapter.setForeignState(currentPumpUse.pumpName, {
                     val: false,
@@ -523,44 +535,33 @@ function setActualPump () {
                 updateList();   // Wasserverbrauch an Pumpenleistung anpassen
             }
             if (fillLevelCistern < parseFloat(adapter.config.triggerMinCisternLevel)) {
-                statusCistern = `Cistern empty: ${fillLevelCistern} %  (${adapter.config.triggerMinCisternLevel + 5} %)`;
-                adapter.setState('info.cisternState', {
-                    val: statusCistern,
-                    ack: true
-                });
+                statusCistern = `Cistern empty: ${fillLevelCistern} %  (${switchOnLevelCistern} %)`;
             } else {
                 statusCistern = `Cistern filled: ${fillLevelCistern} %  (${adapter.config.triggerMinCisternLevel} %)`;
-                adapter.setState('info.cisternState', {
-                    val: statusCistern,
-                    ack: true
-                });
             }
         } else {
             /* Bewässerungspumpen inaktiv */
-            if ((fillLevelCistern >= (parseFloat(adapter.config.triggerMinCisternLevel) + 5)) && (adapter.config.triggerCisternPump) && (adapter.config.triggerCisternPumpPower)) {
+            if ((fillLevelCistern >= switchOnLevelCistern)
+                 && (adapter.config.triggerCisternPump)
+                 && (adapter.config.triggerCisternPumpPower)
+                ) {
                 /* Zisterne voll && triggerCisternPump && triggerCisternPumpPower vorhanden*/
                 statusCistern = `Cistern filled: ${fillLevelCistern} %  (${adapter.config.triggerMinCisternLevel} %)`;
-                adapter.setState('info.cisternState', {
-                    val: statusCistern,
-                    ack: true
-                });
-                if (currentPumpUse.pumpCistern === false && !sendMessageText.onlySendError()) {
+                if (currentPumpUse.pumpCistern === false
+                     && !sendMessageText.onlySendError()
+                    ) {
+                    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
+                    });
                     sendMessageText.sendMessage(`Cistern filled: ${fillLevelCistern} %  (${adapter.config.triggerMinCisternLevel} %)`); 
                 }
-                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
-                });
-            } else {
-                statusCistern = `Cistern empty: ${fillLevelCistern} %  (${adapter.config.triggerMinCisternLevel + 5} %)`;
-                adapter.setState('info.cisternState', {
-                    val: statusCistern,
-                    ack: true
-                });
+            } else if (fillLevelCistern < parseFloat(adapter.config.triggerMinCisternLevel)) {
+                statusCistern = `Cistern empty: ${fillLevelCistern} %  (${switchOnLevelCistern} %)`;
                 currentPumpUse.pumpCistern = false;
                 currentPumpUse.pumpName = adapter.config.triggerMainPump || '';
                 currentPumpUse.pumpPower = parseInt(adapter.config.triggerMainPumpPower);
@@ -569,12 +570,22 @@ function setActualPump () {
                     val: `${currentPumpUse.pumpPower} (${currentPumpUse.pumpPower} Grundwasser)`,
                     ack: true
                 });
+            } else {
+                if (currentPumpUse.pumpCistern === true) {
+                    statusCistern = `Cistern filled: ${fillLevelCistern} %  (${adapter.config.triggerMinCisternLevel} %)`;  
+                } else {
+                    statusCistern = `Cistern empty: ${fillLevelCistern} %  (${switchOnLevelCistern} %)`;
+                }
             }
+            adapter.setState('info.cisternState', {
+                val: statusCistern,
+                ack: true
+            });
         }
     } else {
         /* Pumpe AUS => Zisternen-Bewässerung nicht aktiviert */
         if (adapter.config.triggerCisternPump) {
-            statusCistern = `Cistern settings are not active!${(fillLevelCistern > 0)?(` level sensor: ${fillLevelCistern}%${(adapter.config.triggerMinCisternLevel !== '')?(`${adapter.config.triggerMinCisternLevel}%`):('')}`):('')}`;
+            statusCistern = `Cistern settings are not active!${(fillLevelCistern > 0)?(` level sensor: ${fillLevelCistern} % ${(adapter.config.triggerMinCisternLevel !== '')?(`${adapter.config.triggerMinCisternLevel} %`):('')}`):('')}`;
             adapter.setState('info.cisternState', {
                 val: statusCistern,
                 ack: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sprinklecontrol",
-  "version": "0.2.17",
+  "version": "0.2.19",
   "description": "Control of several sprinklers depending on weather conditions and pump performance.",
   "author": {
     "name": "Dirk Peter",
@@ -43,7 +43,7 @@
     "@iobroker/testing": "^5.0.4",
     "chai": "^5.2.0",
     "chai-as-promised": "^8.0.1",
-    "mocha": "^11.6.0",
+    "mocha": "^11.7.1",
     "sinon": "^21.0.0",
     "sinon-chai": "^4.0.0"
   },