iobroker-ucl 1.2.90 → 1.2.92

package/homematicClasses.js

@@ -362,27 +362,6 @@ var HomematicDimmer = /** @class */ (function (_super) {
         _this.turnOffExitHouseWinter = turnOffExitHouseWinter;
         _this.turnOnEnterHouseSummer = turnOnEnterHouseSummer;
         _this.turnOnEnterHouseWinter = turnOnEnterHouseWinter;
-        /*   adapter.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
-           adapter.log("Inside HomematicDimmer, param adapter: " + adapter);
-           adapter.log("Inside HomematicDimmer, param id: " + id);
-           adapter.log("Inside HomematicDimmer, param baseState: " + baseState);
-           adapter.log("Inside HomematicDimmer, param etage: " + etage);
-           adapter.log("Inside HomematicDimmer, param raum: " + raum);
-           adapter.log("Inside HomematicDimmer, param device: " + device);
-           adapter.log("Inside HomematicDimmer, param alexaSmartNamesForOn: " + alexaSmartNamesForOn);
-           adapter.log("Inside HomematicDimmer, param alexaActionNamesForOn: " + alexaActionNamesForOn);
-           adapter.log("Inside HomematicDimmer, param alexaLevelSchemeForOn: " + alexaLevelSchemeForOn);
-           adapter.log("Inside HomematicDimmer, param alexaSmartNamesForOff: " + alexaSmartNamesForOff);
-           adapter.log("Inside HomematicDimmer, param alexaActionNamesForOff: " + alexaActionNamesForOff);
-           adapter.log("Inside HomematicDimmer, param levelSchemes: " + levelSchemes);
-           adapter.log("Inside HomematicDimmer, param tasterBooleanOn: " + tasterBooleanOn);
-           adapter.log("Inside HomematicDimmer, param tasterBooleanOff: " + tasterBooleanOff);
-           adapter.log("Inside HomematicDimmer, param nachtbeleuchtung: " + nachtbeleuchtung);
-           adapter.log("Inside HomematicDimmer, param turnOffExitHouseSummer: " + turnOffExitHouseSummer);
-           adapter.log("Inside HomematicDimmer, param turnOffExitHouseWinter: " + turnOffExitHouseWinter);
-           adapter.log("Inside HomematicDimmer, param turnOnEnterHouseSummer: " + turnOnEnterHouseSummer);
-           adapter.log("Inside HomematicDimmer, param turnOnEnterHouseWinter: " + turnOnEnterHouseWinter);
-           adapter.log("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<")*/
         _this.levelSchemes.forEach(function (colorscheme) {
             colorscheme.setDevice(_this);
             if (colorscheme.getAlexaName() != null) {

package/homematicClasses.ts

@@ -405,27 +405,6 @@ export class HomematicDimmer extends AbstractHomematic {
         this.turnOffExitHouseWinter = turnOffExitHouseWinter;
         this.turnOnEnterHouseSummer = turnOnEnterHouseSummer;
         this.turnOnEnterHouseWinter = turnOnEnterHouseWinter;
-     /*   adapter.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
-        adapter.log("Inside HomematicDimmer, param adapter: " + adapter);
-        adapter.log("Inside HomematicDimmer, param id: " + id);
-        adapter.log("Inside HomematicDimmer, param baseState: " + baseState);
-        adapter.log("Inside HomematicDimmer, param etage: " + etage);
-        adapter.log("Inside HomematicDimmer, param raum: " + raum);
-        adapter.log("Inside HomematicDimmer, param device: " + device);
-        adapter.log("Inside HomematicDimmer, param alexaSmartNamesForOn: " + alexaSmartNamesForOn);
-        adapter.log("Inside HomematicDimmer, param alexaActionNamesForOn: " + alexaActionNamesForOn);
-        adapter.log("Inside HomematicDimmer, param alexaLevelSchemeForOn: " + alexaLevelSchemeForOn);
-        adapter.log("Inside HomematicDimmer, param alexaSmartNamesForOff: " + alexaSmartNamesForOff);
-        adapter.log("Inside HomematicDimmer, param alexaActionNamesForOff: " + alexaActionNamesForOff);
-        adapter.log("Inside HomematicDimmer, param levelSchemes: " + levelSchemes);
-        adapter.log("Inside HomematicDimmer, param tasterBooleanOn: " + tasterBooleanOn);
-        adapter.log("Inside HomematicDimmer, param tasterBooleanOff: " + tasterBooleanOff);
-        adapter.log("Inside HomematicDimmer, param nachtbeleuchtung: " + nachtbeleuchtung);
-        adapter.log("Inside HomematicDimmer, param turnOffExitHouseSummer: " + turnOffExitHouseSummer);
-        adapter.log("Inside HomematicDimmer, param turnOffExitHouseWinter: " + turnOffExitHouseWinter);
-        adapter.log("Inside HomematicDimmer, param turnOnEnterHouseSummer: " + turnOnEnterHouseSummer);        
-        adapter.log("Inside HomematicDimmer, param turnOnEnterHouseWinter: " + turnOnEnterHouseWinter);        
-        adapter.log("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<")*/
 
         this.levelSchemes.forEach(colorscheme => {    
             colorscheme.setDevice(this);

package/homematicFunctions.js

@@ -312,6 +312,7 @@ function loadHomematicRollladen(adapter) {
             ));
         }
     });
+    cacheRollladenArray = sortArray(cacheRollladenArray);
     return cacheRollladenArray;
 }
 exports.loadHomematicRollladen = loadHomematicRollladen;
@@ -334,6 +335,7 @@ function loadHomematicWandthermostate(adapter) {
             ));
         }
     });
