iobroker-ucl 1.0.63 → 1.0.64

package/{INSTRUCTIONS.ts → !!!_INSTRUCTIONS_!!!.ts}

@@ -5,18 +5,19 @@
 // ===================================================================================================
 
 // 1.) "Aus TS Dateien JS Dateien machen: (unten im TERMINAL-Fenster)
-// tsc date.ts test.ts main.ts html.ts homematicClasses.ts homematicFunctions.ts zigbeeClasses.ts zigbeeFunctions.ts INSTRUCTIONS.ts
+tsc date.ts test.ts main.ts html.ts homematicClasses.ts homematicFunctions.ts zigbeeClasses.ts zigbeeFunctions.ts INSTRUCTIONS.ts
 
 // 2.) In package.json eine Nummer hochzählen bei der Version
 
-// 3.) Danach auf NPM Repository pushen: (unten im TERMINAL-Fenster)
-// npm publish
+// 3.) Danach auf NPM Repository pushen: (unten im TERMINAL-Fenster) --> https://www.npmjs.com/package/iobroker-ucl
+npm publish
 
 // 4.) In docker iobroker Container rein: (PUTTY)
-// docker exec -it iobroker bash
+docker exec -it iobroker bash
 
 // 5.) Im Docker iobroker container drin das NPM module aktualisieren: (PUTTY)
-// npm update iobroker-ucl
-// npm ls --depth=0              (um sicher zu gehen, dass richtige Version auch gezogen wurde)
+ npm update iobroker-ucl
+ npm ls --depth=0              (um sicher zu gehen, dass richtige Version auch gezogen wurde)
+ npm uninstall iobroker-ucl      Danach: npm install iobroker-ucl            (Manchmal wird in iobroekr die Version incht gezogen warum auch immer)
 
 // 6.) In iobroker Weboberfläche die Javascript Instance restarten

package/main.js

@@ -4,7 +4,7 @@ var _a = require('./html.js'), AbstractColumn = _a.AbstractColumn, HtmlTable = _
 var _b = require('./homematicClasses.js'), HomematicWindow = _b.HomematicWindow, HomematicSteckdose = _b.HomematicSteckdose, HomematicHeizkoerper = _b.HomematicHeizkoerper, HomematicDimmer = _b.HomematicDimmer, HomematicWandthermostat = _b.HomematicWandthermostat, HomematicFussbodenheizung = _b.HomematicFussbodenheizung, HomematicWandschalter = _b.HomematicWandschalter, HomematicDoor = _b.HomematicDoor, HomematicWetterstation = _b.HomematicWetterstation, HomematicAccessPoint = _b.HomematicAccessPoint, HomematicRollladen = _b.HomematicRollladen, HomematicWandtaster = _b.HomematicWandtaster, HomematicTemperatursensor = _b.HomematicTemperatursensor, HomematicRauchmelder = _b.HomematicRauchmelder, HomematicPraesenzmelder = _b.HomematicPraesenzmelder, AbstractHomematic = _b.AbstractHomematic, HomematicFunkschaltaktor = _b.HomematicFunkschaltaktor, deviceHomematicWandthermostat = _b.deviceHomematicWandthermostat, deviceHomematicPraesenzmelder = _b.deviceHomematicPraesenzmelder, deviceHomematicWetterstation = _b.deviceHomematicWetterstation, deviceHomematicDoor = _b.deviceHomematicDoor, deviceHomematicRollladen = _b.deviceHomematicRollladen, deviceHomematicWandschalter = _b.deviceHomematicWandschalter, deviceHomematicFussbodenheizung = _b.deviceHomematicFussbodenheizung, deviceHomematicWandtaster = _b.deviceHomematicWandtaster, deviceHomematicAccessPoint = _b.deviceHomematicAccessPoint, deviceHomematicTemperatursensor = _b.deviceHomematicTemperatursensor, deviceHomematicRauchmelder = _b.deviceHomematicRauchmelder, deviceHomematicFunkSchaltaktor = _b.deviceHomematicFunkSchaltaktor, deviceHomematicWindow = _b.deviceHomematicWindow, deviceHomematicSteckdose = _b.deviceHomematicSteckdose, deviceHomematicHeizkoerper = _b.deviceHomematicHeizkoerper, deviceHomematicDimmer = _b.deviceHomematicDimmer;
 var _c = require('./homematicFunctions.js'), createHomematicDevice = _c.createHomematicDevice, getHomematicDevices = _c.getHomematicDevices, getHomematicDevicesAll = _c.getHomematicDevicesAll;
 var _d = require('./zigbeeClasses.js'), AbstractZigbee = _d.AbstractZigbee, ColorScheme = _d.ColorScheme, RGBColorScheme = _d.RGBColorScheme, WhiteColorScheme = _d.WhiteColorScheme, ZigbeeLampeRGB = _d.ZigbeeLampeRGB, LampeWeissTasterScheme = _d.LampeWeissTasterScheme, LampeWeissAlexaScheme = _d.LampeWeissAlexaScheme, ZigbeeLampeWeiss = _d.ZigbeeLampeWeiss, ZigbeeSteckdose = _d.ZigbeeSteckdose, ZigbeeSchalter = _d.ZigbeeSchalter, ZigbeeRepeater = _d.ZigbeeRepeater, ZigbeeFenstersensor = _d.ZigbeeFenstersensor, ZigbeeRauchmelder = _d.ZigbeeRauchmelder, ZigbeeBewegungsmelder = _d.ZigbeeBewegungsmelder, ZigbeeWandtaster = _d.ZigbeeWandtaster, ZigbeeDosenrelais = _d.ZigbeeDosenrelais, AlexaInputConverter = _d.AlexaInputConverter, deviceZigbeeSteckdose = _d.deviceZigbeeSteckdose, deviceZigbeeBewegungsmelder = _d.deviceZigbeeBewegungsmelder, deviceZigbeeLampeRGB = _d.deviceZigbeeLampeRGB, deviceZigbeeLampeWeiss = _d.deviceZigbeeLampeWeiss, deviceZigbeeRauchmelder = _d.deviceZigbeeRauchmelder, deviceZigbeeWandtaster = _d.deviceZigbeeWandtaster, deviceZigbeeDosenrelais = _d.deviceZigbeeDosenrelais, deviceZigbeeSchalter = _d.deviceZigbeeSchalter, deviceZigbeeRepeater = _d.deviceZigbeeRepeater, deviceZigbeeFenstersensor = _d.deviceZigbeeFenstersensor;
