iobroker-ucl 1.0.44 → 1.0.46

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 (5) hide show
  1. package/homematicFunctions.js +40 -6
  2. package/homematicFunctions.ts +40 -4
  3. package/main.js +2 -2
  4. package/main.ts +2 -2
  5. 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.getHomematicDevicesAll = exports.getHomematicDevices = exports.createDatenpunktDevice = void 0;
3
+ exports.getHomematicDevicesAll = exports.getHomematicDevices = 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";
@@ -10,7 +10,7 @@ var attributeDevice = "device";
10
10
  var attributeCategory = "type";
11
11
  var attributeTypeNumber = "number";
12
12
  var attributeTypeString = "string";
13
- function createDatenpunktDevice(adapter, rawId, baseState, etage, raum, device, category) {
13
+ function createHomematicDevice(adapter, rawId, baseState, etage, raum, device, category) {
14
14
  createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRawID, rawId);
15
15
  createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeCategory, category);
16
16
  createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeBaseState, baseState);
@@ -18,7 +18,7 @@ function createDatenpunktDevice(adapter, rawId, baseState, etage, raum, device,
18
18
  createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRaum, raum);
19
19
  createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDevice, device);
20
20
  }
21
- exports.createDatenpunktDevice = createDatenpunktDevice;
21
+ exports.createHomematicDevice = createHomematicDevice;
22
22
  function createDatenpunktSingle(adapter, deviceRawId, attributeType, attributeName, attributeValue) {
23
23
  var stateDatenpunkt = "0_userdata.0.devices.homematic." + deviceRawId + "." + attributeName;
24
24
  adapter.createState(stateDatenpunkt, null, {
@@ -32,11 +32,13 @@ function createDatenpunktSingle(adapter, deviceRawId, attributeType, attributeNa
32
32
  }
33
33
  function getHomematicDevices(adapter, filterCategory) {
34
34
  var _this = this;
35
- var homematicArray = [{}];
35
+ var homematicArray = [];
36
+ //var homematicArray : Array<InstanceType<typeof AbstractHomematic>> = [];
36
37
  adapter.$('state[id=0_userdata.0.devices.homematic.*.type]').each(function (datenpunktKey) {
37
38
  var datenpunktPraefix = datenpunktKey.replaceAll(".type", "");
38
39
  if (adapter.getState(datenpunktKey).val == filterCategory) {
39
40
  if (filterCategory == deviceHomematicWandthermostat) {
41
+ // @ts-ignore
40
42
  homematicArray.push(new HomematicWandthermostat(_this, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
41
43
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
42
44
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
@@ -45,6 +47,7 @@ function getHomematicDevices(adapter, filterCategory) {
45
47
  ));
46
48
  }
47
49
  else if (filterCategory == deviceHomematicPraesenzmelder) {
50
+ // @ts-ignore
48
51
  homematicArray.push(new HomematicPraesenzmelder(_this, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
49
52
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
50
53
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
@@ -53,6 +56,7 @@ function getHomematicDevices(adapter, filterCategory) {
53
56
  ));
54
57
  }
55
58
  else if (filterCategory == deviceHomematicWetterstation) {
59
+ // @ts-ignore
56
60
  homematicArray.push(new HomematicWetterstation(_this, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
57
61
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
58
62
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
@@ -61,6 +65,7 @@ function getHomematicDevices(adapter, filterCategory) {
61
65
  ));
62
66
  }
63
67
  else if (filterCategory == deviceHomematicDoor) {
68
+ // @ts-ignore
64
69
  homematicArray.push(new HomematicDoor(_this, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
65
70
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
66
71
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
@@ -69,6 +74,7 @@ function getHomematicDevices(adapter, filterCategory) {
69
74
  ));
70
75
  }
71
76
  else if (filterCategory == deviceHomematicRollladen) {
77
+ // @ts-ignore
72
78
  homematicArray.push(new HomematicRollladen(_this, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
73
79
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
74
80
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
@@ -77,6 +83,7 @@ function getHomematicDevices(adapter, filterCategory) {
77
83
  ));
78
84
  }
79
85
  else if (filterCategory == deviceHomematicWandschalter) {
86
+ // @ts-ignore
80
87
  homematicArray.push(new HomematicWandschalter(_this, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
81
88
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
82
89
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
@@ -85,6 +92,7 @@ function getHomematicDevices(adapter, filterCategory) {
85
92
  ));
86
93
  }
87
94
  else if (filterCategory == deviceHomematicFussbodenheizung) {
95
+ // @ts-ignore
88
96
  homematicArray.push(new HomematicFussbodenheizung(_this, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
89
97
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
90
98
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
@@ -93,6 +101,7 @@ function getHomematicDevices(adapter, filterCategory) {
93
101
  ));
94
102
  }
95
103
  else if (filterCategory == deviceHomematicWandtaster) {
104
+ // @ts-ignore
96
105
  homematicArray.push(new HomematicWandtaster(_this, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
97
106
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
98
107
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
@@ -101,6 +110,7 @@ function getHomematicDevices(adapter, filterCategory) {
101
110
  ));
102
111
  }
103
112
  else if (filterCategory == deviceHomematicAccessPoint) {
113
+ // @ts-ignore
104
114
  homematicArray.push(new HomematicAccessPoint(_this, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
105
115
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
106
116
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
@@ -109,6 +119,7 @@ function getHomematicDevices(adapter, filterCategory) {
109
119
  ));
110
120
  }
111
121
  else if (filterCategory == deviceHomematicTemperatursensor) {
122
+ // @ts-ignore
112
123
  homematicArray.push(new HomematicTemperatursensor(_this, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
113
124
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
114
125
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
@@ -117,6 +128,7 @@ function getHomematicDevices(adapter, filterCategory) {
117
128
  ));
118
129
  }
119
130
  else if (filterCategory == deviceHomematicRauchmelder) {
131
+ // @ts-ignore
120
132
  homematicArray.push(new HomematicRauchmelder(_this, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
121
133
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
122
134
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
@@ -125,6 +137,7 @@ function getHomematicDevices(adapter, filterCategory) {
125
137
  ));
126
138
  }
127
139
  else if (filterCategory == deviceHomematicFunkSchaltaktor) {
140
+ // @ts-ignore
128
141
  homematicArray.push(new HomematicFunkschaltaktor(_this, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
129
142
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
130
143
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
@@ -133,6 +146,7 @@ function getHomematicDevices(adapter, filterCategory) {
133
146
  ));
134
147
  }
135
148
  else if (filterCategory == deviceHomematicWindow) {
149
+ // @ts-ignore
136
150
  homematicArray.push(new HomematicWindow(_this, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
137
151
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
138
152
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
@@ -141,6 +155,7 @@ function getHomematicDevices(adapter, filterCategory) {
141
155
  ));
142
156
  }
143
157
  else if (filterCategory == deviceHomematicSteckdose) {
158
+ // @ts-ignore
144
159
  homematicArray.push(new HomematicSteckdose(_this, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
145
160
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
146
161
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
@@ -149,6 +164,7 @@ function getHomematicDevices(adapter, filterCategory) {
149
164
  ));
150
165
  }
151
166
  else if (filterCategory == deviceHomematicHeizkoerper) {
167
+ // @ts-ignore
152
168
  homematicArray.push(new HomematicHeizkoerper(_this, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
153
169
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
154
170
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
@@ -157,6 +173,7 @@ function getHomematicDevices(adapter, filterCategory) {
157
173
  ));
158
174
  }
159
175
  else if (filterCategory == deviceHomematicDimmer) {
176
+ // @ts-ignore
160
177
  homematicArray.push(new HomematicDimmer(_this, adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
161
178
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
162
179
  adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
@@ -170,53 +187,70 @@ function getHomematicDevices(adapter, filterCategory) {
170
187
  }
171
188
  exports.getHomematicDevices = getHomematicDevices;
172
189
  function getHomematicDevicesAll(adapter) {
173
- var homematicArray = [{}];
190
+ //var homematicArray : Array<InstanceType<typeof AbstractHomematic>> = [];
191
+ var homematicArray = [];
174
192
  adapter.getHomematicDevices(adapter, deviceHomematicWandthermostat).forEach(function (homematic) {
193
+ // @ts-ignore
175
194
  homematicArray.push(homematic);
176
195
  });
177
196
  adapter.getHomematicDevices(adapter, deviceHomematicPraesenzmelder).forEach(function (homematic) {
197
+ // @ts-ignore
178
198
  homematicArray.push(homematic);
179
199
  });
180
200
  adapter.getHomematicDevices(adapter, deviceHomematicWetterstation).forEach(function (homematic) {
201
+ // @ts-ignore
181
202
  homematicArray.push(homematic);
182
203
  });
183
204
  adapter.getHomematicDevices(adapter, deviceHomematicDoor).forEach(function (homematic) {
205
+ // @ts-ignore
184
206
  homematicArray.push(homematic);
185
207
  });
186
208
  adapter.getHomematicDevices(adapter, deviceHomematicRollladen).forEach(function (homematic) {
209
+ // @ts-ignore
187
210
  homematicArray.push(homematic);
188
211
  });
189
212
  adapter.getHomematicDevices(adapter, deviceHomematicWandschalter).forEach(function (homematic) {
213
+ // @ts-ignore
190
214
  homematicArray.push(homematic);
191
215
  });
192
216
  adapter.getHomematicDevices(adapter, deviceHomematicFussbodenheizung).forEach(function (homematic) {
217
+ // @ts-ignore
193
218
  homematicArray.push(homematic);
194
219
  });
195
220
  adapter.getHomematicDevices(adapter, deviceHomematicWandtaster).forEach(function (homematic) {
221
+ // @ts-ignore
196
222
  homematicArray.push(homematic);
197
223
  });
198
224
  adapter.getHomematicDevices(adapter, deviceHomematicAccessPoint).forEach(function (homematic) {
225
+ // @ts-ignore
199
226
  homematicArray.push(homematic);
200
227
  });
201
228
  adapter.getHomematicDevices(adapter, deviceHomematicTemperatursensor).forEach(function (homematic) {
229
+ // @ts-ignore
202
230
  homematicArray.push(homematic);
203
231
  });
204
232
  adapter.getHomematicDevices(adapter, deviceHomematicRauchmelder).forEach(function (homematic) {
233
+ // @ts-ignore
205
234
  homematicArray.push(homematic);
206
235
  });
207
236
  adapter.getHomematicDevices(adapter, deviceHomematicFunkSchaltaktor).forEach(function (homematic) {
237
+ // @ts-ignore
208
238
  homematicArray.push(homematic);
209
239
  });
210
240
  adapter.getHomematicDevices(adapter, deviceHomematicWindow).forEach(function (homematic) {
241
+ // @ts-ignore
211
242
  homematicArray.push(homematic);
212
243
  });
213
244
  adapter.getHomematicDevices(adapter, deviceHomematicSteckdose).forEach(function (homematic) {
245
+ // @ts-ignore
214
246
  homematicArray.push(homematic);
215
247
  });
216
248
  adapter.getHomematicDevices(adapter, deviceHomematicHeizkoerper).forEach(function (homematic) {
249
+ // @ts-ignore
217
250
  homematicArray.push(homematic);
218
251
  });
219
252
  adapter.getHomematicDevices(adapter, deviceHomematicDimmer).forEach(function (homematic) {
253
+ // @ts-ignore
220
254
  homematicArray.push(homematic);
221
255
  });
222
256
  return homematicArray;
@@ -230,4 +264,4 @@ exports.getHomematicDevicesAll = getHomematicDevicesAll;
230
264
  });
231
265
  return homematicArray;
232
266
  }*/
233
- module.exports = { createDatenpunktDevice: createDatenpunktDevice, getHomematicDevices: getHomematicDevices, getHomematicDevicesAll: getHomematicDevicesAll };
267
+ module.exports = { createHomematicDevice: createHomematicDevice, getHomematicDevices: getHomematicDevices, getHomematicDevicesAll: getHomematicDevicesAll };
package/homematicFunctions.ts CHANGED
@@ -10,7 +10,7 @@ const attributeCategory = "type";
10
10
  const attributeTypeNumber = "number";
11
11
  const attributeTypeString = "string";
12
12
 
13
- export function createDatenpunktDevice(adapter:any, rawId, baseState, etage, raum, device, category) {
13
+ export function createHomematicDevice(adapter:any, rawId, baseState, etage, raum, device, category) {
14
14
  createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRawID, rawId);
15
15
  createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeCategory, category);
16
16
  createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeBaseState, baseState);
@@ -32,11 +32,14 @@ function createDatenpunktSingle(adapter:any, deviceRawId, attributeType, attribu
32
32
  }
33
33
 
34
34
  export function getHomematicDevices(adapter:any, filterCategory:string) {
35
- var homematicArray = [{}];
35
+ var homematicArray = [];
36
+ //var homematicArray : Array<InstanceType<typeof AbstractHomematic>> = [];
37
+
36
38
  adapter.$('state[id=0_userdata.0.devices.homematic.*.type]').each(datenpunktKey => { // 0_userdata.0.devices.homematic.30.type
37
39
  var datenpunktPraefix = datenpunktKey.replaceAll(".type", "");
38
40
  if (adapter.getState(datenpunktKey).val == filterCategory) {
39
41
  if (filterCategory == deviceHomematicWandthermostat) {
42
+ // @ts-ignore
40
43
  homematicArray.push(new HomematicWandthermostat(this,
41
44
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
42
45
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
@@ -45,6 +48,7 @@ export function getHomematicDevices(adapter:any, filterCategory:string) {
45
48
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
46
49
  ));
47
50
  } else if (filterCategory == deviceHomematicPraesenzmelder) {
51
+ // @ts-ignore
48
52
  homematicArray.push(new HomematicPraesenzmelder(this,
49
53
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
50
54
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
@@ -53,6 +57,7 @@ export function getHomematicDevices(adapter:any, filterCategory:string) {
53
57
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
54
58
  ));
55
59
  } else if (filterCategory == deviceHomematicWetterstation) {
60
+ // @ts-ignore
56
61
  homematicArray.push(new HomematicWetterstation(this,
57
62
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
58
63
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
@@ -61,6 +66,7 @@ export function getHomematicDevices(adapter:any, filterCategory:string) {
61
66
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
62
67
  ));
63
68
  } else if (filterCategory == deviceHomematicDoor) {
69
+ // @ts-ignore
64
70
  homematicArray.push(new HomematicDoor(this,
65
71
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
66
72
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
@@ -69,6 +75,7 @@ export function getHomematicDevices(adapter:any, filterCategory:string) {
69
75
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
70
76
  ));
71
77
  } else if (filterCategory == deviceHomematicRollladen) {
78
+ // @ts-ignore
72
79
  homematicArray.push(new HomematicRollladen(this,
73
80
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
74
81
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
@@ -77,6 +84,7 @@ export function getHomematicDevices(adapter:any, filterCategory:string) {
77
84
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
78
85
  ));
79
86
  } else if (filterCategory == deviceHomematicWandschalter) {
87
+ // @ts-ignore
80
88
  homematicArray.push(new HomematicWandschalter(this,
81
89
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
82
90
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
@@ -85,6 +93,7 @@ export function getHomematicDevices(adapter:any, filterCategory:string) {
85
93
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
86
94
  ));
87
95
  } else if (filterCategory == deviceHomematicFussbodenheizung) {
96
+ // @ts-ignore
88
97
  homematicArray.push(new HomematicFussbodenheizung(this,
89
98
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
90
99
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
@@ -93,6 +102,7 @@ export function getHomematicDevices(adapter:any, filterCategory:string) {
93
102
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
94
103
  ));
95
104
  } else if (filterCategory == deviceHomematicWandtaster) {
105
+ // @ts-ignore
96
106
  homematicArray.push(new HomematicWandtaster(this,
97
107
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
98
108
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
@@ -101,6 +111,7 @@ export function getHomematicDevices(adapter:any, filterCategory:string) {
101
111
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
102
112
  ));
103
113
  } else if (filterCategory == deviceHomematicAccessPoint) {
114
+ // @ts-ignore
104
115
  homematicArray.push(new HomematicAccessPoint(this,
105
116
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
106
117
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
@@ -109,6 +120,7 @@ export function getHomematicDevices(adapter:any, filterCategory:string) {
109
120
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
110
121
  ));
111
122
  } else if (filterCategory == deviceHomematicTemperatursensor) {
123
+ // @ts-ignore
112
124
  homematicArray.push(new HomematicTemperatursensor(this,
113
125
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
114
126
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
@@ -117,6 +129,7 @@ export function getHomematicDevices(adapter:any, filterCategory:string) {
117
129
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
118
130
  ));
119
131
  } else if (filterCategory == deviceHomematicRauchmelder) {
132
+ // @ts-ignore
120
133
  homematicArray.push(new HomematicRauchmelder(this,
121
134
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
122
135
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
@@ -125,6 +138,7 @@ export function getHomematicDevices(adapter:any, filterCategory:string) {
125
138
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
126
139
  ));
127
140
  } else if (filterCategory == deviceHomematicFunkSchaltaktor) {
141
+ // @ts-ignore
128
142
  homematicArray.push(new HomematicFunkschaltaktor(this,
129
143
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
130
144
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
@@ -133,6 +147,7 @@ export function getHomematicDevices(adapter:any, filterCategory:string) {
133
147
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
134
148
  ));
135
149
  } else if (filterCategory == deviceHomematicWindow) {
150
+ // @ts-ignore
136
151
  homematicArray.push(new HomematicWindow(this,
137
152
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
138
153
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
@@ -141,6 +156,7 @@ export function getHomematicDevices(adapter:any, filterCategory:string) {
141
156
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
142
157
  ));
143
158
  } else if (filterCategory == deviceHomematicSteckdose) {
159
+ // @ts-ignore
144
160
  homematicArray.push(new HomematicSteckdose(this,
145
161
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
146
162
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
@@ -149,6 +165,7 @@ export function getHomematicDevices(adapter:any, filterCategory:string) {
149
165
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
150
166
  ));
151
167
  } else if (filterCategory == deviceHomematicHeizkoerper) {
168
+ // @ts-ignore
152
169
  homematicArray.push(new HomematicHeizkoerper(this,
153
170
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
154
171
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
@@ -157,6 +174,7 @@ export function getHomematicDevices(adapter:any, filterCategory:string) {
157
174
  adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
158
175
  ));
159
176
  } else if (filterCategory == deviceHomematicDimmer) {
177
+ // @ts-ignore
160
178
  homematicArray.push(new HomematicDimmer(this,
161
179
  adapter.getState(datenpunktPraefix + "." + attributeRawID).val, // [0] Device-ID (z.B. 1 --> In der Anzeige wird daraus "H01")
162
180
  adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
@@ -172,54 +190,72 @@ export function getHomematicDevices(adapter:any, filterCategory:string) {
172
190
  }
173
191
 
174
192
  export function getHomematicDevicesAll(adapter:any) {
175
- var homematicArray = [{}];
193
+ //var homematicArray : Array<InstanceType<typeof AbstractHomematic>> = [];
194
+ var homematicArray = [];
176
195
 
196
+
177
197
  adapter.getHomematicDevices(adapter, deviceHomematicWandthermostat).forEach(homematic => {
198
+ // @ts-ignore
178
199
  homematicArray.push(homematic);
179
200
  });
180
201
  adapter.getHomematicDevices(adapter, deviceHomematicPraesenzmelder).forEach(homematic => {
202
+ // @ts-ignore
181
203
  homematicArray.push(homematic);
182
204
  });
183
205
  adapter.getHomematicDevices(adapter, deviceHomematicWetterstation).forEach(homematic => {
206
+ // @ts-ignore
184
207
  homematicArray.push(homematic);
185
208
  });
186
209
  adapter.getHomematicDevices(adapter, deviceHomematicDoor).forEach(homematic => {
210
+ // @ts-ignore
187
211
  homematicArray.push(homematic);
188
212
  });
189
213
  adapter.getHomematicDevices(adapter, deviceHomematicRollladen).forEach(homematic => {
214
+ // @ts-ignore
190
215
  homematicArray.push(homematic);
191
216
  });
192
217
  adapter.getHomematicDevices(adapter, deviceHomematicWandschalter).forEach(homematic => {
218
+ // @ts-ignore
193
219
  homematicArray.push(homematic);
194
220
  });
195
221
  adapter.getHomematicDevices(adapter, deviceHomematicFussbodenheizung).forEach(homematic => {
222
+ // @ts-ignore
196
223
  homematicArray.push(homematic);
197
224
  });
198
225
  adapter.getHomematicDevices(adapter, deviceHomematicWandtaster).forEach(homematic => {
226
+ // @ts-ignore
199
227
  homematicArray.push(homematic);
200
228
  });
201
229
  adapter.getHomematicDevices(adapter, deviceHomematicAccessPoint).forEach(homematic => {
230
+ // @ts-ignore
202
231
  homematicArray.push(homematic);
203
232
  });
204
233
  adapter.getHomematicDevices(adapter, deviceHomematicTemperatursensor).forEach(homematic => {
234
+ // @ts-ignore
205
235
  homematicArray.push(homematic);
206
236
  });
207
237
  adapter.getHomematicDevices(adapter, deviceHomematicRauchmelder).forEach(homematic => {
238
+ // @ts-ignore
208
239
  homematicArray.push(homematic);
209
240
  });
210
241
  adapter.getHomematicDevices(adapter, deviceHomematicFunkSchaltaktor).forEach(homematic => {
242
+ // @ts-ignore
211
243
  homematicArray.push(homematic);
212
244
  });
213
245
  adapter.getHomematicDevices(adapter, deviceHomematicWindow).forEach(homematic => {
246
+ // @ts-ignore
214
247
  homematicArray.push(homematic);
215
248
  });
216
249
  adapter.getHomematicDevices(adapter, deviceHomematicSteckdose).forEach(homematic => {
250
+ // @ts-ignore
217
251
  homematicArray.push(homematic);
218
252
  });
219
253
  adapter.getHomematicDevices(adapter, deviceHomematicHeizkoerper).forEach(homematic => {
254
+ // @ts-ignore
220
255
  homematicArray.push(homematic);
221
256
  });
222
257
  adapter.getHomematicDevices(adapter, deviceHomematicDimmer).forEach(homematic => {
258
+ // @ts-ignore
223
259
  homematicArray.push(homematic);
224
260
  });
225
261
  return homematicArray;
@@ -234,4 +270,4 @@ export function getHomematicDevicesAll(adapter:any) {
234
270
  return homematicArray;
235
271
  }*/
236
272
 
237
- module.exports = { createDatenpunktDevice, getHomematicDevices, getHomematicDevicesAll };
273
+ module.exports = { createHomematicDevice, getHomematicDevices, getHomematicDevicesAll };
package/main.js CHANGED
@@ -2,7 +2,7 @@ var DateHelper = require('./date.js').DateHelper;
2
2
  var DateCalendarTest = require('./test.js').DateCalendarTest;
3
3
  var _a = require('./html.js'), AbstractColumn = _a.AbstractColumn, HtmlTable = _a.HtmlTable, HtmlCreator = _a.HtmlCreator, StaticIconColumn = _a.StaticIconColumn, AbstractStandardTextColumn = _a.AbstractStandardTextColumn;
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
- var _c = require('./homematicFunctions.js'), createDatenpunktDevice = _c.createDatenpunktDevice, getHomematicDevices = _c.getHomematicDevices, getHomematicDevicesAll = _c.getHomematicDevicesAll;
5
+ var _c = require('./homematicFunctions.js'), createHomematicDevice = _c.createHomematicDevice, getHomematicDevices = _c.getHomematicDevices, getHomematicDevicesAll = _c.getHomematicDevicesAll;
6
6
  module.exports = {
7
7
  // date.ts:
8
8
  DateHelper: DateHelper,
@@ -49,7 +49,7 @@ module.exports = {
49
49
  deviceHomematicHeizkoerper: deviceHomematicHeizkoerper,
50
50
  deviceHomematicDimmer: deviceHomematicDimmer,
51
51
  // homematicFunctions.ts
52
- createDatenpunktDevice: createDatenpunktDevice,
52
+ createHomematicDevice: createHomematicDevice,
53
53
  getHomematicDevices: getHomematicDevices,
54
54
  getHomematicDevicesAll: getHomematicDevicesAll
55
55
  };
package/main.ts CHANGED
@@ -3,7 +3,7 @@ const { DateHelper } = require('./date.js');
3
3
  const { DateCalendarTest } = require('./test.js');
4
4
  const { AbstractColumn, HtmlTable, HtmlCreator, StaticIconColumn, AbstractStandardTextColumn } = require('./html.js');
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
- const { createDatenpunktDevice, getHomematicDevices, getHomematicDevicesAll } = require('./homematicFunctions.js');
6
+ const { createHomematicDevice, getHomematicDevices, getHomematicDevicesAll } = require('./homematicFunctions.js');
7
7
 
8
8
  module.exports = {
9
9
 
@@ -21,5 +21,5 @@ module.exports = {
21
21
  deviceHomematicWandthermostat, deviceHomematicPraesenzmelder, deviceHomematicWetterstation, deviceHomematicDoor, deviceHomematicRollladen, deviceHomematicWandschalter, deviceHomematicFussbodenheizung, deviceHomematicWandtaster, deviceHomematicAccessPoint, deviceHomematicTemperatursensor, deviceHomematicRauchmelder, deviceHomematicFunkSchaltaktor, deviceHomematicWindow, deviceHomematicSteckdose, deviceHomematicHeizkoerper, deviceHomematicDimmer,
22
22
 
23
23
  // homematicFunctions.ts
24
- createDatenpunktDevice, getHomematicDevices, getHomematicDevicesAll
24
+ createHomematicDevice, getHomematicDevices, getHomematicDevicesAll
25
25
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "iobroker-ucl",
3
- "version": "1.0.44",
3
+ "version": "1.0.46",
4
4
  "main": "main.js",
5
5
  "scripts": {
6
6
  "build": "tsc --build",