+    cacheWandthermostateArray = sortArray(cacheWandthermostateArray);
     return cacheWandthermostateArray;
 }
 exports.loadHomematicWandthermostate = loadHomematicWandthermostate;
@@ -356,6 +358,7 @@ function loadHomematicPraesenzmelder(adapter) {
             ));
         }
     });
+    cachePraesenzmelderArray = sortArray(cachePraesenzmelderArray);
     return cachePraesenzmelderArray;
 }
 exports.loadHomematicPraesenzmelder = loadHomematicPraesenzmelder;
@@ -378,6 +381,7 @@ function loadHomematicWetterstationen(adapter) {
             ));
         }
     });
+    cacheWetterstationenArray = sortArray(cacheWetterstationenArray);
     return cacheWetterstationenArray;
 }
 exports.loadHomematicWetterstationen = loadHomematicWetterstationen;
@@ -400,6 +404,7 @@ function loadHomematicDoors(adapter) {
             ));
         }
     });
+    cacheDoorsArray = sortArray(cacheDoorsArray);
     return cacheDoorsArray;
 }
 exports.loadHomematicDoors = loadHomematicDoors;
@@ -431,6 +436,7 @@ function loadHomematicWandschalter(adapter) {
             ));
         }
     });
+    cacheWandschalterArray = sortArray(cacheWandschalterArray);
     return cacheWandschalterArray;
 }
 exports.loadHomematicWandschalter = loadHomematicWandschalter;
@@ -453,6 +459,7 @@ function loadHomematicFussbodenheizungen(adapter) {
             ));
         }
     });
+    cacheFussbodenheizungenArray = sortArray(cacheFussbodenheizungenArray);
     return cacheFussbodenheizungenArray;
 }
 exports.loadHomematicFussbodenheizungen = loadHomematicFussbodenheizungen;
@@ -475,6 +482,7 @@ function loadHomematicWandtaster(adapter) {
             ));
         }
     });
+    cacheWandtasterArray = sortArray(cacheWandtasterArray);
     return cacheWandtasterArray;
 }
 exports.loadHomematicWandtaster = loadHomematicWandtaster;
@@ -497,6 +505,7 @@ function loadHomematicAccessPoints(adapter) {
             ));
         }
     });
+    cacheAccessPointsArray = sortArray(cacheAccessPointsArray);
     return cacheAccessPointsArray;
 }
 exports.loadHomematicAccessPoints = loadHomematicAccessPoints;
@@ -519,6 +528,7 @@ function loadHomematicTemperatursensoren(adapter) {
             ));
         }
     });
+    cacheTemperatursensorenArray = sortArray(cacheTemperatursensorenArray);
     return cacheTemperatursensorenArray;
 }
 exports.loadHomematicTemperatursensoren = loadHomematicTemperatursensoren;
@@ -541,6 +551,7 @@ function loadHomematicRauchmelder(adapter) {
             ));
         }
     });
+    cacheRauchmelderArray = sortArray(cacheRauchmelderArray);
     return cacheRauchmelderArray;
 }
 exports.loadHomematicRauchmelder = loadHomematicRauchmelder;
@@ -563,6 +574,7 @@ function loadHomematicFunktschaltaktoren(adapter) {
             ));
         }
     });
+    cacheFunkschaltaktorenArray = sortArray(cacheFunkschaltaktorenArray);
     return cacheFunkschaltaktorenArray;
 }
 exports.loadHomematicFunktschaltaktoren = loadHomematicFunktschaltaktoren;
@@ -585,6 +597,7 @@ function loadHomematicWindows(adapter) {
             ));
         }
     });
+    cacheWindowsArray = sortArray(cacheWindowsArray);
     return cacheWindowsArray;
 }
 exports.loadHomematicWindows = loadHomematicWindows;
