iobroker-ucl 1.2.95 → 1.2.97

package/homematicFunctions.js

@@ -733,13 +733,13 @@ function loadHomematicDimmer(adapter) {
     return cacheDimmerArray;
 }
 exports.loadHomematicDimmer = loadHomematicDimmer;
-var homematicAllArray = null;
+//var homematicAllArray = null;
 function loadHomematicDevicesAll(adapter) {
-    if (homematicAllArray != null) {
+    /*if (homematicAllArray != null) {
         return homematicAllArray;
-    }
+    }*/
     // @ts-ignore            
-    homematicAllArray = [];
+    var homematicAllArray = [];
     adapter.loadHomematicWandthermostate(adapter).forEach(function (homematic) {
         // @ts-ignore            
         homematicAllArray.push(homematic);
@@ -818,7 +818,7 @@ function toStringArray(databaseValue) {
     }
 }
 function clearHomematicCaches(adapter) {
-    homematicAllArray = null;
+    //homematicAllArray = null;
     cacheDimmerArray = null;
     cacheHeizkoerperArray = null;
     cacheSteckdosenArray = null;

package/homematicFunctions.ts

@@ -808,14 +808,14 @@ export function loadHomematicDimmer(adapter: any) {
     return cacheDimmerArray;
 }
 
-var homematicAllArray = null;
+//var homematicAllArray = null;
 export function loadHomematicDevicesAll(adapter: any) {
-    if (homematicAllArray != null) {
+    /*if (homematicAllArray != null) {
         return homematicAllArray;
-    }
+    }*/
     
     // @ts-ignore            
-    homematicAllArray = [];
+    var homematicAllArray = [];
 
     adapter.loadHomematicWandthermostate(adapter).forEach(homematic => {
         // @ts-ignore            
@@ -895,7 +895,7 @@ function toStringArray(databaseValue) { // z.B. "Werkbank|Arbeiten|Keller"
 }
 
 function clearHomematicCaches(adapter: any) {
-    homematicAllArray = null;
+    //homematicAllArray = null;
     cacheDimmerArray = null;
     cacheHeizkoerperArray = null;
     cacheSteckdosenArray = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker-ucl",
-  "version": "1.2.95",
+  "version": "1.2.97",
   "main": "main.js",
     "scripts": {
     "build": "tsc --build",

package/shellyClasses.js

@@ -212,7 +212,6 @@ var ShellyLampeWeiss = /** @class */ (function (_super) {
         _this.turnOffExitHouseWinter = turnOffExitHouseWinter;
         _this.turnOnEnterHouseSummer = turnOnEnterHouseSummer;
         _this.turnOnEnterHouseWinter = turnOnEnterHouseWinter;
-        adapter.log("here7777: " + additionalStates4TurnOff);
         _this.nachtbeleuchtung = nachtbeleuchtung;
         _this.channel = channel;
         _this.alexaSmartNamesForOn = alexaSmartNamesForOn;
@@ -374,8 +373,6 @@ var ShellyDimmer = /** @class */ (function (_super) {
     __extends(ShellyDimmer, _super);
     function ShellyDimmer(adapter, id, etage, raum, device, baseState, alexaSmartNamesForOn, alexaActionNamesForOn, alexaLevelSchemeForOn, alexaSmartNamesForOff, alexaActionNamesForOff, levelSchemes, tasterBooleanOn, tasterBooleanOff, nachtbeleuchtung, turnOffExitHouseSummer, turnOffExitHouseWinter, turnOnEnterHouseSummer, turnOnEnterHouseWinter) {
         var _this = _super.call(this, adapter, id, etage, raum, device, baseState) || this;
-        adapter.log("here:1 " + alexaLevelSchemeForOn);
-        //adapter.log("here:2 " + alexaLevelSchemeForOn.getAlexaName());
         _this.alexaSmartNamesForOn = alexaSmartNamesForOn;
         _this.alexaSmartNamesForOff = alexaSmartNamesForOff;
         _this.alexaActionNamesForOn = alexaActionNamesForOn;
@@ -389,15 +386,11 @@ var ShellyDimmer = /** @class */ (function (_super) {
         _this.tasterBooleanOn = tasterBooleanOn;
         _this.levelSchemes = levelSchemes;
         _this.tasterBooleanOff = tasterBooleanOff;
-        adapter.log("1111ff" + _this.alexaLevelSchemeForOn);
         if (_this.alexaLevelSchemeForOn != null) {
-            adapter.log("1111a");
             if (_this.alexaLevelSchemeForOn.getAlexaName() != null) {
-                adapter.log("1111b");
                 _this.createState(_this.alexaLevelSchemeForOn.getAlexaName());
             }
             _this.alexaLevelSchemeForOn.setDevice(_this);
-            adapter.log("1111c");
         }
         _this.tasterBooleanOn.forEach(function (tasterScheme) {
             if (tasterScheme.getTasterBooleanOnName() != null) {

package/shellyClasses.ts

@@ -234,8 +234,6 @@ export class ShellyLampeWeiss extends AbstractShelly {
         this.turnOnEnterHouseSummer = turnOnEnterHouseSummer;
         this.turnOnEnterHouseWinter = turnOnEnterHouseWinter;
 
-        adapter.log("here7777: " + additionalStates4TurnOff);
-
         this.nachtbeleuchtung = nachtbeleuchtung;
         this.channel = channel;
         this.alexaSmartNamesForOn = alexaSmartNamesForOn;
@@ -446,16 +444,12 @@ export class ShellyDimmer extends AbstractShelly {
             turnOnEnterHouseSummer:boolean, turnOnEnterHouseWinter:boolean) {
         super(adapter, id, etage, raum, device, baseState); 
 
-
-        adapter.log("here:1 " + alexaLevelSchemeForOn);
-        //adapter.log("here:2 " + alexaLevelSchemeForOn.getAlexaName());
-
         this.alexaSmartNamesForOn = alexaSmartNamesForOn;
         this.alexaSmartNamesForOff = alexaSmartNamesForOff;
-         this.alexaActionNamesForOn = alexaActionNamesForOn;
+        this.alexaActionNamesForOn = alexaActionNamesForOn;
         this.alexaActionNamesForOff = alexaActionNamesForOff;
 
-         this.nachtbeleuchtung = nachtbeleuchtung;
+        this.nachtbeleuchtung = nachtbeleuchtung;
         this.turnOffExitHouseSummer = turnOffExitHouseSummer;
         this.turnOffExitHouseWinter = turnOffExitHouseWinter;
         this.turnOnEnterHouseSummer = turnOnEnterHouseSummer;
@@ -465,15 +459,12 @@ export class ShellyDimmer extends AbstractShelly {
         this.tasterBooleanOn = tasterBooleanOn;
         this.levelSchemes = levelSchemes;
         this.tasterBooleanOff = tasterBooleanOff;                
-adapter.log("1111ff" + this.alexaLevelSchemeForOn);
+
         if (this.alexaLevelSchemeForOn != null) {
-            adapter.log("1111a");
             if (this.alexaLevelSchemeForOn.getAlexaName() != null) {
-                adapter.log("1111b");
                 this.createState(this.alexaLevelSchemeForOn.getAlexaName());
             }
             this.alexaLevelSchemeForOn.setDevice(this);  
-            adapter.log("1111c");          
         }             
         this.tasterBooleanOn.forEach(tasterScheme => {    
             if (tasterScheme.getTasterBooleanOnName() != null) {

package/shellyFunctions.js

@@ -512,18 +512,14 @@ export function loadShellyLampenRGB(adapter: any) {
 }*/
 var cacheDimmerArray = null;
 function loadShellyDimmer(adapter) {
-    adapter.log("loadShelly Modul inside");
     if (cacheDimmerArray != null) {
-        adapter.log("loadShelly Modul inside_b_ääääääääääääääääää" + cacheDimmerArray);
         return cacheDimmerArray;
     }
-    adapter.log("loadShelly Modul inside_b");
     // @ts-ignore            
     cacheDimmerArray = [];
     adapter.$('state[id=0_userdata.0.devices.shelly.*.*.category]').each(function (datenpunktKey) {
         var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
         if (adapter.getState(datenpunktKey).val == deviceShellyDimmer) {
-            adapter.log("loadShelly Modul inside_c" + datenpunktKey);
             // Einschalt-Scheme:
             var alexaOnScheme = null;
             if (adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_aktiv).val == true) {
@@ -670,13 +666,13 @@ function loadShellySteckdosen(adapter) {
     return cacheSteckdosenArray;
 }
 exports.loadShellySteckdosen = loadShellySteckdosen;
-var shellyAllArray = null;
+//var shellyAllArray = null;
 function loadShellyDevicesAll(adapter) {
-    if (shellyAllArray != null) {
-        return shellyAllArray;
-    }
+    //if (shellyAllArray != null) {
+    //  return shellyAllArray;
+    //}
     // @ts-ignore            
-    shellyAllArray = [];
+    var shellyAllArray = [];
     adapter.loadShellyLampenWeiss(adapter).forEach(function (shelly) {
         // @ts-ignore            
         shellyAllArray.push(shelly);
@@ -711,7 +707,7 @@ function toStringArray(databaseValue) {
     }
 }
 function clearShellyCaches(adapter) {
-    shellyAllArray = null;
+    //shellyAllArray = null;
     cacheSteckdosenArray = null;
     cacheLampenWeissArray = null;
     cacheDimmerArray = null;

package/shellyFunctions.ts

@@ -555,20 +555,15 @@ export function loadShellyLampenRGB(adapter: any) {
 
 var cacheDimmerArray = null;
 export function loadShellyDimmer(adapter: any) {
-    adapter.log("loadShelly Modul inside");
     if (cacheDimmerArray != null) {
-        adapter.log("loadShelly Modul inside_b_ääääääääääääääääää" + cacheDimmerArray);
         return cacheDimmerArray;
     }
-    adapter.log("loadShelly Modul inside_b");
 
     // @ts-ignore            
     cacheDimmerArray = [];
     adapter.$('state[id=0_userdata.0.devices.shelly.*.*.category]').each(datenpunktKey => { 
         var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
         if (adapter.getState(datenpunktKey).val == deviceShellyDimmer) {
-            adapter.log("loadShelly Modul inside_c" + datenpunktKey);
-
 
             // Einschalt-Scheme:
             var alexaOnScheme = null;
@@ -760,14 +755,14 @@ export function loadShellySteckdosen(adapter: any) {
     return cacheSteckdosenArray;
 }
 
-var shellyAllArray = null;
+//var shellyAllArray = null;
 export function loadShellyDevicesAll(adapter: any) {
-    if (shellyAllArray != null) {
-        return shellyAllArray;
-    }
+    //if (shellyAllArray != null) {
+      //  return shellyAllArray;
+    //}
 
     // @ts-ignore            
-    shellyAllArray = [];
+    var shellyAllArray = [];
 
     adapter.loadShellyLampenWeiss(adapter).forEach(shelly => {
         // @ts-ignore            
@@ -803,7 +798,7 @@ function toStringArray(databaseValue) { // z.B. "Werkbank|Arbeiten|Keller"
 }
 
 function clearShellyCaches(adapter: any) {
-    shellyAllArray = null;
+    //shellyAllArray = null;
     cacheSteckdosenArray = null;
     cacheLampenWeissArray = null;
     cacheDimmerArray = null;

package/zigbeeFunctions.js

@@ -1049,14 +1049,14 @@ function loadZigbeeFenstersensor(adapter) {
     return cacheFenstersensorenArray;
 }
 exports.loadZigbeeFenstersensor = loadZigbeeFenstersensor;
-var zigbeeAllArray = null;
+//var zigbeeAllArray = null;
 function loadZigbeeDevicesAll(adapter) {
-    if (zigbeeAllArray != null) {
-        // @ts-ignore            
-        return zigbeeAllArray;
-    }
+    /*  if (zigbeeAllArray != null) {
+          // @ts-ignore
+          return zigbeeAllArray;
+      }*/
     // @ts-ignore            
-    zigbeeAllArray = [];
+    var zigbeeAllArray = [];
     adapter.loadZigbeeSteckdosen(adapter).forEach(function (zigbee) {
         // @ts-ignore            
         zigbeeAllArray.push(zigbee);
@@ -1102,7 +1102,7 @@ function loadZigbeeDevicesAll(adapter) {
 }
 exports.loadZigbeeDevicesAll = loadZigbeeDevicesAll;
 function clearZigbeeCaches(adapter) {
-    zigbeeAllArray = null;
+    //    zigbeeAllArray = null;
     cacheFenstersensorenArray = null;
     cacheRepeaterArray = null;
     cacheSchalterArray = null;

package/zigbeeFunctions.ts

@@ -1204,15 +1204,15 @@ export function loadZigbeeFenstersensor(adapter: any) {
     return cacheFenstersensorenArray;
 }
 
-var zigbeeAllArray = null;
+//var zigbeeAllArray = null;
 export function loadZigbeeDevicesAll(adapter: any) {
-    if (zigbeeAllArray != null) {
+  /*  if (zigbeeAllArray != null) {
         // @ts-ignore            
         return zigbeeAllArray;
-    }
+    }*/
     
     // @ts-ignore            
-    zigbeeAllArray = [];
+    var zigbeeAllArray = [];
     adapter.loadZigbeeSteckdosen(adapter).forEach(zigbee => {
         // @ts-ignore            
         zigbeeAllArray.push(zigbee);
@@ -1258,7 +1258,7 @@ export function loadZigbeeDevicesAll(adapter: any) {
 }
 
 function clearZigbeeCaches(adapter: any) {
-    zigbeeAllArray = null;
+//    zigbeeAllArray = null;
     cacheFenstersensorenArray = null;
     cacheRepeaterArray = null;
     cacheSchalterArray = null;