iobroker-ucl 1.0.90 → 1.0.92

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 (3) hide show
  1. package/homematicFunctions.js +40 -40
  2. package/homematicFunctions.ts +41 -39
  3. package/package.json +1 -1
package/homematicFunctions.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.loadHomematicDevicesAll = exports.loadHomematicDimmer = exports.loadHomematicHeizkoerper = exports.loadHomematicSteckdosen = exports.loadHomematicWindows = exports.loadHomematicFunktschaltaktoren = exports.loadHomematicRauchmelder = exports.loadHomematicTemperatursensoren = exports.loadHomematicAccessPoints = exports.loadHomematicWandtaster = exports.loadHomematicFussbodenheizungen = exports.loadHomematicWandschalter = exports.loadHomematicRollladen = exports.loadHomematicDoors = exports.loadHomematicWetterstationen = exports.loadHomematicPraesenzmelder = exports.loadHomematicWandthermostate = exports.createHomematicDevice = void 0;
3
+ exports.loadHomematicDevicesAll = exports.loadHomematicDimmer = exports.loadHomematicHeizkoerper = exports.loadHomematicSteckdosen = exports.loadHomematicWindows = exports.loadHomematicFunktschaltaktoren = exports.loadHomematicRauchmelder = exports.loadHomematicTemperatursensoren = exports.loadHomematicAccessPoints = exports.loadHomematicWandtaster = exports.loadHomematicFussbodenheizungen = exports.loadHomematicWandschalter = exports.loadHomematicDoors = exports.loadHomematicWetterstationen = exports.loadHomematicPraesenzmelder = exports.loadHomematicWandthermostate = exports.loadHomematicRollladen = exports.createHomematicDevice = void 0;
4
4
  var _a = require('./homematicClasses.js'), HomematicWindow = _a.HomematicWindow, HomematicSteckdose = _a.HomematicSteckdose, HomematicHeizkoerper = _a.HomematicHeizkoerper, HomematicDimmer = _a.HomematicDimmer, HomematicWandthermostat = _a.HomematicWandthermostat, HomematicFussbodenheizung = _a.HomematicFussbodenheizung, HomematicWandschalter = _a.HomematicWandschalter, HomematicDoor = _a.HomematicDoor, HomematicWetterstation = _a.HomematicWetterstation, HomematicAccessPoint = _a.HomematicAccessPoint, HomematicRollladen = _a.HomematicRollladen, HomematicWandtaster = _a.HomematicWandtaster, HomematicTemperatursensor = _a.HomematicTemperatursensor, HomematicRauchmelder = _a.HomematicRauchmelder, HomematicPraesenzmelder = _a.HomematicPraesenzmelder, AbstractHomematic = _a.AbstractHomematic, HomematicFunkschaltaktor = _a.HomematicFunkschaltaktor, deviceHomematicWandthermostat = _a.deviceHomematicWandthermostat, deviceHomematicPraesenzmelder = _a.deviceHomematicPraesenzmelder, deviceHomematicWetterstation = _a.deviceHomematicWetterstation, deviceHomematicDoor = _a.deviceHomematicDoor, deviceHomematicRollladen = _a.deviceHomematicRollladen, deviceHomematicWandschalter = _a.deviceHomematicWandschalter, deviceHomematicFussbodenheizung = _a.deviceHomematicFussbodenheizung, deviceHomematicWandtaster = _a.deviceHomematicWandtaster, deviceHomematicAccessPoint = _a.deviceHomematicAccessPoint, deviceHomematicTemperatursensor = _a.deviceHomematicTemperatursensor, deviceHomematicRauchmelder = _a.deviceHomematicRauchmelder, deviceHomematicFunkSchaltaktor = _a.deviceHomematicFunkSchaltaktor, deviceHomematicWindow = _a.deviceHomematicWindow, deviceHomematicSteckdose = _a.deviceHomematicSteckdose, deviceHomematicHeizkoerper = _a.deviceHomematicHeizkoerper, deviceHomematicDimmer = _a.deviceHomematicDimmer;
5
5
  var attributeRawID = "rawId";
6
6
  var attributeBaseState = "baseState";
@@ -29,6 +29,28 @@ function createDatenpunktSingle(adapter, deviceRawId, attributeType, attributeNa
29
29
  write: true
30
30
  });
31
31
  }