-var _e = require('./zigbeeFunctions.js'), createZigbeeDevice = _e.createZigbeeDevice, createLampeWeiss = _e.createLampeWeiss, createSteckdose = _e.createSteckdose, getZigbeeDevices = _e.getZigbeeDevices, getZigbeeDevicesAll = _e.getZigbeeDevicesAll;
+var _e = require('./zigbeeFunctions.js'), createZigbeeDevice = _e.createZigbeeDevice, createDosenrelaisDevice = _e.createDosenrelaisDevice, createLampeWeiss = _e.createLampeWeiss, createSteckdose = _e.createSteckdose, getZigbeeDevices = _e.getZigbeeDevices, getZigbeeDevicesAll = _e.getZigbeeDevicesAll;
 module.exports = {
     // date.ts:
     DateHelper: DateHelper,
@@ -84,6 +84,7 @@ module.exports = {
     deviceZigbeeFenstersensor: deviceZigbeeFenstersensor,
     // zigbeeFunctions.ts
     createZigbeeDevice: createZigbeeDevice,
+    createDosenrelaisDevice: createDosenrelaisDevice,
     createLampeWeiss: createLampeWeiss,
     createSteckdose: createSteckdose,
     getZigbeeDevices: getZigbeeDevices,

package/main.ts

@@ -5,7 +5,7 @@ const { AbstractColumn, HtmlTable, HtmlCreator, StaticIconColumn, AbstractStanda
 const { HomematicWindow, HomematicSteckdose, HomematicHeizkoerper, HomematicDimmer, HomematicWandthermostat, HomematicFussbodenheizung, HomematicWandschalter, HomematicDoor, HomematicWetterstation, HomematicAccessPoint, HomematicRollladen, HomematicWandtaster, HomematicTemperatursensor, HomematicRauchmelder, HomematicPraesenzmelder, AbstractHomematic, HomematicFunkschaltaktor, deviceHomematicWandthermostat, deviceHomematicPraesenzmelder, deviceHomematicWetterstation, deviceHomematicDoor, deviceHomematicRollladen, deviceHomematicWandschalter, deviceHomematicFussbodenheizung, deviceHomematicWandtaster, deviceHomematicAccessPoint, deviceHomematicTemperatursensor, deviceHomematicRauchmelder, deviceHomematicFunkSchaltaktor, deviceHomematicWindow, deviceHomematicSteckdose, deviceHomematicHeizkoerper, deviceHomematicDimmer} = require('./homematicClasses.js');
 const { createHomematicDevice, getHomematicDevices, getHomematicDevicesAll } = require('./homematicFunctions.js');
 const { AbstractZigbee, ColorScheme, RGBColorScheme, WhiteColorScheme, ZigbeeLampeRGB, LampeWeissTasterScheme, LampeWeissAlexaScheme, ZigbeeLampeWeiss, ZigbeeSteckdose, ZigbeeSchalter, ZigbeeRepeater, ZigbeeFenstersensor, ZigbeeRauchmelder, ZigbeeBewegungsmelder, ZigbeeWandtaster, ZigbeeDosenrelais,AlexaInputConverter, deviceZigbeeSteckdose, deviceZigbeeBewegungsmelder, deviceZigbeeLampeRGB, deviceZigbeeLampeWeiss, deviceZigbeeRauchmelder, deviceZigbeeWandtaster, deviceZigbeeDosenrelais, deviceZigbeeSchalter, deviceZigbeeRepeater, deviceZigbeeFenstersensor } = require('./zigbeeClasses.js');
-const { createZigbeeDevice, createLampeWeiss, createSteckdose, getZigbeeDevices, getZigbeeDevicesAll } = require('./zigbeeFunctions.js');
+const { createZigbeeDevice, createDosenrelaisDevice, createLampeWeiss, createSteckdose, getZigbeeDevices, getZigbeeDevicesAll } = require('./zigbeeFunctions.js');
 
 module.exports = {
 
@@ -30,5 +30,5 @@ module.exports = {
     deviceZigbeeSteckdose, deviceZigbeeBewegungsmelder, deviceZigbeeLampeRGB, deviceZigbeeLampeWeiss, deviceZigbeeRauchmelder, deviceZigbeeWandtaster, deviceZigbeeDosenrelais, deviceZigbeeSchalter, deviceZigbeeRepeater, deviceZigbeeFenstersensor,
     
     // zigbeeFunctions.ts
-    createZigbeeDevice, createLampeWeiss, createSteckdose, getZigbeeDevices, getZigbeeDevicesAll
+    createZigbeeDevice, createDosenrelaisDevice, createLampeWeiss, createSteckdose, getZigbeeDevices, getZigbeeDevicesAll
 };

package/package.json

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

package/zigbeeFunctions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getZigbeeDevicesAll = exports.getZigbeeDevices = exports.createLampeRGB = exports.createLampeWeiss = exports.createSteckdose = exports.createZigbeeDevice = void 0;
+exports.getZigbeeDevicesAll = exports.getZigbeeDevices = exports.createLampeRGB = exports.createLampeWeiss = exports.createSteckdose = exports.createDosenrelaisDevice = exports.createZigbeeDevice = void 0;
 var _a = require('./zigbeeClasses.js'), AbstractZigbee = _a.AbstractZigbee, ColorScheme = _a.ColorScheme, RGBColorScheme = _a.RGBColorScheme, WhiteColorScheme = _a.WhiteColorScheme, ZigbeeLampeRGB = _a.ZigbeeLampeRGB, LampeWeissTasterScheme = _a.LampeWeissTasterScheme, LampeWeissAlexaScheme = _a.LampeWeissAlexaScheme, ZigbeeLampeWeiss = _a.ZigbeeLampeWeiss, ZigbeeSteckdose = _a.ZigbeeSteckdose, ZigbeeSchalter = _a.ZigbeeSchalter, ZigbeeRepeater = _a.ZigbeeRepeater, ZigbeeFenstersensor = _a.ZigbeeFenstersensor, ZigbeeRauchmelder = _a.ZigbeeRauchmelder, ZigbeeBewegungsmelder = _a.ZigbeeBewegungsmelder, ZigbeeWandtaster = _a.ZigbeeWandtaster, ZigbeeDosenrelais = _a.ZigbeeDosenrelais, AlexaInputConverter = _a.AlexaInputConverter, deviceZigbeeSteckdose = _a.deviceZigbeeSteckdose, deviceZigbeeBewegungsmelder = _a.deviceZigbeeBewegungsmelder, deviceZigbeeLampeRGB = _a.deviceZigbeeLampeRGB, deviceZigbeeLampeWeiss = _a.deviceZigbeeLampeWeiss, deviceZigbeeRauchmelder = _a.deviceZigbeeRauchmelder, deviceZigbeeWandtaster = _a.deviceZigbeeWandtaster, deviceZigbeeDosenrelais = _a.deviceZigbeeDosenrelais, deviceZigbeeSchalter = _a.deviceZigbeeSchalter, deviceZigbeeRepeater = _a.deviceZigbeeRepeater, deviceZigbeeFenstersensor = _a.deviceZigbeeFenstersensor;
 // Alexa:
 var attribute_AlexaSmartNamesForOn = "alexaSmartNamesForOn";
@@ -90,6 +90,8 @@ var attributeRGBLamp_ColorSchemes_Weiss4_aktiv = "alexaColorSchemeForOn_Weiss4_a
 var attributeRGBLamp_ColorSchemes_Weiss4_name = "alexaColorSchemeForOn_Weiss4_name";
 var attributeRGBLamp_ColorSchemes_Weiss4_level = "alexaColorSchemeForOn_Weiss4_level";
 var attributeRGBLamp_ColorSchemes_Weiss4_ct = "alexaColorSchemeForOn_Weiss4_ct";
+// Dosenrelais:
+var attributeDosenrelais_smartNames = "smartNames";
 // Lampen/Steckdosen allgemein:
 var attribute_TasterBooleanOn = "tasterBooleanOn";
 var attribute_TasterBooleanOff = "tasterBooleanOff";
@@ -119,6 +121,25 @@ function createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, cate
     createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDevice, device, category);
 }
 exports.createZigbeeDevice = createZigbeeDevice;
+// Dosenrelais:
+function createDosenrelaisDevice(adapter, rawId, baseState, etage, raum, device, category, smartNames) {
+    // Allgemein:
+    createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, deviceZigbeeSteckdose);
+    // Spezifisch:
+    var db_smartNames = null;
+    smartNames.forEach(function (value) {
+        if (db_smartNames == null) {
+            // @ts-ignore                        
+            db_smartNames = value;
+        }
+        else {
+            // @ts-ignore                        
+            db_smartNames += "|" + value;
+        }
+    });
+    createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDosenrelais_smartNames, db_smartNames, category);
+}
+exports.createDosenrelaisDevice = createDosenrelaisDevice;
 // Steckdose:
 function createSteckdose(adapter, rawId, baseState, etage, raum, device, alexaSmartNamesForOn, alexaActionNamesForOn, alexaSmartNamesForOff, alexaActionNamesForOff, additionalStates4TurnOn, additionalStates4TurnOff, category) {
     // Allgemein:
@@ -853,8 +874,8 @@ function getZigbeeDevices(adapter, filterCategory) {
                 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)
-                adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device            (z.B. Stehlampe)            
-                ));
+                adapter.getState(datenpunktPraefix + "." + attributeDevice).val, // [4] Device            (z.B. Stehlampe)         
+                adapter.getState(datenpunktPraefix + "." + attributeDosenrelais_smartNames).val.split('|')));
             }
             else if (filterCategory == deviceZigbeeSchalter) {
                 // @ts-ignore            
@@ -933,4 +954,4 @@ function getZigbeeDevicesAll(adapter) {
     return zigbeeArray;
 }
 exports.getZigbeeDevicesAll = getZigbeeDevicesAll;
-module.exports = { createZigbeeDevice: createZigbeeDevice, createLampeWeiss: createLampeWeiss, createSteckdose: createSteckdose, getZigbeeDevices: getZigbeeDevices, getZigbeeDevicesAll: getZigbeeDevicesAll };
+module.exports = { createZigbeeDevice: createZigbeeDevice, createDosenrelaisDevice: createDosenrelaisDevice, createLampeWeiss: createLampeWeiss, createSteckdose: createSteckdose, getZigbeeDevices: getZigbeeDevices, getZigbeeDevicesAll: getZigbeeDevicesAll };

package/zigbeeFunctions.ts

@@ -109,6 +109,9 @@ const attributeRGBLamp_ColorSchemes_Weiss4_name = "alexaColorSchemeForOn_Weiss4_
 const attributeRGBLamp_ColorSchemes_Weiss4_level = "alexaColorSchemeForOn_Weiss4_level";
 const attributeRGBLamp_ColorSchemes_Weiss4_ct = "alexaColorSchemeForOn_Weiss4_ct";
 
+// Dosenrelais:
+const attributeDosenrelais_smartNames = "smartNames";
+
 // Lampen/Steckdosen allgemein:
 const attribute_TasterBooleanOn = "tasterBooleanOn";
 const attribute_TasterBooleanOff = "tasterBooleanOff";
@@ -141,6 +144,26 @@ export function createZigbeeDevice(adapter:any, rawId: number, baseState: string
     createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDevice, device, category);
 }
 