@@ -607,6 +620,7 @@ function loadHomematicSteckdosen(adapter) {
             ));
         }
     });
+    cacheSteckdosenArray = sortArray(cacheSteckdosenArray);
     return cacheSteckdosenArray;
 }
 exports.loadHomematicSteckdosen = loadHomematicSteckdosen;
@@ -629,6 +643,7 @@ function loadHomematicHeizkoerper(adapter) {
             ));
         }
     });
+    cacheHeizkoerperArray = sortArray(cacheHeizkoerperArray);
     return cacheHeizkoerperArray;
 }
 exports.loadHomematicHeizkoerper = loadHomematicHeizkoerper;
@@ -642,7 +657,6 @@ function loadHomematicDimmer(adapter) {
     adapter.$('state[id=0_userdata.0.devices.homematic.*.*.category]').each(function (datenpunktKey) {
         var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
         if (adapter.getState(datenpunktKey).val == deviceHomematicDimmer) {
-            adapter.log("Inside loadHomematicDimmer");
             // Einschalt-Scheme:
             var alexaOnScheme = null;
             if (adapter.getState(datenpunktPraefix + "." + attributeDimmer_alexaScheme_aktiv).val == true) {
@@ -715,6 +729,7 @@ function loadHomematicDimmer(adapter) {
             ));
         }
     });
+    cacheDimmerArray = sortArray(cacheDimmerArray);
     return cacheDimmerArray;
 }
 exports.loadHomematicDimmer = loadHomematicDimmer;
@@ -723,7 +738,6 @@ function loadHomematicDevicesAll(adapter) {
     if (homematicAllArray != null) {
         return homematicAllArray;
     }
-    adapter.log("Test");
     // @ts-ignore            
     homematicAllArray = [];
     adapter.loadHomematicWandthermostate(adapter).forEach(function (homematic) {
@@ -790,6 +804,7 @@ function loadHomematicDevicesAll(adapter) {
         // @ts-ignore                    
         homematicAllArray.push(homematic);
     });
+    homematicAllArray = sortArray(homematicAllArray);
     return homematicAllArray;
 }
 exports.loadHomematicDevicesAll = loadHomematicDevicesAll;
@@ -802,4 +817,50 @@ function toStringArray(databaseValue) {
         return databaseValue.split('|');
     }
 }
+function sortArray(inputArray) {
+    inputArray.sort(function (a, b) {
+        var elementA = a;
+        var elementB = b;
+        var etageA = elementA.getEtage();
+        var etageB = elementB.getEtage();
+        var compareEtage = getEtageSortIndex(etageA).localeCompare(getEtageSortIndex(etageB));
+        if (compareEtage != 0) {
+            return compareEtage;
+        }
+        var typA = elementA.getCategory();
+        var typB = elementB.getCategory();
+        var compareTyp = typA.localeCompare(typB);
+        if (compareTyp != 0) {
+            return compareTyp;
+        }
+        var raumA = elementA.getRaum();
+        var raumB = elementB.getRaum();
+        var compareRaum = raumA.localeCompare(raumB);
+        if (compareRaum != 0) {
+            return compareRaum;
+        }
+        var deviceA = elementA.getDevice();
+        var deviceB = elementB.getDevice();
+        var compareDevice = deviceA.localeCompare(deviceB);
+        if (compareDevice != 0) {
+            return compareDevice;
+        }
+        return 0;
+    });
+    return inputArray;
+}
+function getEtageSortIndex(etage) {
+    if (etage == "OG") {
+        return "a";
+    }
+    else if (etage == "EG") {
+        return "b";
+    }
+    else if (etage == "UG") {
+        return "c";
+    }
+    else {
+        return "d";
+    }
+}
 module.exports = { createHomematicDevice: createHomematicDevice, createHomeaticDimmer: createHomeaticDimmer, createHomeaticWandschalter: createHomeaticWandschalter, loadHomematicWandthermostate: loadHomematicWandthermostate, loadHomematicPraesenzmelder: loadHomematicPraesenzmelder, loadHomematicWetterstationen: loadHomematicWetterstationen, loadHomematicDoors: loadHomematicDoors, loadHomematicRollladen: loadHomematicRollladen, loadHomematicWandschalter: loadHomematicWandschalter, loadHomematicFussbodenheizungen: loadHomematicFussbodenheizungen, loadHomematicWandtaster: loadHomematicWandtaster, loadHomematicAccessPoints: loadHomematicAccessPoints, loadHomematicTemperatursensoren: loadHomematicTemperatursensoren, loadHomematicRauchmelder: loadHomematicRauchmelder, loadHomematicFunktschaltaktoren: loadHomematicFunktschaltaktoren, loadHomematicWindows: loadHomematicWindows, loadHomematicSteckdosen: loadHomematicSteckdosen, loadHomematicHeizkoerper: loadHomematicHeizkoerper, loadHomematicDimmer: loadHomematicDimmer, loadHomematicDevicesAll: loadHomematicDevicesAll };