32
+ var cacheRollladenArray = null;
33
+ function loadHomematicRollladen(adapter) {
34
+ if (cacheRollladenArray != null) {
35
+ return cacheRollladenArray;
36
+ }
37
+ // @ts-ignore
38
+ cacheRollladenArray = [];
39
+ adapter.$('state[id=0_userdata.0.devices.homematic.*.*.category]').each(function (datenpunktKey) {
40
+ var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
41
+ if (adapter.getState(datenpunktKey).val == deviceHomematicRollladen) {
42
+ // @ts-ignore
43
+ cacheRollladenArray.push(new HomematicRollladen(adapter, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
44
+ adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
45
+ adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
46
+ adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
47
+ adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
48
+ ));
49
+ }
50
+ });
51
+ return cacheRollladenArray;
52
+ }
53
+ exports.loadHomematicRollladen = loadHomematicRollladen;
32
54
  var cacheWandthermostateArray = null;
33
55
  function loadHomematicWandthermostate(adapter) {
34
56
  if (cacheWandthermostateArray != null) {
@@ -40,7 +62,7 @@ function loadHomematicWandthermostate(adapter) {
40
62
  var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
41
63
  if (adapter.getState(datenpunktKey).val == deviceHomematicWandthermostat) {
42
64
  // @ts-ignore
43
- homematicArray.push(new HomematicWandthermostat(adapter, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
65
+ cacheWandthermostateArray.push(new HomematicWandthermostat(adapter, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
44
66
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
45
67
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
46
68
  adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
@@ -117,28 +139,6 @@ function loadHomematicDoors(adapter) {
117
139
  return cacheDoorsArray;
118
140
  }
119
141
  exports.loadHomematicDoors = loadHomematicDoors;
120
- var cacheRollladenArray = null;
121
- function loadHomematicRollladen(adapter) {
122
- if (cacheRollladenArray != null) {
123
- return cacheRollladenArray;
124
- }
125
- // @ts-ignore
126
- cacheRollladenArray = [];
127
- adapter.$('state[id=0_userdata.0.devices.homematic.*.*.category]').each(function (datenpunktKey) {
128
- var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
129
- if (adapter.getState(datenpunktKey).val == deviceHomematicRollladen) {
130
- // @ts-ignore
131
- cacheRollladenArray.push(new HomematicRollladen(adapter, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
132
- adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
133
- adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
134
- adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
135
- adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
136
- ));
137
- }
138
- });
139
- return cacheRollladenArray;
140
- }
141
- exports.loadHomematicRollladen = loadHomematicRollladen;
142
142
  var cacheWandschalterArray = null;
143
143
  function loadHomematicWandschalter(adapter) {
144
144
  if (cacheWandschalterArray != null) {
@@ -390,67 +390,67 @@ function loadHomematicDevicesAll(adapter) {
390
390
  homematicAllArray = [];
391
391
  adapter.loadHomematicWandthermostate(adapter).forEach(function (homematic) {
392
392
  // @ts-ignore
393
- homematicArray.push(homematic);
393
+ homematicAllArray.push(homematic);
394
394
  });
395
395
  adapter.loadHomematicPraesenzmelder(adapter).forEach(function (homematic) {
396
396
  // @ts-ignore
397
- homematicArray.push(homematic);
397
+ homematicAllArray.push(homematic);
398
398
  });
399
399
  adapter.loadHomematicWetterstationen(adapter).forEach(function (homematic) {
400
400
  // @ts-ignore
401
- homematicArray.push(homematic);
401
+ homematicAllArray.push(homematic);
402
402
  });
403
403
  adapter.loadHomematicDoors(adapter).forEach(function (homematic) {
404
404
  // @ts-ignore
405
- homematicArray.push(homematic);
405
+ homematicAllArray.push(homematic);
406
406
  });
407
407
  adapter.loadHomematicRollladen(adapter).forEach(function (homematic) {
408
408
  // @ts-ignore
409
- homematicArray.push(homematic);
409
+ homematicAllArray.push(homematic);
410
410
  });
411
411
  adapter.loadHomematicWandschalter(adapter).forEach(function (homematic) {
412
412
  // @ts-ignore
413
- homematicArray.push(homematic);
413
+ homematicAllArray.push(homematic);
414
414
  });
415
415
  adapter.loadHomematicFussbodenheizungen(adapter).forEach(function (homematic) {
416
416
  // @ts-ignore
417
- homematicArray.push(homematic);
417
+ homematicAllArray.push(homematic);
418
418
  });
419
419
  adapter.loadHomematicWandtaster(adapter).forEach(function (homematic) {
420
420
  // @ts-ignore
421
- homematicArray.push(homematic);
421
+ homematicAllArray.push(homematic);
422
422
  });
423
423
  adapter.loadHomematicAccessPoints(adapter).forEach(function (homematic) {
424
424
  // @ts-ignore
425
- homematicArray.push(homematic);
425
+ homematicAllArray.push(homematic);
426
426
  });
427
427
  adapter.loadHomematicTemperatursensoren(adapter).forEach(function (homematic) {
428
428
  // @ts-ignore
429
- homematicArray.push(homematic);
429
+ homematicAllArray.push(homematic);
430
430
  });
431
431
  adapter.loadHomematicRauchmelder(adapter).forEach(function (homematic) {
432
432
  // @ts-ignore
433
- homematicArray.push(homematic);
433
+ homematicAllArray.push(homematic);
434
434
  });
435
435
  adapter.loadHomematicFunktschaltaktoren(adapter).forEach(function (homematic) {
436
436
  // @ts-ignore
437
- homematicArray.push(homematic);
437
+ homematicAllArray.push(homematic);
438
438
  });
439
439
  adapter.loadHomematicWindows(adapter).forEach(function (homematic) {
440
440
  // @ts-ignore
441
- homematicArray.push(homematic);
441
+ homematicAllArray.push(homematic);
442
442
  });
443
443
  adapter.loadHomematicSteckdosen(adapter).forEach(function (homematic) {
444
444
  // @ts-ignore
445
- homematicArray.push(homematic);
445
+ homematicAllArray.push(homematic);
446
446
  });
447
447
  adapter.loadHomematicHeizkoerper(adapter).forEach(function (homematic) {
448
448
  // @ts-ignore
449
- homematicArray.push(homematic);
449
+ homematicAllArray.push(homematic);
450
450
  });
451
451
  adapter.loadHomematicDimmer(adapter).forEach(function (homematic) {
452
452
  // @ts-ignore
453
- homematicArray.push(homematic);
453
+ homematicAllArray.push(homematic);
454
454
  });
455
455
  return homematicAllArray;
456
456
  }
package/homematicFunctions.ts CHANGED
@@ -30,6 +30,30 @@ function createDatenpunktSingle(adapter: any, deviceRawId, attributeType, attrib
30
30
  });
31
31
  }
32
32
 
33
+ var cacheRollladenArray = null;
34
+ export function loadHomematicRollladen(adapter: any) {
35
+ if (cacheRollladenArray != null) {
36
+ return cacheRollladenArray;
37
+ }
38
+ // @ts-ignore
39
+ cacheRollladenArray = [];
40
+ adapter.$('state[id=0_userdata.0.devices.homematic.*.*.category]').each(datenpunktKey => { // 0_userdata.0.devices.homematic.30.type
41
+ var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
42
+ if (adapter.getState(datenpunktKey).val == deviceHomematicRollladen) {
43
+ // @ts-ignore
44
+ cacheRollladenArray.push(new HomematicRollladen(adapter,
45
+ adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
46
+ adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
47
+ adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
48
+ adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
49
+ adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
50
+ ));
51
+ }
52
+ });
53
+ return cacheRollladenArray;
54
+ }
55
+
56
+
33
57
  var cacheWandthermostateArray = null;
34
58
  export function loadHomematicWandthermostate(adapter: any) {
35
59
  if (cacheWandthermostateArray != null) {
@@ -41,7 +65,7 @@ export function loadHomematicWandthermostate(adapter: any) {
41
65
  var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
42
66
  if (adapter.getState(datenpunktKey).val == deviceHomematicWandthermostat) {
43
67
  // @ts-ignore
44
- homematicArray.push(new HomematicWandthermostat(adapter,
68
+ cacheWandthermostateArray.push(new HomematicWandthermostat(adapter,
45
69
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
46
70
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
47
71
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
@@ -122,28 +146,6 @@ export function loadHomematicDoors(adapter: any) {
122
146
  return cacheDoorsArray;
123
147
  }
124
148
 
125
- var cacheRollladenArray = null;
126
- export function loadHomematicRollladen(adapter: any) {
127
- if (cacheRollladenArray != null) {
128
- return cacheRollladenArray;
129
- }
130
- // @ts-ignore
131
- cacheRollladenArray = [];
132
- adapter.$('state[id=0_userdata.0.devices.homematic.*.*.category]').each(datenpunktKey => { // 0_userdata.0.devices.homematic.30.type
133
- var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
134
- if (adapter.getState(datenpunktKey).val == deviceHomematicRollladen) {
135
- // @ts-ignore
136
- cacheRollladenArray.push(new HomematicRollladen(adapter,
137
- adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
138
- adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
139
- adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
140
- adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
141
- adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
142
- ));
143
- }
144
- });
145
- return cacheRollladenArray;
146
- }
147
149
 
148
150
  var cacheWandschalterArray = null;
149
151
  export function loadHomematicWandschalter(adapter: any) {
@@ -409,67 +411,67 @@ export function loadHomematicDevicesAll(adapter: any) {
409
411
 
410
412
  adapter.loadHomematicWandthermostate(adapter).forEach(homematic => {
411
413
  // @ts-ignore
412
- homematicArray.push(homematic);
414
+ homematicAllArray.push(homematic);
413
415
  });
414
416
  adapter.loadHomematicPraesenzmelder(adapter).forEach(homematic => {
415
417
  // @ts-ignore
416
- homematicArray.push(homematic);
418
+ homematicAllArray.push(homematic);
417
419
  });
418
420
  adapter.loadHomematicWetterstationen(adapter).forEach(homematic => {
419
421
  // @ts-ignore
420
- homematicArray.push(homematic);
422
+ homematicAllArray.push(homematic);
421
423
  });
422
424
  adapter.loadHomematicDoors(adapter).forEach(homematic => {
423
425
  // @ts-ignore
424
- homematicArray.push(homematic);
426
+ homematicAllArray.push(homematic);
425
427
  });
426
428
  adapter.loadHomematicRollladen(adapter).forEach(homematic => {
427
429
  // @ts-ignore
428
- homematicArray.push(homematic);
430
+ homematicAllArray.push(homematic);
429
431
  });
430
432
  adapter.loadHomematicWandschalter(adapter).forEach(homematic => {
431
433
  // @ts-ignore
432
- homematicArray.push(homematic);
434
+ homematicAllArray.push(homematic);
433
435
  });
434
436
  adapter.loadHomematicFussbodenheizungen(adapter).forEach(homematic => {
435
437
  // @ts-ignore
436
- homematicArray.push(homematic);
438
+ homematicAllArray.push(homematic);
437
439
  });
438
440
  adapter.loadHomematicWandtaster(adapter).forEach(homematic => {
439
441
  // @ts-ignore
440
- homematicArray.push(homematic);
442
+ homematicAllArray.push(homematic);
441
443
  });
442
444
  adapter.loadHomematicAccessPoints(adapter).forEach(homematic => {
443
445
  // @ts-ignore
444
- homematicArray.push(homematic);
446
+ homematicAllArray.push(homematic);
445
447
  });
446
448
  adapter.loadHomematicTemperatursensoren(adapter).forEach(homematic => {
447
449
  // @ts-ignore
448
- homematicArray.push(homematic);
450
+ homematicAllArray.push(homematic);
449
451
  });
450
452
  adapter.loadHomematicRauchmelder(adapter).forEach(homematic => {
451
453
  // @ts-ignore
452
- homematicArray.push(homematic);
454
+ homematicAllArray.push(homematic);
453
455
  });
454
456
  adapter.loadHomematicFunktschaltaktoren(adapter).forEach(homematic => {
455
457
  // @ts-ignore
456
- homematicArray.push(homematic);
458
+ homematicAllArray.push(homematic);
457
459
  });
458
460
  adapter.loadHomematicWindows(adapter).forEach(homematic => {
459
461
  // @ts-ignore
460
- homematicArray.push(homematic);
462
+ homematicAllArray.push(homematic);
461
463
  });
462
464
  adapter.loadHomematicSteckdosen(adapter).forEach(homematic => {
463
465
  // @ts-ignore
464
- homematicArray.push(homematic);
466
+ homematicAllArray.push(homematic);
465
467
  });
466
468
  adapter.loadHomematicHeizkoerper(adapter).forEach(homematic => {
467
469
  // @ts-ignore
468
- homematicArray.push(homematic);
470
+ homematicAllArray.push(homematic);
469
471
  });
470
472
  adapter.loadHomematicDimmer(adapter).forEach(homematic => {
471
473
  // @ts-ignore
472
- homematicArray.push(homematic);
474
+ homematicAllArray.push(homematic);
473
475
  });
474
476
  return homematicAllArray;
475
477
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "iobroker-ucl",
3
- "version": "1.0.90",
3
+ "version": "1.0.92",
4
4
  "main": "main.js",
5
5
  "scripts": {
6
6
  "build": "tsc --build",