iobroker-ucl 1.0.48 → 1.0.50

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/!!!_INSTRUCTIONS_!!!.ts +20 -0
  2. package/homematicFunctions.js +16 -24
  3. package/homematicFunctions.ts +16 -25
  4. package/main.js +8 -1
  5. package/main.ts +5 -1
  6. package/package.json +1 -1
  7. package/zigbeeFunctions.js +936 -0
  8. package/zigbeeFunctions.ts +1085 -0
package/!!!_INSTRUCTIONS_!!!.ts ADDED
@@ -0,0 +1,20 @@
1
+ // ===================================================================================================
2
+ // WORKFLOW nach Änderungen hier in einer TS-Datei:
3
+ // ===================================================================================================
4
+
5
+ // 1.) "Aus TS Dateien JS Dateien machen: (unten im TERMINAL-Fenster)
6
+ tsc date.ts test.ts main.ts html.ts homematicClasses.ts homematicFunctions.ts zigbeeClasses.ts
7
+
8
+ // 2.) In package.json eine Nummer hochzählen bei der Version
9
+
10
+ // 3.) Danach auf NPM Repository pushen: (unten im TERMINAL-Fenster)
11
+ npm publish
12
+
13
+ // 4.) In docker iobroker Container rein: (PUTTY)
14
+ docker exec -it iobroker bash
15
+
16
+ // 5.) Im Docker iobroker container drin das NPM module aktualisieren: (PUTTY)
17
+ npm update iobroker-ucl
18
+ npm ls --depth=0 (um sicher zu gehen, dass richtige Version auch gezogen wurde)
19
+
20
+ // 6.) In iobroker Weboberfläche die Javascript Instance restarten
package/homematicFunctions.js CHANGED
@@ -188,79 +188,71 @@ exports.getHomematicDevices = getHomematicDevices;
188
188
  function getHomematicDevicesAll(adapter) {
189
189
  //var homematicArray : Array<InstanceType<typeof AbstractHomematic>> = [];
190
190
  var homematicArray = [];
191
- adapter.getHomematicDevices(adapter, deviceHomematicWandthermostat).forEach(function (homematic) {
191
+ this.getHomematicDevices(adapter, deviceHomematicWandthermostat).forEach(function (homematic) {
192
192
  // @ts-ignore
193
193
  homematicArray.push(homematic);
194
194
  });
195
- adapter.getHomematicDevices(adapter, deviceHomematicPraesenzmelder).forEach(function (homematic) {
195
+ this.getHomematicDevices(adapter, deviceHomematicPraesenzmelder).forEach(function (homematic) {
196
196
  // @ts-ignore
197
197
  homematicArray.push(homematic);
198
198
  });
199
- adapter.getHomematicDevices(adapter, deviceHomematicWetterstation).forEach(function (homematic) {
199
+ this.getHomematicDevices(adapter, deviceHomematicWetterstation).forEach(function (homematic) {
200
200
  // @ts-ignore
201
201
  homematicArray.push(homematic);
202
202
  });
203
- adapter.getHomematicDevices(adapter, deviceHomematicDoor).forEach(function (homematic) {
203
+ this.getHomematicDevices(adapter, deviceHomematicDoor).forEach(function (homematic) {
204
204
  // @ts-ignore
205
205
  homematicArray.push(homematic);
206
206
  });
207
- adapter.getHomematicDevices(adapter, deviceHomematicRollladen).forEach(function (homematic) {
207
+ this.getHomematicDevices(adapter, deviceHomematicRollladen).forEach(function (homematic) {
208
208
  // @ts-ignore
209
209
  homematicArray.push(homematic);
210
210
  });
211
- adapter.getHomematicDevices(adapter, deviceHomematicWandschalter).forEach(function (homematic) {
211
+ this.getHomematicDevices(adapter, deviceHomematicWandschalter).forEach(function (homematic) {
212
212
  // @ts-ignore
213
213
  homematicArray.push(homematic);
214
214
  });
215
- adapter.getHomematicDevices(adapter, deviceHomematicFussbodenheizung).forEach(function (homematic) {
215
+ this.getHomematicDevices(adapter, deviceHomematicFussbodenheizung).forEach(function (homematic) {
216
216
  // @ts-ignore
217
217
  homematicArray.push(homematic);
218
218
  });
219
- adapter.getHomematicDevices(adapter, deviceHomematicWandtaster).forEach(function (homematic) {
219
+ this.getHomematicDevices(adapter, deviceHomematicWandtaster).forEach(function (homematic) {
220
220
  // @ts-ignore
221
221
  homematicArray.push(homematic);
222
222
  });
223
- adapter.getHomematicDevices(adapter, deviceHomematicAccessPoint).forEach(function (homematic) {
223
+ this.getHomematicDevices(adapter, deviceHomematicAccessPoint).forEach(function (homematic) {
224
224
  // @ts-ignore
225
225
  homematicArray.push(homematic);
226
226
  });
227
- adapter.getHomematicDevices(adapter, deviceHomematicTemperatursensor).forEach(function (homematic) {
227
+ this.getHomematicDevices(adapter, deviceHomematicTemperatursensor).forEach(function (homematic) {
228
228
  // @ts-ignore
229
229
  homematicArray.push(homematic);
230
230
  });
231
- adapter.getHomematicDevices(adapter, deviceHomematicRauchmelder).forEach(function (homematic) {
231
+ this.getHomematicDevices(adapter, deviceHomematicRauchmelder).forEach(function (homematic) {
232
232
  // @ts-ignore
233
233
  homematicArray.push(homematic);
234
234
  });
235
- adapter.getHomematicDevices(adapter, deviceHomematicFunkSchaltaktor).forEach(function (homematic) {
235
+ this.getHomematicDevices(adapter, deviceHomematicFunkSchaltaktor).forEach(function (homematic) {
236
236
  // @ts-ignore
237
237
  homematicArray.push(homematic);
238
238
  });
239
- adapter.getHomematicDevices(adapter, deviceHomematicWindow).forEach(function (homematic) {
239
+ this.getHomematicDevices(adapter, deviceHomematicWindow).forEach(function (homematic) {
240
240
  // @ts-ignore
241
241
  homematicArray.push(homematic);
242
242
  });
243
- adapter.getHomematicDevices(adapter, deviceHomematicSteckdose).forEach(function (homematic) {
243
+ this.getHomematicDevices(adapter, deviceHomematicSteckdose).forEach(function (homematic) {
244
244
  // @ts-ignore
245
245
  homematicArray.push(homematic);
246
246
  });
247
- adapter.getHomematicDevices(adapter, deviceHomematicHeizkoerper).forEach(function (homematic) {
247
+ this.getHomematicDevices(adapter, deviceHomematicHeizkoerper).forEach(function (homematic) {
248
248
  // @ts-ignore
249
249
  homematicArray.push(homematic);
250
250
  });
251
- adapter.getHomematicDevices(adapter, deviceHomematicDimmer).forEach(function (homematic) {
251
+ this.getHomematicDevices(adapter, deviceHomematicDimmer).forEach(function (homematic) {
252
252
  // @ts-ignore
253
253
  homematicArray.push(homematic);
254
254
  });
255
255
  return homematicArray;
256
256
  }
257
257
  exports.getHomematicDevicesAll = getHomematicDevicesAll;
258
- /*export function getHomematicDevicesUwe(adapter: any, filterCategory:string) {
259
- adapter.log("INSIDE: ");
260
- var homematicArray = [];
261
- adapter.$('state[id=0_userdata.0.devices.homematic.*.type]').each(datenpunktKey => { // 0_userdata.0.devices.homematic.30.type
262
- adapter.log("Here i am: " + datenpunktKey);
263
- });
264
- return homematicArray;
265
- }*/
266
258
  module.exports = { createHomematicDevice: createHomematicDevice, getHomematicDevices: getHomematicDevices, getHomematicDevicesAll: getHomematicDevicesAll };
package/homematicFunctions.ts CHANGED
@@ -194,80 +194,71 @@ export function getHomematicDevicesAll(adapter: any) {
194
194
  var homematicArray = [];
195
195
 
196
196
 
197
- adapter.getHomematicDevices(adapter, deviceHomematicWandthermostat).forEach(homematic => {
197
+ this.getHomematicDevices(adapter, deviceHomematicWandthermostat).forEach(homematic => {
198
198
  // @ts-ignore
199
199
  homematicArray.push(homematic);
200
200
  });
201
- adapter.getHomematicDevices(adapter, deviceHomematicPraesenzmelder).forEach(homematic => {
201
+ this.getHomematicDevices(adapter, deviceHomematicPraesenzmelder).forEach(homematic => {
202
202
  // @ts-ignore
203
203
  homematicArray.push(homematic);
204
204
  });
205
- adapter.getHomematicDevices(adapter, deviceHomematicWetterstation).forEach(homematic => {
205
+ this.getHomematicDevices(adapter, deviceHomematicWetterstation).forEach(homematic => {
206
206
  // @ts-ignore
207
207
  homematicArray.push(homematic);
208
208
  });
209
- adapter.getHomematicDevices(adapter, deviceHomematicDoor).forEach(homematic => {
209
+ this.getHomematicDevices(adapter, deviceHomematicDoor).forEach(homematic => {
210
210
  // @ts-ignore
211
211
  homematicArray.push(homematic);
212
212
  });
213
- adapter.getHomematicDevices(adapter, deviceHomematicRollladen).forEach(homematic => {
213
+ this.getHomematicDevices(adapter, deviceHomematicRollladen).forEach(homematic => {
214
214
  // @ts-ignore
215
215
  homematicArray.push(homematic);
216
216
  });
217
- adapter.getHomematicDevices(adapter, deviceHomematicWandschalter).forEach(homematic => {
217
+ this.getHomematicDevices(adapter, deviceHomematicWandschalter).forEach(homematic => {
218
218
  // @ts-ignore
219
219
  homematicArray.push(homematic);
220
220
  });
221
- adapter.getHomematicDevices(adapter, deviceHomematicFussbodenheizung).forEach(homematic => {
221
+ this.getHomematicDevices(adapter, deviceHomematicFussbodenheizung).forEach(homematic => {
222
222
  // @ts-ignore
223
223
  homematicArray.push(homematic);
224
224
  });
225
- adapter.getHomematicDevices(adapter, deviceHomematicWandtaster).forEach(homematic => {
225
+ this.getHomematicDevices(adapter, deviceHomematicWandtaster).forEach(homematic => {
226
226
  // @ts-ignore
227
227
  homematicArray.push(homematic);
228
228
  });
229
- adapter.getHomematicDevices(adapter, deviceHomematicAccessPoint).forEach(homematic => {
229
+ this.getHomematicDevices(adapter, deviceHomematicAccessPoint).forEach(homematic => {
230
230
  // @ts-ignore
231
231
  homematicArray.push(homematic);
232
232
  });
233
- adapter.getHomematicDevices(adapter, deviceHomematicTemperatursensor).forEach(homematic => {
233
+ this.getHomematicDevices(adapter, deviceHomematicTemperatursensor).forEach(homematic => {
234
234
  // @ts-ignore
235
235
  homematicArray.push(homematic);
236
236
  });
237
- adapter.getHomematicDevices(adapter, deviceHomematicRauchmelder).forEach(homematic => {
237
+ this.getHomematicDevices(adapter, deviceHomematicRauchmelder).forEach(homematic => {
238
238
  // @ts-ignore
239
239
  homematicArray.push(homematic);
240
240
  });
241
- adapter.getHomematicDevices(adapter, deviceHomematicFunkSchaltaktor).forEach(homematic => {
241
+ this.getHomematicDevices(adapter, deviceHomematicFunkSchaltaktor).forEach(homematic => {
242
242
  // @ts-ignore
243
243
  homematicArray.push(homematic);
244
244
  });
245
- adapter.getHomematicDevices(adapter, deviceHomematicWindow).forEach(homematic => {
245
+ this.getHomematicDevices(adapter, deviceHomematicWindow).forEach(homematic => {
246
246
  // @ts-ignore
247
247
  homematicArray.push(homematic);
248
248
  });
249
- adapter.getHomematicDevices(adapter, deviceHomematicSteckdose).forEach(homematic => {
249
+ this.getHomematicDevices(adapter, deviceHomematicSteckdose).forEach(homematic => {
250
250
  // @ts-ignore
251
251
  homematicArray.push(homematic);
252
252
  });
253
- adapter.getHomematicDevices(adapter, deviceHomematicHeizkoerper).forEach(homematic => {
253
+ this.getHomematicDevices(adapter, deviceHomematicHeizkoerper).forEach(homematic => {
254
254
  // @ts-ignore
255
255
  homematicArray.push(homematic);
256
256
  });
257
- adapter.getHomematicDevices(adapter, deviceHomematicDimmer).forEach(homematic => {
257
+ this.getHomematicDevices(adapter, deviceHomematicDimmer).forEach(homematic => {
258
258
  // @ts-ignore
259
259
  homematicArray.push(homematic);
260
260
  });
261
261
  return homematicArray;
262
262
  }
263
263
 
264
- /*export function getHomematicDevicesUwe(adapter: any, filterCategory:string) {
265
- adapter.log("INSIDE: ");
266
- var homematicArray = [];
267
- adapter.$('state[id=0_userdata.0.devices.homematic.*.type]').each(datenpunktKey => { // 0_userdata.0.devices.homematic.30.type
268
- adapter.log("Here i am: " + datenpunktKey);
269
- });
270
- return homematicArray;
271
- }*/
272
-
273
264
  module.exports = { createHomematicDevice, getHomematicDevices, getHomematicDevicesAll };
package/main.js CHANGED
@@ -4,6 +4,7 @@ var _a = require('./html.js'), AbstractColumn = _a.AbstractColumn, HtmlTable = _
4
4
  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;
5
5
  var _c = require('./homematicFunctions.js'), createHomematicDevice = _c.createHomematicDevice, getHomematicDevices = _c.getHomematicDevices, getHomematicDevicesAll = _c.getHomematicDevicesAll;
6
6
  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;
7
+ var _e = require('./zigbeeFunctions.js'), createZigbeeDevice = _e.createZigbeeDevice, createLampeWeiss = _e.createLampeWeiss, createSteckdose = _e.createSteckdose, getZigbeeDevices = _e.getZigbeeDevices, getZigbeeDevicesAll = _e.getZigbeeDevicesAll;
7
8
  module.exports = {
8
9
  // date.ts:
9
10
  DateHelper: DateHelper,
@@ -80,5 +81,11 @@ module.exports = {
80
81
  deviceZigbeeDosenrelais: deviceZigbeeDosenrelais,
81
82
  deviceZigbeeSchalter: deviceZigbeeSchalter,
82
83
  deviceZigbeeRepeater: deviceZigbeeRepeater,
83
- deviceZigbeeFenstersensor: deviceZigbeeFenstersensor
84
+ deviceZigbeeFenstersensor: deviceZigbeeFenstersensor,
85
+ // zigbeeFunctions.ts
86
+ createZigbeeDevice: createZigbeeDevice,
87
+ createLampeWeiss: createLampeWeiss,
88
+ createSteckdose: createSteckdose,
89
+ getZigbeeDevices: getZigbeeDevices,
90
+ getZigbeeDevicesAll: getZigbeeDevicesAll
84
91
  };
package/main.ts CHANGED
@@ -5,6 +5,7 @@ const { AbstractColumn, HtmlTable, HtmlCreator, StaticIconColumn, AbstractStanda
5
5
  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');
6
6
  const { createHomematicDevice, getHomematicDevices, getHomematicDevicesAll } = require('./homematicFunctions.js');
7
7
  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');
8
+ const { createZigbeeDevice, createLampeWeiss, createSteckdose, getZigbeeDevices, getZigbeeDevicesAll } = require('./zigbeeFunctions.js');
8
9
 
9
10
  module.exports = {
10
11
 
@@ -26,5 +27,8 @@ module.exports = {
26
27
 
27
28
  // zigbeeClasses.ts
28
29
  AbstractZigbee, ColorScheme, RGBColorScheme, WhiteColorScheme, ZigbeeLampeRGB, LampeWeissTasterScheme, LampeWeissAlexaScheme, ZigbeeLampeWeiss, ZigbeeSteckdose, ZigbeeSchalter, ZigbeeRepeater, ZigbeeFenstersensor, ZigbeeRauchmelder, ZigbeeBewegungsmelder, ZigbeeWandtaster, ZigbeeDosenrelais,AlexaInputConverter,
29
- deviceZigbeeSteckdose, deviceZigbeeBewegungsmelder, deviceZigbeeLampeRGB, deviceZigbeeLampeWeiss, deviceZigbeeRauchmelder, deviceZigbeeWandtaster, deviceZigbeeDosenrelais, deviceZigbeeSchalter, deviceZigbeeRepeater, deviceZigbeeFenstersensor
30
+ deviceZigbeeSteckdose, deviceZigbeeBewegungsmelder, deviceZigbeeLampeRGB, deviceZigbeeLampeWeiss, deviceZigbeeRauchmelder, deviceZigbeeWandtaster, deviceZigbeeDosenrelais, deviceZigbeeSchalter, deviceZigbeeRepeater, deviceZigbeeFenstersensor,
31
+
32
+ // zigbeeFunctions.ts
33
+ createZigbeeDevice, createLampeWeiss, createSteckdose, getZigbeeDevices, getZigbeeDevicesAll
30
34
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "iobroker-ucl",
3
- "version": "1.0.48",
3
+ "version": "1.0.50",
4
4
  "main": "main.js",
5
5
  "scripts": {
6
6
  "build": "tsc --build",