package/homematicFunctions.ts

@@ -307,7 +307,6 @@ export function createHomeaticWandschalter(adapter:any, rawId: number, baseState
     createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseWinter, turnOnEnterHouseWinter, deviceHomematicWandschalter);
 }
 
-
 function createDatenpunktSingle(adapter: any, deviceRawId, attributeType, attributeName, attributeValue, category) {
     var stateDatenpunkt = "0_userdata.0.devices.homematic." + category + "." + deviceRawId + "." + attributeName;
     adapter.createState(stateDatenpunkt, attributeValue, {
@@ -339,10 +338,10 @@ export function loadHomematicRollladen(adapter: any) {
             ));
         }
     });
+    cacheRollladenArray = sortArray(cacheRollladenArray);                                                                                                        
     return cacheRollladenArray;
 }
 
-
 var cacheWandthermostateArray = null;
 export function loadHomematicWandthermostate(adapter: any) {
     if (cacheWandthermostateArray != null) {
@@ -363,6 +362,7 @@ export function loadHomematicWandthermostate(adapter: any) {
             ));
         }
     });
+    cacheWandthermostateArray = sortArray(cacheWandthermostateArray);                                                                                                        
     return cacheWandthermostateArray;
 }
 
@@ -386,6 +386,7 @@ export function loadHomematicPraesenzmelder(adapter: any) {
             ));
         }
     });
+    cachePraesenzmelderArray = sortArray(cachePraesenzmelderArray);                                                                                                        
     return cachePraesenzmelderArray;
 }
 
@@ -409,6 +410,7 @@ export function loadHomematicWetterstationen(adapter: any) {
             ));
         }
     });
+    cacheWetterstationenArray = sortArray(cacheWetterstationenArray);                                                                                                    
     return cacheWetterstationenArray;
 }
 
@@ -432,6 +434,7 @@ export function loadHomematicDoors(adapter: any) {
             ));
         }
     });
+    cacheDoorsArray = sortArray(cacheDoorsArray);                                                                                                
     return cacheDoorsArray;
 }
 
@@ -465,6 +468,7 @@ export function loadHomematicWandschalter(adapter: any) {
             ));
         }
     });
+    cacheWandschalterArray = sortArray(cacheWandschalterArray);                                                                                            
     return cacheWandschalterArray;
 }
 
@@ -488,6 +492,7 @@ export function loadHomematicFussbodenheizungen(adapter: any) {
             ));
         }
     });
+    cacheFussbodenheizungenArray = sortArray(cacheFussbodenheizungenArray);                                                                                        
     return cacheFussbodenheizungenArray;
 }
 
@@ -511,6 +516,7 @@ export function loadHomematicWandtaster(adapter: any) {
             ));
         }
     });
+    cacheWandtasterArray = sortArray(cacheWandtasterArray);                                                                                    
     return cacheWandtasterArray;
 }
 
@@ -534,6 +540,7 @@ export function loadHomematicAccessPoints(adapter: any) {
             ));
         }
     });
+    cacheAccessPointsArray = sortArray(cacheAccessPointsArray);                                                                                
     return cacheAccessPointsArray;
 }
 
@@ -557,6 +564,7 @@ export function loadHomematicTemperatursensoren(adapter: any) {
             ));
         }
     });
+    cacheTemperatursensorenArray = sortArray(cacheTemperatursensorenArray);                                                                            
     return cacheTemperatursensorenArray;
 }
 
@@ -580,6 +588,7 @@ export function loadHomematicRauchmelder(adapter: any) {
             ));
         }
     });
+    cacheRauchmelderArray = sortArray(cacheRauchmelderArray);                                                                        
     return cacheRauchmelderArray;
 }
 
@@ -603,6 +612,7 @@ export function loadHomematicFunktschaltaktoren(adapter: any) {
             ));
         }
     });
+    cacheFunkschaltaktorenArray = sortArray(cacheFunkschaltaktorenArray);                                                                    
     return cacheFunkschaltaktorenArray;
 }
 
@@ -626,6 +636,7 @@ export function loadHomematicWindows(adapter: any) {
             ));
         }
     });
+    cacheWindowsArray = sortArray(cacheWindowsArray);                                                                
     return cacheWindowsArray;
 }
 
@@ -649,6 +660,7 @@ export function loadHomematicSteckdosen(adapter: any) {
             ));
         }
     });
+    cacheSteckdosenArray = sortArray(cacheSteckdosenArray);                                                            
     return cacheSteckdosenArray;
 }
 
