iobroker-ucl 1.0.47 → 1.0.49

package/!!!_INSTRUCTIONS_!!!.ts

@@ -0,0 +1,20 @@
+// ===================================================================================================
+// 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
+
+// 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/homematicFunctions.js

@@ -7,7 +7,7 @@ var attributeBaseState = "baseState";
 var attributeEtage = "etage";
 var attributeRaum = "raum";
 var attributeDevice = "device";
-var attributeCategory = "type";
+var attributeCategory = "category";
 var attributeTypeNumber = "number";
 var attributeTypeString = "string";
 function createHomematicDevice(adapter, rawId, baseState, etage, raum, device, category) {

package/homematicFunctions.ts

@@ -1,16 +1,16 @@
-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 { 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 attributeRawID = "rawId";
 const attributeBaseState = "baseState";
 const attributeEtage = "etage";
 const attributeRaum = "raum";
 const attributeDevice = "device";
-const attributeCategory = "type";
+const attributeCategory = "category";
 
 const attributeTypeNumber = "number";
 const attributeTypeString = "string";
 
-export function createHomematicDevice(adapter:any, rawId, baseState, etage, raum, device, category) {
+export function createHomematicDevice(adapter: any, rawId: number, baseState: string, etage: string, raum: string, device: string, category: string) {
     createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRawID, rawId);
     createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeCategory, category);
     createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeBaseState, baseState);
@@ -19,22 +19,22 @@ export function createHomematicDevice(adapter:any, rawId, baseState, etage, raum
     createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDevice, device);
 }
 
-function createDatenpunktSingle(adapter:any, deviceRawId, attributeType, attributeName, attributeValue) {
+function createDatenpunktSingle(adapter: any, deviceRawId, attributeType, attributeName, attributeValue) {
     var stateDatenpunkt = "0_userdata.0.devices.homematic." + deviceRawId + "." + attributeName;
     adapter.createState(stateDatenpunkt, null, {
         name: stateDatenpunkt,
         desc: stateDatenpunkt,
-        type: attributeType, 
+        type: attributeType,
         read: true,
         write: true
     });
     adapter.setState(stateDatenpunkt, attributeValue);
 }
 
-export function getHomematicDevices(adapter:any, filterCategory:string) {
+export function getHomematicDevices(adapter: any, filterCategory: string) {
     var homematicArray = [];
     //var homematicArray : Array<InstanceType<typeof AbstractHomematic>> = [];
-    
+
     adapter.$('state[id=0_userdata.0.devices.homematic.*.type]').each(datenpunktKey => {  // 0_userdata.0.devices.homematic.30.type
         var datenpunktPraefix = datenpunktKey.replaceAll(".type", "");
         if (adapter.getState(datenpunktKey).val == filterCategory) {
@@ -183,17 +183,17 @@ export function getHomematicDevices(adapter:any, filterCategory:string) {
                     adapter.getState(datenpunktPraefix + "." + attributeDevice).val     // [4] Device            (z.B. Stehlampe)            
                 ));
             }
-        }                                    
+        }
 
     });
     return homematicArray;
 }
 