+// Dosenrelais:
+export function createDosenrelaisDevice(adapter:any, rawId: number, baseState: string, etage:string, raum:string, device:string, category:string, smartNames:string[]) {
+
+    // Allgemein:
+    createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, deviceZigbeeSteckdose);
+
+    // Spezifisch:
+    var db_smartNames = null;
+    smartNames.forEach(value => {
+        if (db_smartNames == null) {
+            // @ts-ignore                        
+            db_smartNames = value;
+        } else {
+            // @ts-ignore                        
+            db_smartNames += "|" + value;
+        }
+    });
+    createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDosenrelais_smartNames, db_smartNames, category);
+}
+
 // Steckdose:
 export function createSteckdose(adapter:any, rawId: number, baseState: string, etage: string, raum: string, device: string, alexaSmartNamesForOn:string[],
     alexaActionNamesForOn:string[], alexaSmartNamesForOff: string[],alexaActionNamesForOff: string[], additionalStates4TurnOn:string[], additionalStates4TurnOff:string[], category:string) {
@@ -999,7 +1022,8 @@ export function getZigbeeDevices(adapter: any, filterCategory: string) {
                     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)
-                    adapter.getState(datenpunktPraefix + "." + attributeDevice).val     // [4] Device            (z.B. Stehlampe)            
+                    adapter.getState(datenpunktPraefix + "." + attributeDevice).val,     // [4] Device            (z.B. Stehlampe)         
+                    adapter.getState(datenpunktPraefix + "." + attributeDosenrelais_smartNames).val.split('|'),           // 14 TasterBoolOff
                 ));
             } else if (filterCategory == deviceZigbeeSchalter) {
                 // @ts-ignore            
@@ -1082,4 +1106,4 @@ export function getZigbeeDevicesAll(adapter: any) {
     return zigbeeArray;
 }
 
-module.exports = { createZigbeeDevice, createLampeWeiss, createSteckdose, getZigbeeDevices, getZigbeeDevicesAll };
+module.exports = { createZigbeeDevice, createDosenrelaisDevice, createLampeWeiss, createSteckdose, getZigbeeDevices, getZigbeeDevicesAll };

package/!!!_INSTRUCTIONS_!!!.js

@@ -1,32 +0,0 @@
-// Current Version: 1.0.63
-// ===================================================================================================
-// WORKFLOW nach Änderungen hier in einer TS-Datei:
-// ===================================================================================================
-// 1.) "Aus TS Dateien JS Dateien machen: (unten im TERMINAL-Fenster)
-tsc;
-date.ts;
-test.ts;
-main.ts;
-html.ts;
-homematicClasses.ts;
-homematicFunctions.ts;
-zigbeeClasses.ts;
-zigbeeFunctions.ts;
-_INSTRUCTIONS_.ts;
-// 2.) In package.json eine Nummer hochzählen bei der Version
-// 3.) Danach auf NPM Repository pushen: (unten im TERMINAL-Fenster)
-npm;
-publish;
-// 4.) In docker iobroker Container rein: (PUTTY)
-docker;
-exec - it;
-iobroker;
-bash;
-// 5.) Im Docker iobroker container drin das NPM module aktualisieren: (PUTTY)
-npm;
-update;
-iobroker - ucl;
-npm;
-ls--;
-depth = 0(um, sicher, zu, gehen, dass, richtige, Version, auch, gezogen, wurde);
-// 6.) In iobroker Weboberfläche die Javascript Instance restarten

package/INSTRUCTIONS.js

@@ -1,15 +0,0 @@
-// Current Version: 1.0.63
-// ===================================================================================================
-// WORKFLOW nach Änderungen hier in einer TS-Datei:
-// ===================================================================================================
-// 1.) "Aus TS Dateien JS Dateien machen: (unten im TERMINAL-Fenster)
-// tsc date.ts test.ts main.ts html.ts homematicClasses.ts homematicFunctions.ts zigbeeClasses.ts zigbeeFunctions.ts INSTRUCTIONS.ts
-// 2.) In package.json eine Nummer hochzählen bei der Version
-// 3.) Danach auf NPM Repository pushen: (unten im TERMINAL-Fenster)
-// npm publish
-// 4.) In docker iobroker Container rein: (PUTTY)
-// docker exec -it iobroker bash
-// 5.) Im Docker iobroker container drin das NPM module aktualisieren: (PUTTY)
-// npm update iobroker-ucl
-// npm ls --depth=0              (um sicher zu gehen, dass richtige Version auch gezogen wurde)
-// 6.) In iobroker Weboberfläche die Javascript Instance restarten