iobroker.sprinklecontrol 1.0.5 → 1.0.7

package/main.js

@@ -84,7 +84,7 @@ function startAdapter(options) {
         // is called if a subscribed state changes
         stateChange: async (id, state) => {
             try {
-                adapter.log.debug(`stateChange: ${id} (${state ? state.val : 'null'}) ack: ${state ? state.ack : 'null'}`);
+                // adapter.log.debug(`stateChange: ${id} (${state ? state.val : 'null'}) ack: ${state ? state.ack : 'null'}`);
                 // The state was changed → Der Zustand wurde geändert
                 if(state){
                     // Change in outside temperature → Änderung der Außentemperatur
@@ -115,11 +115,38 @@ function startAdapter(options) {
                     // Windgeschwindigkeit
                     if (id === adapter.config.sensorWindSpeed) {
                         if (!Number.isNaN(Number.parseFloat(state.val))) {
-                            evaporation.setCurWindSpeed(parseFloat(state.val), state.lc);
+                            if (adapter.config.unitOfWindSpeed === 'm/s') {
+                                evaporation.setCurWindSpeed(parseFloat(state.val) * 3.6, state.lc);
+                            } else if (adapter.config.unitOfWindSpeed === 'km/h') {    // HomeMatic: km/h
+                                evaporation.setCurWindSpeed(parseFloat(state.val), state.lc);
+                            } else {
+                                adapter.log.warn(`sensorWindSpeed => No unit selected; therefore, ${state.val} km/h is used. Please check your configuration!`);
+                            }
                         } else {
                             adapter.log.warn(`sensorWindSpeed => Wrong value: ${state.val}, Type: ${typeof state.val}`);
                         }
                     }
+                    // Drucksensor
+                    if (id === adapter.config.sensorPressure) {
+                        adapter.log.debug(`SensorPressure: ${ state?.val }, Type: ${ typeof state.val }`);
+                        let myPressure;
+                        if(typeof state.val === 'number') {
+                            myPressure = parseFloat(state.val);
+                        }else if(typeof state.val === 'string') {
+                            myPressure = parseFloat(state.val);
+                        }else if(typeof state.val === 'boolean') {
+                            (state.val === true) ? myPressure = 100 : myPressure = 0;
+                        }
+                        if(typeof myPressure !== "number" 
+                            || myPressure > 0 
+                            || myPressure < 10
+                        ) {
+                            valveControl.setSensorPressure(state.val);
+                        } else {
+                            adapter.log.warn(`SensorPressure (0...10 bar || true/false) => Wrong value: ${ state.val }, Type: ${ typeof state.val }`);
+                        }
+                    }
+
                     // Regencontainer
                     // If the amount of rain is over 20 mm, the 'lastRainCounter' is overwritten and no calculation is carried out. =>
                     //	* Wenn die Regenmenge mehr als 20 mm beträgt, wird der 'lastRainCounter' überschrieben und es wird keine Berechnung durchgeführt.
@@ -166,8 +193,8 @@ function startAdapter(options) {
                         }
                     }
                     // Füllstand der Zisterne bei Statusänderung
-                    if (adapter?.config?.actualValueLevel && (id === adapter.config.actualValueLevel)) {
-                        valveControl.setFillLevelCistern(parseFloat(state?.val) || 0);
+                    if (adapter.config?.actualValueLevel && (id === adapter.config.actualValueLevel)) {
+                        valveControl.setFillLevelCistern(state.val);
                         //fillLevelCistern = state.val || 0;
                     }
                     // Rückmeldungen mit ack === False
@@ -318,7 +345,7 @@ function startAdapter(options) {
                                 });
                             }
                         }
-                    // (state.ack === true)
+                    // (state.ack === true) => Rückmeldung für das Schalten der Ventile, Druckentlastungsventil, Steuerspannung, Pumpen
                     }else if (state.ack === true) {
                         // Bestätigung für das Schalten der Ventile
                         if (myConfig.config) {
@@ -336,15 +363,15 @@ function startAdapter(options) {
                             }
                         }
                         // Druckentlastungsventil
-                        if (id === pressureReliefValve.control.idACK && typeof pressureReliefValve.controller.ackTrue === 'function') {
+                        if (id === pressureReliefValve?.control?.idACK && typeof pressureReliefValve.controller.ackTrue === 'function') {
                             pressureReliefValve.controller.ackTrue(state);
                         }
                         // 24V Steuerspannung
-                        if (id === controlVoltage.control.idACK && typeof controlVoltage.controller.ackTrue === 'function') {
+                        if (id === controlVoltage?.control?.idACK && typeof controlVoltage.controller.ackTrue === 'function') {
                             controlVoltage.controller.ackTrue(state);
                         }
                         // Pumpe (aktuell verwendete Pumpe)
-                        if (id === currentPumpUse.control.idACK && typeof currentPumpUse.controller.ackTrue === 'function') {
+                        if (id === currentPumpUse?.control?.idACK && typeof currentPumpUse.controller.ackTrue === 'function') {
                             currentPumpUse.controller.ackTrue(state);
                         }
                         // The state was deleted
@@ -392,9 +419,15 @@ function startAdapter(options) {
  * daher können wir bei Bedarf andere Einstellungen als das System verwenden
  */
 async function GetSystemData() {
-    if (typeof adapter.config.longitude === 'undefined' || adapter.config.longitude === null || adapter.config.longitude.length === 0 || isNaN(+adapter.config.longitude)
-        || typeof adapter.config.latitude === 'undefined' || adapter.config.latitude === null || adapter.config.latitude.length === 0 || isNaN(+adapter.config.latitude)) {
-
+    if (typeof adapter.config.longitude === 'undefined' 
+        || adapter.config.longitude === null 
+        || adapter.config.longitude.length === 0 
+        || isNaN(adapter.config.longitude)
+        || typeof adapter.config.latitude === 'undefined' 
+        || adapter.config.latitude === null 
+        || adapter.config.latitude.length === 0 
+        || isNaN(adapter.config.latitude)
+    ) {
         try {
             const obj = await adapter.getForeignObjectAsync('system.config', 'state');
 
@@ -423,44 +456,48 @@ async function GetSystemData() {
  * @param returnOn
  */
 async function curNextFixDay (sprinkleID, returnOn) {
-    const weekDayArray = myConfig.config[sprinkleID].fixDay.startFixDay;
-    const objPfad = `sprinkle.${myConfig.config[sprinkleID].objectName}`;
-    const weekday = ['Sun','Mon','Tue','Wed','Thur','Fri','Sat'];
-    let found = false;
-    let curDay = tools.formatTime().day;
-    const d = new Date();
-    const curTime = `${zweiStellen(d.getHours())}:${zweiStellen(d.getMinutes())}`;
-
-    function zweiStellen (s) {
-        while (s.toString().length < 2) {
-                s = `0${s}`;
-            }
-        return s;
-    }
-    if (curTime >= startTimeStr) {
-        curDay++;
-    }
-
-    for ( let i=0; i<7; i++ ) {
-        if (curDay > 6) {
-            curDay = curDay - 7;
+    try {
+        const weekDayArray = myConfig.config[sprinkleID].fixDay.startFixDay;
+        const objPfad = `sprinkle.${myConfig.config[sprinkleID].objectName}`;
+        const weekday = ['Sun','Mon','Tue','Wed','Thur','Fri','Sat'];
+        let found = false;
+        let curDay = tools.formatTime().day;
+        const d = new Date();
+        const curTime = `${zweiStellen(d.getHours())}:${zweiStellen(d.getMinutes())}`;
+
+        function zweiStellen (s) {
+            while (s.toString().length < 2) {
+                    s = `0${s}`;
+                }
+            return s;
         }
-        if (weekDayArray[curDay] === true) {
-            found = true;
-            if (returnOn) {
-                return weekday[curDay];
-            } else {
-                adapter.setState(`${objPfad}.actualSoilMoisture`, {
-                    val: curDay,
-                    ack: true
-                });
+        if (curTime >= startTimeStr) {
+            curDay++;
+        }
+
+        for ( let i=0; i<7; i++ ) {
+            if (curDay > 6) {
+                curDay = curDay - 7;
             }
-            break;
+            if (weekDayArray[curDay] === true) {
+                found = true;
+                if (returnOn) {
+                    return weekday[curDay];
+                } else {
+                    adapter.setState(`${objPfad}.actualSoilMoisture`, {
+                        val: curDay,
+                        ack: true
+                    });
+                }
+                break;
+            }
+            curDay++;
         }
-        curDay++;
-    }
-    if (returnOn && found === false) {
-        return 'off';
+        if (returnOn && found === false) {
+            return 'off';
+        }        
+    } catch (error) {
+        adapter.log.error(`Error curNextFixDay: ${error}`);
     }
 }
 
@@ -569,7 +606,7 @@ async function checkStates() {
 
         /*   evaporation.dailyHighTemp   */
         const _dailyHighTemp = await adapter.getStateAsync('evaporation.dailyHighTemp');
-        if (_dailyHighTemp?.val) {
+        if (_dailyHighTemp?.val && typeof _dailyHighTemp.val === 'number') {
             evaporation.setCurTemperatureMax(+_dailyHighTemp.val);
         } else {
             evaporation.setCurTemperatureMax(0);
@@ -1279,7 +1316,7 @@ async function createSprinklers() {
      *
      * @param {string} methodControlSM
      * @param {string} objectName
-     * @returns {Promise<{nameMetConSM: string; objMetConSM: {type: string, common: {role: string, name: string, type: string, min?: number, max?: number, states?: {}, unit?: string, read: boolean, write: boolean, def?: number | string | boolean}, native: {}}}>}
+     * @returns {Promise<{nameMetConSM: string; objMetConSM: {type: string; common: {role: string; name: string; type: string; min?: number; max?: number; states?: Record<string, unknown>; unit?: string; read: boolean; write: boolean; def?: number | string | boolean}; native: Record<string, unknown>}}>} 
      */
     const fillMetConSM = async (methodControlSM, objectName) => {
         //adapter.log.debug(JSON.stringify(res));
@@ -1313,7 +1350,7 @@ async function createSprinklers() {
                             write: false,
                             def: 50
                         },
-                        native: {},
+                        native: {}
                     }
                 };
             }
@@ -2123,7 +2160,7 @@ async function delOldSprinklers(result) {
                  */
                 const delWhenExistObjectAsync = async (id, type) => {
                     const _find = await adapter.findForeignObjectAsync(`${id}`, `${type}`);
-                    if (_find && _find.id === `${id}`) {
+                    if (_find?.id === `${id}`) {
                         await adapter.delObjectAsync(`${id}`).catch((e) => adapter.log.warn(e));  // "sprinklecontrol.0.sprinkle.???.postponeByOneDay"
                     }
                 };
@@ -2174,8 +2211,8 @@ async function main() {
      * The adapters' config (in the instance object everything under the attribute "native") is accessible via adapter.config:
      * => Auf die Adapterkonfiguration (im Instanz objekt alles unter dem Attribut "native") kann zugegriffen werden über adapter.config:
      *
-     * @param {any} err
-     * @param {any} obj
+     * @param {objett} err
+     * @param {objekt} obj
      */
     // @ts-ignore
     // @ts-ignore
@@ -2204,6 +2241,7 @@ async function main() {
     //adapter.subscribeStates('info.Elevation');
     //adapter.subscribeStates('info.Azimut');
     
+    // Trigger für die Wettervorhersage abonnieren, wenn in der Config angegeben
     if (adapter.config.weatherForecastService === 'ownDataPoint') {
         weatherForecastTodayPfadStr = adapter.config.pathRainForecast;
         adapter.subscribeForeignStates(weatherForecastTodayPfadStr);
@@ -2221,9 +2259,12 @@ async function main() {
         adapter.subscribeForeignStates(`${ adapter.config.publicHolInstance }.morgen.*`);
     }
 
+    // Trigger für die Bewässerung abonnieren, wenn in der Config angegeben
     if (adapter.config.triggerControlVoltage !== '') {
         await adapter.subscribeForeignStatesAsync(adapter.config.triggerControlVoltage);
     }
+
+    // Trigger für die Pumpe abonnieren, wenn in der Config angegeben
     switch(adapter.config.pumpSelection) {
         case 'noPump':
             break;
@@ -2239,6 +2280,7 @@ async function main() {
             break;
     }
 
+    // Level-Sensor abonnieren, wenn in der Config angegeben
     if (adapter.config.actualValueLevel !== '') {
         await adapter.subscribeForeignStatesAsync(adapter.config.actualValueLevel);
     } else if ((adapter.config.pumpSelection === 'pumpAndCistern') || (adapter.config.pumpSelection === 'cistern')) {
@@ -2248,6 +2290,11 @@ async function main() {
         }).catch((e) => adapter.log.warn(`info.cisternState ${e}`));
     }
 
+    // Bodenfeuchte-Sensoren abonnieren, wenn in der Config angegeben
+    if (adapter.config.sensorPressure.length > 10) {
+        await adapter.subscribeForeignStatesAsync(adapter.config.sensorPressure);
+    }
+
     await checkActualStates().catch((e) => adapter.log.warn(`checkActualStates: ${e}`));
     // @ts-ignore
     timer = setTimeout(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sprinklecontrol",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Control of several sprinklers depending on weather conditions and pump performance.",
   "author": {
     "name": "Dirk Peter",
@@ -34,12 +34,12 @@
     "suncalc": "^1.9.0"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^5.1.1",
-    "@alcalzone/release-script-plugin-iobroker": "^5.1.2",
-    "@alcalzone/release-script-plugin-license": "^5.1.1",
-    "@alcalzone/release-script-plugin-manual-review": "^5.1.1",
+    "@alcalzone/release-script": "^5.2.0",
+    "@alcalzone/release-script-plugin-iobroker": "^5.2.0",
+    "@alcalzone/release-script-plugin-license": "^5.2.0",
+    "@alcalzone/release-script-plugin-manual-review": "^5.2.0",
     "@iobroker/adapter-dev": "^1.5.0",
-    "@iobroker/eslint-config": "^2.2.0",
+    "@iobroker/eslint-config": "^2.3.4",
     "@iobroker/testing": "^5.2.2"
   },
   "main": "main.js",