@@ -672,6 +684,7 @@ export function loadHomematicHeizkoerper(adapter: any) {
             ));
         }
     });
+    cacheHeizkoerperArray = sortArray(cacheHeizkoerperArray);                                                        
     return cacheHeizkoerperArray;
 }
 
@@ -685,7 +698,6 @@ export function loadHomematicDimmer(adapter: any) {
     adapter.$('state[id=0_userdata.0.devices.homematic.*.*.category]').each(datenpunktKey => {  // 0_userdata.0.devices.homematic.30.type
         var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
         if (adapter.getState(datenpunktKey).val == deviceHomematicDimmer) {
-            adapter.log("Inside loadHomematicDimmer");
 
             // Einschalt-Scheme:
             var alexaOnScheme = null;
@@ -792,6 +804,7 @@ export function loadHomematicDimmer(adapter: any) {
             ));
         }
     });
+    cacheDimmerArray = sortArray(cacheDimmerArray);                                                    
     return cacheDimmerArray;
 }
 
@@ -800,8 +813,7 @@ export function loadHomematicDevicesAll(adapter: any) {
     if (homematicAllArray != null) {
         return homematicAllArray;
     }
-    adapter.log("Test");
-
+    
     // @ts-ignore            
     homematicAllArray = [];
 
@@ -869,6 +881,7 @@ export function loadHomematicDevicesAll(adapter: any) {
         // @ts-ignore                    
         homematicAllArray.push(homematic);
     });
+    homematicAllArray = sortArray(homematicAllArray);                                                
     return homematicAllArray;
 }
 
@@ -881,5 +894,56 @@ function toStringArray(databaseValue) { // z.B. "Werkbank|Arbeiten|Keller"
     }
 }
 
+function sortArray(inputArray) {
+    inputArray.sort((a,b) => {
+        var elementA = a;
+        var elementB = b;
+
+        var etageA = elementA.getEtage();
+        var etageB = elementB.getEtage();
+        var compareEtage = getEtageSortIndex(etageA).localeCompare(getEtageSortIndex(etageB));
+        if (compareEtage != 0) {
+            return compareEtage;
+        }
+
+        var typA = elementA.getCategory();
+        var typB = elementB.getCategory();
+        var compareTyp = typA.localeCompare(typB);
+        if (compareTyp != 0) {
+            return compareTyp;
+        }
+
+
+        var raumA = elementA.getRaum();
+        var raumB = elementB.getRaum();
+        var compareRaum = raumA.localeCompare(raumB);
+        if (compareRaum != 0) {
+            return compareRaum;
+        }
+
+        var deviceA = elementA.getDevice();
+        var deviceB = elementB.getDevice();
+        var compareDevice = deviceA.localeCompare(deviceB);
+        if (compareDevice != 0) {
+            return compareDevice;
+        }
+
+        return 0;
+    });    
+    return inputArray;
+}
+
+function getEtageSortIndex(etage: string) {
+    if (etage == "OG") {
+        return "a";
+    } else if (etage == "EG") {
+        return "b";
+    } else if (etage == "UG") {
+        return "c";
+    } else {
+        return "d";
+    }
+}
+
 
 module.exports = { createHomematicDevice, createHomeaticDimmer, createHomeaticWandschalter, loadHomematicWandthermostate, loadHomematicPraesenzmelder, loadHomematicWetterstationen, loadHomematicDoors, loadHomematicRollladen, loadHomematicWandschalter, loadHomematicFussbodenheizungen, loadHomematicWandtaster, loadHomematicAccessPoints, loadHomematicTemperatursensoren, loadHomematicRauchmelder, loadHomematicFunktschaltaktoren, loadHomematicWindows, loadHomematicSteckdosen, loadHomematicHeizkoerper, loadHomematicDimmer, loadHomematicDevicesAll };

package/package.json

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

package/zigbeeFunctions.js

@@ -353,7 +353,7 @@ function createZigbeeLampeWeiss(adapter, rawId, baseState, etage, raum, device,
     createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseWinter, turnOnEnterHouseWinter, deviceZigbeeLampeWeiss);
     // Gruppe:
     createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampeWeissGroup, isGroup, deviceZigbeeLampeWeiss);
-    // alexaLevelSchemeForOn: LampeWeissColorScheme
+    // alexaLevelSchemeForOn: LampeWeissAlexaScheme
     if (alexaLevelSchemeForOn != null) {
         createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv, true, deviceZigbeeLampeWeiss);
         createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level, alexaLevelSchemeForOn.getLevel(), deviceZigbeeLampeWeiss);
@@ -707,6 +707,7 @@ function loadZigbeeSteckdosen(adapter) {
             ));
         }
     });
