iobroker.sprinklecontrol 1.0.6 → 1.0.8

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "sprinklecontrol",
-    "version": "1.0.6",
+    "version": "1.0.8",
     "titleLang": {
       "en": "Sprinkler Control",
       "de": "Sprinklersteuerung",
@@ -19,6 +19,32 @@
       "Dirk Peter <dirk.peter@freenet.de>"
     ],
     "news": {
+      "1.0.8": {
+        "en": "Fixed error in \"Command without response\"\nWater Pressure Control Revised\nioBroker-Bot [E6004], [W1127], [W1133], [W1134], [S6022] completed",
+        "de": "Fehler behoben in \"Befehl ohne Antwort\"\nWasserdruckregelung überarbeitet\nioBroker-Bot [E6004], [W1127], [W1133], [W1134], [S6022] abgeschlossen",
+        "ru": "Исправленная ошибка в «Команда без ответа»\nКонтроль давления воды пересмотрен\nioBroker-Bot [E6004], [W1127], [W1133], [W1134], [S6022]",
+        "pt": "Erro corrigido em \"Comando sem resposta\"\nControlo da pressão da água revisto\nioBroker-Bot [E6004], [W1127], [W1133], [W1134], [S6022] concluído",
+        "nl": "Vaste fout in \"Command zonder respons\"\nWaterdrukregeling herzien\nioBroker-Bot [E6004], [W1127], [W1133], [W1134], [S6022] voltooid",
+        "fr": "Erreur corrigée dans \"Commande sans réponse\"\nContrôle de la pression d'eau révisé\nioBroker-Bot [E6004], [W1127], [W1133], [W1134], [S6022] complété",
+        "it": "Errore fisso in \"Comando senza risposta\"\nControllo della pressione dell'acqua\nioBroker-Bot [E6004], [W1127], [W1133], [W1134], [S6022] completato",
+        "es": "Error fijo en \"Command sin respuesta\"\nControl de la presión del agua revisado\nioBroker-Bot [E6004], [W1127], [W1133], [W1134], [S6022] completado",
+        "pl": "Naprawiono błąd w \"Polecenie bez odpowiedzi\"\nRegulacja ciśnienia wody\njoBroker- Bot [E6004], [W1127], [W1133], [W1134], [S6022] zakończone",
+        "uk": "Виправлена помилка в \"Command без відповіді\"\nКонтроль тиску води\nioBroker-Bot [E6004], [W1127], [W1134], [S6022] завершено",
+        "zh-cn": "\"无回复命令\"中的固定错误\n水压控制修订\nioBroker-Bot [E6004], [W1127], [W1133], [W1134], [S6022] 完成"
+      },
+      "1.0.7": {
+        "en": "Added pressure monitoring.",
+        "de": "Drucküberwachung hinzugefügt.",
+        "ru": "Добавлен мониторинг давления.",
+        "pt": "Aumentou a monitorização da pressão.",
+        "nl": "Toegevoegde drukbewaking.",
+        "fr": "Ajout de la surveillance de la pression.",
+        "it": "Aggiunto monitoraggio della pressione.",
+        "es": "Añadido control de presión.",
+        "pl": "Dodano monitorowanie ciśnienia.",
+        "uk": "Додано контроль тиску.",
+        "zh-cn": "增加了压力监测."
+      },
       "1.0.6": {
         "en": "Cistern Control Optimized\nTranslation revised",
         "de": "Zisternensteuerung optimiert\nÜbersetzung überarbeitet",
@@ -83,32 +109,6 @@
         "pl": "Dodano czasy zakazu nawadniania",
         "uk": "Додані часи для поливу заборони",
         "zh-cn": "灌溉禁令增加的时间"
-      },
-      "1.0.1": {
-        "en": "Add Homematic ON_TIME\nAdapter configuration revised\nioBroker-Bot [E4041], [E4043] completed",
-        "de": "Homematic ON TIME hinzufügen\nAdapterkonfiguration überarbeitet\nioBroker-Bot [E4041], [E4043] abgeschlossen",
-        "ru": "Добавить Homematic on time\nПересмотренная конфигурация адаптера\nioBroker-Bot [E4041], [E4043]",
-        "pt": "Adicionar tempo de on  metragem homemática\nA configuração do adaptador foi revista\nioBroker-Bot [E4041], [E4043] completado",
-        "nl": "Homematisch ON TIME toevoegen\nAdapterconfiguratie herzien\nioBroker-Bot [E4041], [E4043] voltooid",
-        "fr": "Ajouter Homematic ON TIME\nConfiguration de l'adaptateur révisée\nioBroker-Bot [E4041], [E4043] terminé",
-        "it": "Aggiungi Homematic ON TIME\nConfigurazione adattatore revisionata\nioBroker-Bot [E4041], [E4043] completato",
-        "es": "Añadir Homematic ON TIME\nAjuste revisado de la configuración del adaptador\nioBroker-Bot [E4041], [E4043] completado",
-        "pl": "Dodaj homematic on _ time\nZmieniona konfiguracja adaptera\njoBroker- Bot [E4041], [E4043] ukończone",
-        "uk": "Додати Homematic ON TIME\nПереглянуто налаштування адаптера\nioBroker-Bot [E4041], [E4043] завершено",
-        "zh-cn": "添加自定义 ON TIME\n修改适应器配置\nioBroker-Bot [E4041], [E4043] 完成"
-      },
-      "1.0.0": {
-        "en": "Adapter redesign => Be sure to check your configuration\nAdaptation to “dasWeather” >= 4.0\nFix npm publish\ndependencies updated\nupdate dependabot",
-        "de": "Adapter redesign => Überprüfen Sie Ihre Konfiguration\nAnpassung an „dasWeather“ >= 4.0\nNpm veröffentlichen\naktualisierte abhängigkeiten\nupdate abhängigabot",
-        "ru": "Адаптивный редизайн = Обязательно проверьте свою конфигурацию\nАдаптация к «dasWeather» 4.0\nИздательство Fix npm\nобновленные зависимости\nобновление dependabot",
-        "pt": "Redesenho do adaptador => Certifique-se de verificar sua configuração\nAdaptação ao “dasWeather” >= 4.0\nCorrigir a publicação do npm\ndependências atualizadas\nupdate dependebot",
-        "nl": "Herontwerp van de adapter => Controleer zeker uw configuratie\nAanpassing aan het weer 4.0\nFix npm publiceren\nafhankelijkheden bijgewerkt\nupdate dependabot",
-        "fr": "Remaniement de l'adaptateur => Vérifiez votre configuration\nAdaptation à la température de l'air >= 4,0\nCorrection de npm publier\ndépendances mises à jour\nmise à jour de dermabot",
-        "it": "Redesign adattatore = > Assicurati di controllare la configurazione\nAdattamento a “dasWeather” >= 4.0\nFisso npm pubblicazione\ndipendenze aggiornate\naggiornamento dipendeabot",
-        "es": "Adaptador de rediseño = confianza Asegúrese de comprobar su configuración\nAdaptación a “dasWeather” 4.0\nCorrección npm publicar\ndependencias actualizadas\nactualización dependabot",
-        "pl": "Przeprojektowanie adaptera = > Sprawdź konfigurację\nAdaptacja do \"dasWeather\" > = 4. 0\nNapraw publikację npm\nzaktualizowane zależności\naktualizacja zależna",
-        "uk": "Редизайн адаптера => Обов'язково перевірте налаштування\nАдаптація до \"dasWeather\" >= 4.8 км\nВиправлення npm опублікування\nоновлені залежності\nоновлення залежності",
-        "zh-cn": "适应器的重新设计 请检查您的配置\n适应“DasWeather”_________________________ 4.0 (单位:百万美元)\n修复 npm 发布\n更新依赖关系\n更新依赖保护"
       }
     },
     "desc": {
@@ -171,8 +171,8 @@
     "maximumParallelValves": "5",
     "switchingDistance": "0.5",
     "pressureRelief": false,
-    "pumpSelection": "mainPump",
-    "triggerMainPump": "hm-rpc.0.MEQ1234567.1.STATE",
+    "pumpSelection": "noPump",
+    "triggerMainPump": "",
     "triggerMainPumpPower": "2000",
     "mainPumpLeadTime": "1",
     "triggerCisternPump": "",
@@ -193,14 +193,19 @@
     "startOfInterruption": "10:00",
     "endOfInterruption": "18:00",
     "publicWeekend": true,
+    "publicWeekend2": true,
     "weekEndLiving": "07:30",
     "publicHolidays": false,
+    "publicHolidays2": false,
     "publicHolInstance": "",
     "latitude": "",
     "longitude": "",
+    "sensorPressure": "",
+    "minimumPressure": "2.0",
     "sensorOutsideTemperature": "",
     "sensorOutsideHumidity": "",
     "sensorWindSpeed": "",
+    "unitOfWindSpeed": "km/h",
     "sensorBrightness": "",
     "sensorRainfall": "",
     "switchingBehavior": "noResponse",
@@ -294,7 +299,7 @@
       "_id": "evaporation.ETpCurrent",
       "type": "state",
       "common": {
-        "role": "indicator",
+        "role": "value",
         "name": "Calculation of the current pot. Evapotranspiration",
         "desc": {
           "en": "Calculation of the current pot. Evapotranspiration",
@@ -321,7 +326,7 @@
       "_id": "evaporation.ETpToday",
       "type": "state",
       "common": {
-        "role": "indicator",
+        "role": "value",
         "name": "today's pot. Evapotranspiration",
         "desc": {
           "en": "today's pot. Evapotranspiration",
@@ -348,7 +353,7 @@
       "_id": "evaporation.ETpYesterday",
       "type": "state",
       "common": {
-        "role": "indicator",
+        "role": "value",
         "name": "yesterday's pot. Evapotranspiration",
         "desc": {
           "en": "yesterday's pot. Evapotranspiration",
@@ -375,7 +380,7 @@
       "_id": "evaporation.dailyHighTemp",
       "type": "state",
       "common": {
-        "role": "indicator",
+        "role": "value",
         "name": "Daily High Temperature",
         "desc": {
           "en": "Daily high temperature",
@@ -465,10 +470,6 @@
           "zh-cn": "自动或手动控制喷头"
         },
         "type": "boolean",
-        "states": {
-          "false": "off",
-          "true": "Auto"
-        },
         "read": true,
         "write": true,
         "def": true
@@ -495,7 +496,7 @@
           "zh-cn": "立即启动灌溉过程"
         },
         "type": "boolean",
-        "read": true,
+        "read": false,
         "write": true,
         "def": false
       },
@@ -505,7 +506,7 @@
       "_id": "control.parallelOfMax",
       "type": "state",
       "common": {
-        "role": "indicator",
+        "role": "text",
         "name": "parallel of max Sprinklers",
         "desc": {
           "en": "Number of sprinklers that are currently running in parallel",
@@ -531,7 +532,7 @@
       "_id": "control.restFlow",
       "type": "state",
       "common": {
-        "role": "indicator",
+        "role": "text",
         "name": "rest Flow of Pump",
         "desc": {
           "en": "Rest flow of the pump in l/h",
@@ -578,7 +579,7 @@
       "_id": "info.nextAutoStart",
       "type": "state",
       "common": {
-        "role": "indicator",
+        "role": "text",
         "name": "Next automatic start of the sprinklers",
         "desc": {
           "en": "Next automatic start of the sprinklers",
@@ -604,7 +605,7 @@
       "_id": "info.rainToday",
       "type": "state",
       "common": {
-        "role": "indicator",
+        "role": "value",
         "name": "Amount of rain today",
         "desc": {
           "en": "Amount of rain today",
@@ -631,7 +632,7 @@
       "_id": "info.rainTomorrow",
       "type": "state",
       "common": {
-        "role": "indicator",
+        "role": "value",
         "name": "Amount of rain tomorrow",
         "desc": {
           "en": "Amount of rain tomorrow",
@@ -658,7 +659,7 @@
       "_id": "info.cisternState",
       "type": "state",
       "common": {
-        "role": "indicator",
+        "role": "text",
         "name": "State of the cistern",
         "desc": {
           "en": "State of the cistern",

package/lib/evaporation.js

@@ -374,7 +374,7 @@ const evaporation = {
         adapter.log.debug(`${curTemperature.val}°C | ${curHumidity.val}% | ${curIllumination.val} | ${curWindSpeed.val}km/h | ts: ${curTime} - lastChangeEvaPor: ${lastChangeEvaPor} = timeDifference: ${timeDifference}`);
 
         if (timeDifference) {
-            setTimeout(() => {
+            adapter.setTimeout(() => {
                 calcEvaporation(timeDifference);
             }, 100);
         }
@@ -384,7 +384,7 @@ const evaporation = {
      * akt. LuftFeuchtigkeit in %
      * 
      * @param {number} value
-     * @param {any} lc
+     * @param {number} lc
      */
     setCurHumidity (value, lc) {
         curHumidity.val = value;
@@ -394,7 +394,7 @@ const evaporation = {
      * akt. Helligkeit wird auf 0 bis 7000 begrenzt
      * 
      * @param {number} value
-     * @param {any} lc
+     * @param {number} lc
      */
     setCurIllumination (value, lc) {
         curIllumination.val = value;
@@ -404,7 +404,7 @@ const evaporation = {
      * akt. Windgeschwindigkeit
      * 
      * @param {number} value Windgeschwindigkeit in km/h
-     * @param {any} lc
+     * @param {number} lc
      */
     setCurWindSpeed (value, lc) {
         curWindSpeed.val = value;
@@ -447,7 +447,7 @@ const evaporation = {
      */
     setNewDay () {
         extraTerStr();
-        setTimeout(() => {
+        adapter.setTimeout(() => {
             adapter.setState('evaporation.ETpYesterday', { 
                 val: Math.round(ETpTodayNum * 10000) / 10000, 
                 ack: true 

package/lib/myConfig.js

@@ -138,7 +138,9 @@ const myConfig = {
 
                     /* Abonnieren der Statusänderungen des Objekts (reagieren auf Änderung des 'Ventils' 
                     der einzelnen Bewässerungskreise zur Fehlerkontrolle bzw. Verbrauchsermittlung) */
-                    adapter.subscribeForeignStates(newEntry.control.idACK);
+                    if (newEntry?.control?.idACK !== null) {
+                        adapter.subscribeForeignStates(newEntry.control.idACK);
+                    }
 
                     // @ts-ignore
                     myConfig.config.push(newEntry);

package/lib/sendMessageText.js

@@ -87,7 +87,7 @@ const sendMessageText = {
 
         let sendMessage = message;
 
-        setTimeout(function () {
+        adapter.setTimeout(function () {
             switch (ObjMessage.notificationsType) {
                 case 'Telegram':
                     if (ObjMessage.enabled &&

package/lib/tools.js

@@ -59,7 +59,7 @@ const tools = {
      *
      * @template T
      * @param {T[]} elements
-     * @param {any} cb
+     * @param {(element: T, index: number, elements: T[]) => Promise<boolean>} cb
      * @returns {Promise<T | undefined>}
      */
     findAsync: async function ( elements, cb) {
@@ -149,7 +149,14 @@ const tools = {
             }
             
             default: {
-                adapter.log.error(`No switching behavior was selected for the "${id}" watering circuit.`);
+                adapter.log.error(`„Zusätzliche Einstellungen“ => „Schaltverhalten anpassen“ enthielt keine Eingabe! Es wurde daher auf „Befehl ohne Rückmeldung“ gesetzt.`);
+                adapter.config.switchingBehavior = "noResponse";
+                return {
+                    idState: id,
+                    idON_TIME: null,
+                    idACK: null,
+                    maker: "default"
+                }; 
             }
         }
     },