-export function getHomematicDevicesAll(adapter:any) {
+export function getHomematicDevicesAll(adapter: any) {
     //var homematicArray : Array<InstanceType<typeof AbstractHomematic>> = [];
     var homematicArray = [];
 
-    
+
     adapter.getHomematicDevices(adapter, deviceHomematicWandthermostat).forEach(homematic => {
         // @ts-ignore            
         homematicArray.push(homematic);

package/main.js

@@ -3,6 +3,8 @@ var DateCalendarTest = require('./test.js').DateCalendarTest;
 var _a = require('./html.js'), AbstractColumn = _a.AbstractColumn, HtmlTable = _a.HtmlTable, HtmlCreator = _a.HtmlCreator, StaticIconColumn = _a.StaticIconColumn, AbstractStandardTextColumn = _a.AbstractStandardTextColumn;
 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;
 module.exports = {
     // date.ts:
     DateHelper: DateHelper,
@@ -51,5 +53,39 @@ module.exports = {
     // homematicFunctions.ts
     createHomematicDevice: createHomematicDevice,
     getHomematicDevices: getHomematicDevices,
-    getHomematicDevicesAll: getHomematicDevicesAll
+    getHomematicDevicesAll: getHomematicDevicesAll,
+    // zigbeeClasses.ts
+    AbstractZigbee: AbstractZigbee,
+    ColorScheme: ColorScheme,
+    RGBColorScheme: RGBColorScheme,
+    WhiteColorScheme: WhiteColorScheme,
+    ZigbeeLampeRGB: ZigbeeLampeRGB,
+    LampeWeissTasterScheme: LampeWeissTasterScheme,
+    LampeWeissAlexaScheme: LampeWeissAlexaScheme,
+    ZigbeeLampeWeiss: ZigbeeLampeWeiss,
+    ZigbeeSteckdose: ZigbeeSteckdose,
+    ZigbeeSchalter: ZigbeeSchalter,
+    ZigbeeRepeater: ZigbeeRepeater,
+    ZigbeeFenstersensor: ZigbeeFenstersensor,
+    ZigbeeRauchmelder: ZigbeeRauchmelder,
+    ZigbeeBewegungsmelder: ZigbeeBewegungsmelder,
+    ZigbeeWandtaster: ZigbeeWandtaster,
+    ZigbeeDosenrelais: ZigbeeDosenrelais,
+    AlexaInputConverter: AlexaInputConverter,
+    deviceZigbeeSteckdose: deviceZigbeeSteckdose,
+    deviceZigbeeBewegungsmelder: deviceZigbeeBewegungsmelder,
+    deviceZigbeeLampeRGB: deviceZigbeeLampeRGB,
+    deviceZigbeeLampeWeiss: deviceZigbeeLampeWeiss,
+    deviceZigbeeRauchmelder: deviceZigbeeRauchmelder,
+    deviceZigbeeWandtaster: deviceZigbeeWandtaster,
+    deviceZigbeeDosenrelais: deviceZigbeeDosenrelais,
+    deviceZigbeeSchalter: deviceZigbeeSchalter,
+    deviceZigbeeRepeater: deviceZigbeeRepeater,
+    deviceZigbeeFenstersensor: deviceZigbeeFenstersensor,
+    // zigbeeFunctions.ts
+    createZigbeeDevice: createZigbeeDevice,
+    createLampeWeiss: createLampeWeiss,
+    createSteckdose: createSteckdose,
+    getZigbeeDevices: getZigbeeDevices,
+    getZigbeeDevicesAll: getZigbeeDevicesAll
 };

package/main.ts

@@ -4,6 +4,8 @@ const { DateCalendarTest } = require('./test.js');
 const { AbstractColumn, HtmlTable, HtmlCreator, StaticIconColumn, AbstractStandardTextColumn } = require('./html.js');
 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');
 
 module.exports = {
 
@@ -21,5 +23,12 @@ module.exports = {
     deviceHomematicWandthermostat, deviceHomematicPraesenzmelder, deviceHomematicWetterstation, deviceHomematicDoor, deviceHomematicRollladen, deviceHomematicWandschalter, deviceHomematicFussbodenheizung, deviceHomematicWandtaster, deviceHomematicAccessPoint, deviceHomematicTemperatursensor, deviceHomematicRauchmelder, deviceHomematicFunkSchaltaktor, deviceHomematicWindow, deviceHomematicSteckdose, deviceHomematicHeizkoerper, deviceHomematicDimmer,
 
     // homematicFunctions.ts
-    createHomematicDevice, getHomematicDevices, getHomematicDevicesAll
+    createHomematicDevice, getHomematicDevices, getHomematicDevicesAll,
+
+    // zigbeeClasses.ts
+    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,
+    
+    // zigbeeFunctions.ts
+    createZigbeeDevice, createLampeWeiss, createSteckdose, getZigbeeDevices, getZigbeeDevicesAll
 };

package/package.json

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