+    cacheSteckdosenArray = sortArray(cacheSteckdosenArray);
     return cacheSteckdosenArray;
 }
 exports.loadZigbeeSteckdosen = loadZigbeeSteckdosen;
@@ -729,6 +730,7 @@ function loadZigbeeBewegungsmelder(adapter) {
             ));
         }
     });
+    cacheBewegungsmelderArray = sortArray(cacheBewegungsmelderArray);
     return cacheBewegungsmelderArray;
 }
 exports.loadZigbeeBewegungsmelder = loadZigbeeBewegungsmelder;
@@ -816,6 +818,7 @@ function loadZigbeeLampenRGB(adapter) {
             ));
         }
     });
+    cacheLampenRGBArray = sortArray(cacheLampenRGBArray);
     return cacheLampenRGBArray;
 }
 exports.loadZigbeeLampenRGB = loadZigbeeLampenRGB;
@@ -833,7 +836,7 @@ function loadZigbeeLampenWeiss(adapter) {
             var alexaOnScheme = null;
             if (adapter.getState(datenpunktPraefix + "." + attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv).val == true) {
                 // @ts-ignore                                                
-                alexaOnScheme = new LampeWeissColorScheme(null, adapter.getState(datenpunktPraefix + "." + attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level).val, adapter.getState(datenpunktPraefix + "." + attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct).val);
+                alexaOnScheme = new LampeWeissAlexaScheme(null, adapter.getState(datenpunktPraefix + "." + attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level).val, adapter.getState(datenpunktPraefix + "." + attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct).val);
             }
             // Weitere Schemes als Array:
             var schemeArray = [];
@@ -903,6 +906,7 @@ function loadZigbeeLampenWeiss(adapter) {
             ));
         }
     });
+    cacheLampenWeissArray = sortArray(cacheLampenWeissArray);
     return cacheLampenWeissArray;
 }
 exports.loadZigbeeLampenWeiss = loadZigbeeLampenWeiss;
@@ -925,6 +929,7 @@ function loadZigbeeRauchmelder(adapter) {
             ));
         }
     });
+    cacheRauchmelderArray = sortArray(cacheRauchmelderArray);
     return cacheRauchmelderArray;
 }
 exports.loadZigbeeRauchmelder = loadZigbeeRauchmelder;
@@ -947,6 +952,7 @@ function loadZigbeeWandtaster(adapter) {
             ));
         }
     });
+    cacheWandtasterArray = sortArray(cacheWandtasterArray);
     return cacheWandtasterArray;
 }
 exports.loadZigbeeWandtaster = loadZigbeeWandtaster;
@@ -970,6 +976,7 @@ function loadZigbeeDosenrelais(adapter) {
             ));
         }
     });
+    cacheDosenrelaisArray = sortArray(cacheDosenrelaisArray);
     return cacheDosenrelaisArray;
 }
 exports.loadZigbeeDosenrelais = loadZigbeeDosenrelais;
@@ -992,6 +999,7 @@ function loadZigbeeSchalter(adapter) {
             ));
         }
     });
+    cacheSchalterArray = sortArray(cacheSchalterArray);
     return cacheSchalterArray;
 }
 exports.loadZigbeeSchalter = loadZigbeeSchalter;
@@ -1014,6 +1022,7 @@ function loadZigbeeRepeater(adapter) {
             ));
         }
     });
+    cacheRepeaterArray = sortArray(cacheRepeaterArray);
     return cacheRepeaterArray;
 }
 exports.loadZigbeeRepeater = loadZigbeeRepeater;
@@ -1028,7 +1037,7 @@ function loadZigbeeFenstersensor(adapter) {
         var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
         if (adapter.getState(datenpunktKey).val == deviceZigbeeFenstersensor) {
             // @ts-ignore            
-            cacheFenstersensorenArray.push(new Zigbee(adapter, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID         (z.B. 1 --> In der Anzeige wird daraus "H01")
+            cacheFenstersensorenArray.push(new ZigbeeFenstersensor(adapter, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID         (z.B. 1 --> In der Anzeige wird daraus "H01")
             adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
             adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich     (z.B. EG)
             adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
@@ -1036,6 +1045,7 @@ function loadZigbeeFenstersensor(adapter) {
             ));
         }
     });
+    cacheFenstersensorenArray = sortArray(cacheFenstersensorenArray);
     return cacheFenstersensorenArray;
 }
 exports.loadZigbeeFenstersensor = loadZigbeeFenstersensor;
@@ -1087,7 +1097,54 @@ function loadZigbeeDevicesAll(adapter) {
         // @ts-ignore                    
         zigbeeAllArray.push(zigbee);
     });
+    zigbeeAllArray = sortArray(zigbeeAllArray);
     return zigbeeAllArray;
 }
 exports.loadZigbeeDevicesAll = loadZigbeeDevicesAll;
+function sortArray(inputArray) {
+    inputArray.sort(function (a, b) {
+        var elementA = a;
+        var elementB = b;
+        var etageA = elementA.getEtage();
+        var etageB = elementB.getEtage();
+        var compareEtage = getEtageSortIndex(etageA).localeCompare(getEtageSortIndex(etageB));
+        if (compareEtage != 0) {
+            return compareEtage;
+        }
+        var typA = elementA.getCategory();
+        var typB = elementB.getCategory();
+        var compareTyp = typA.localeCompare(typB);
+        if (compareTyp != 0) {
+            return compareTyp;
+        }
+        var raumA = elementA.getRaum();
+        var raumB = elementB.getRaum();
+        var compareRaum = raumA.localeCompare(raumB);
+        if (compareRaum != 0) {
+            return compareRaum;
+        }
+        var deviceA = elementA.getDevice();
+        var deviceB = elementB.getDevice();
+        var compareDevice = deviceA.localeCompare(deviceB);
+        if (compareDevice != 0) {
+            return compareDevice;
+        }
+        return 0;
+    });
+    return inputArray;
+}
+function getEtageSortIndex(etage) {
+    if (etage == "OG") {
+        return "a";
+    }
+    else if (etage == "EG") {
+        return "b";
+    }
+    else if (etage == "UG") {
+        return "c";
+    }
+    else {
+        return "d";
+    }
+}
 module.exports = { createZigbeeDevice: createZigbeeDevice, createZigbeeDosenrelais: createZigbeeDosenrelais, createZigbeeLampeRGB: createZigbeeLampeRGB, createZigbeeLampeWeiss: createZigbeeLampeWeiss, createZigbeeSteckdose: createZigbeeSteckdose, loadZigbeeSteckdosen: loadZigbeeSteckdosen, loadZigbeeBewegungsmelder: loadZigbeeBewegungsmelder, loadZigbeeLampenRGB: loadZigbeeLampenRGB, loadZigbeeLampenWeiss: loadZigbeeLampenWeiss, loadZigbeeRauchmelder: loadZigbeeRauchmelder, loadZigbeeWandtaster: loadZigbeeWandtaster, loadZigbeeDosenrelais: loadZigbeeDosenrelais, loadZigbeeSchalter: loadZigbeeSchalter, loadZigbeeRepeater: loadZigbeeRepeater, loadZigbeeFenstersensor: loadZigbeeFenstersensor, loadZigbeeDevicesAll: loadZigbeeDevicesAll };

package/zigbeeFunctions.ts

@@ -389,7 +389,7 @@ export function createZigbeeLampeWeiss(adapter:any, rawId: number, baseState: st
     // Gruppe:
     createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampeWeissGroup, isGroup, deviceZigbeeLampeWeiss);
 
-    // alexaLevelSchemeForOn: LampeWeissColorScheme
+    // alexaLevelSchemeForOn: LampeWeissAlexaScheme
     if (alexaLevelSchemeForOn != null) {
         createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv, true, deviceZigbeeLampeWeiss);
         createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level, alexaLevelSchemeForOn.getLevel(), deviceZigbeeLampeWeiss);
@@ -754,6 +754,7 @@ export function loadZigbeeSteckdosen(adapter: any) {
             ));                    
         }
     });
+    cacheSteckdosenArray = sortArray(cacheSteckdosenArray);                                            
     return cacheSteckdosenArray;
 }
 
@@ -777,6 +778,7 @@ export function loadZigbeeBewegungsmelder(adapter: any) {
             ));
         }
     });
+    cacheBewegungsmelderArray = sortArray(cacheBewegungsmelderArray);                                        
     return cacheBewegungsmelderArray;
 }
 
@@ -918,6 +920,7 @@ export function loadZigbeeLampenRGB(adapter: any) {
             ));
         }
     });
+    cacheLampenRGBArray = sortArray(cacheLampenRGBArray);                                    
     return cacheLampenRGBArray;
 }
 
@@ -935,7 +938,7 @@ export function loadZigbeeLampenWeiss(adapter: any) {
             var alexaOnScheme = null;
             if (adapter.getState(datenpunktPraefix + "." + attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv).val == true) {
                 // @ts-ignore                                                
-                alexaOnScheme = new LampeWeissColorScheme(null,
+                alexaOnScheme = new LampeWeissAlexaScheme(null,
                     adapter.getState(datenpunktPraefix + "." + attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level).val,
                     adapter.getState(datenpunktPraefix + "." + attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct).val
                 );
@@ -1052,6 +1055,7 @@ export function loadZigbeeLampenWeiss(adapter: any) {
             ));
         }
     });
+    cacheLampenWeissArray = sortArray(cacheLampenWeissArray);                                
     return cacheLampenWeissArray;
 }
 
@@ -1075,6 +1079,7 @@ export function loadZigbeeRauchmelder(adapter: any) {
             ));
         }
     });
+    cacheRauchmelderArray = sortArray(cacheRauchmelderArray);                            
     return cacheRauchmelderArray;
 }
 
@@ -1098,6 +1103,7 @@ export function loadZigbeeWandtaster(adapter: any) {
             ));
         }
     });
+    cacheWandtasterArray = sortArray(cacheWandtasterArray);                        
     return cacheWandtasterArray;
 }
 
@@ -1122,6 +1128,7 @@ export function loadZigbeeDosenrelais(adapter: any) {
             ));
         }
     });
+    cacheDosenrelaisArray = sortArray(cacheDosenrelaisArray);                    
     return cacheDosenrelaisArray;
 }
 
@@ -1145,6 +1152,7 @@ export function loadZigbeeSchalter(adapter: any) {
             ));
         }
     });
+    cacheSchalterArray = sortArray(cacheSchalterArray);                
     return cacheSchalterArray;
 }
 
@@ -1168,6 +1176,7 @@ export function loadZigbeeRepeater(adapter: any) {
             ));
         }
     });
+    cacheRepeaterArray = sortArray(cacheRepeaterArray);            
     return cacheRepeaterArray;
 }
 
@@ -1182,7 +1191,7 @@ export function loadZigbeeFenstersensor(adapter: any) {
         var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
         if (adapter.getState(datenpunktKey).val == deviceZigbeeFenstersensor) {
             // @ts-ignore            
-            cacheFenstersensorenArray.push(new Zigbee(adapter,
+            cacheFenstersensorenArray.push(new ZigbeeFenstersensor(adapter,
                 adapter.getState(datenpunktPraefix + "." + attributeRawID).val,     // [0] Device-ID         (z.B. 1 --> In der Anzeige wird daraus "H01")
                 adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
                 adapter.getState(datenpunktPraefix + "." + attributeEtage).val,     // [2] Etage/Bereich     (z.B. EG)
@@ -1191,6 +1200,7 @@ export function loadZigbeeFenstersensor(adapter: any) {
             ));
         }
     });
+    cacheFenstersensorenArray = sortArray(cacheFenstersensorenArray);        
     return cacheFenstersensorenArray;
 }
 
@@ -1243,7 +1253,61 @@ export function loadZigbeeDevicesAll(adapter: any) {
         // @ts-ignore                    
         zigbeeAllArray.push(zigbee);
     });
+    zigbeeAllArray = sortArray(zigbeeAllArray);    
     return zigbeeAllArray;
 }
 
+function sortArray(inputArray) {
+    inputArray.sort((a,b) => {
+        var elementA = a;
+        var elementB = b;
+
+        var etageA = elementA.getEtage();
+        var etageB = elementB.getEtage();
+        var compareEtage = getEtageSortIndex(etageA).localeCompare(getEtageSortIndex(etageB));
+        if (compareEtage != 0) {
+            return compareEtage;
+        }
+
+        var typA = elementA.getCategory();
+        var typB = elementB.getCategory();
+        var compareTyp = typA.localeCompare(typB);
+        if (compareTyp != 0) {
+            return compareTyp;
+        }
+
+
+        var raumA = elementA.getRaum();
+        var raumB = elementB.getRaum();
+        var compareRaum = raumA.localeCompare(raumB);
+        if (compareRaum != 0) {
+            return compareRaum;
+        }
+
+        var deviceA = elementA.getDevice();
+        var deviceB = elementB.getDevice();
+        var compareDevice = deviceA.localeCompare(deviceB);
+        if (compareDevice != 0) {
+            return compareDevice;
+        }
+
+        return 0;
+    });    
+    return inputArray;
+}
+
+function getEtageSortIndex(etage: string) {
+    if (etage == "OG") {
+        return "a";
+    } else if (etage == "EG") {
+        return "b";
+    } else if (etage == "UG") {
+        return "c";
+    } else {
+        return "d";
+    }
+}
+
+
+
 module.exports = { createZigbeeDevice, createZigbeeDosenrelais, createZigbeeLampeRGB, createZigbeeLampeWeiss, createZigbeeSteckdose, loadZigbeeSteckdosen, loadZigbeeBewegungsmelder, loadZigbeeLampenRGB, loadZigbeeLampenWeiss, loadZigbeeRauchmelder, loadZigbeeWandtaster, loadZigbeeDosenrelais, loadZigbeeSchalter, loadZigbeeRepeater, loadZigbeeFenstersensor, loadZigbeeDevicesAll };