iobroker-ucl 1.0.61 → 1.0.64
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.
- package/!!!_INSTRUCTIONS_!!!.ts +7 -4
- package/homematicFunctions.js +9 -9
- package/homematicFunctions.ts +9 -9
- package/main.js +2 -1
- package/main.ts +2 -2
- package/package.json +1 -1
- package/zigbeeFunctions.js +223 -202
- package/zigbeeFunctions.ts +224 -200
package/zigbeeFunctions.ts
CHANGED
|
@@ -109,6 +109,9 @@ const attributeRGBLamp_ColorSchemes_Weiss4_name = "alexaColorSchemeForOn_Weiss4_
|
|
|
109
109
|
const attributeRGBLamp_ColorSchemes_Weiss4_level = "alexaColorSchemeForOn_Weiss4_level";
|
|
110
110
|
const attributeRGBLamp_ColorSchemes_Weiss4_ct = "alexaColorSchemeForOn_Weiss4_ct";
|
|
111
111
|
|
|
112
|
+
// Dosenrelais:
|
|
113
|
+
const attributeDosenrelais_smartNames = "smartNames";
|
|
114
|
+
|
|
112
115
|
// Lampen/Steckdosen allgemein:
|
|
113
116
|
const attribute_TasterBooleanOn = "tasterBooleanOn";
|
|
114
117
|
const attribute_TasterBooleanOff = "tasterBooleanOff";
|
|
@@ -133,17 +136,37 @@ const attributeCategory = "category";
|
|
|
133
136
|
|
|
134
137
|
// Standarddevices, ohne zusätzliche Attribute:
|
|
135
138
|
export function createZigbeeDevice(adapter:any, rawId: number, baseState: string, etage:string, raum:string, device:string, category:string) {
|
|
136
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRawID, rawId);
|
|
137
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeCategory, category);
|
|
138
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeBaseState, baseState);
|
|
139
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeEtage, etage);
|
|
140
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRaum, raum);
|
|
141
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDevice, device);
|
|
139
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRawID, rawId, category);
|
|
140
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeCategory, category, category);
|
|
141
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeBaseState, baseState, category);
|
|
142
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeEtage, etage, category);
|
|
143
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRaum, raum, category);
|
|
144
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDevice, device, category);
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
// Dosenrelais:
|
|
148
|
+
export function createDosenrelaisDevice(adapter:any, rawId: number, baseState: string, etage:string, raum:string, device:string, category:string, smartNames:string[]) {
|
|
149
|
+
|
|
150
|
+
// Allgemein:
|
|
151
|
+
createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, deviceZigbeeSteckdose);
|
|
152
|
+
|
|
153
|
+
// Spezifisch:
|
|
154
|
+
var db_smartNames = null;
|
|
155
|
+
smartNames.forEach(value => {
|
|
156
|
+
if (db_smartNames == null) {
|
|
157
|
+
// @ts-ignore
|
|
158
|
+
db_smartNames = value;
|
|
159
|
+
} else {
|
|
160
|
+
// @ts-ignore
|
|
161
|
+
db_smartNames += "|" + value;
|
|
162
|
+
}
|
|
163
|
+
});
|
|
164
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDosenrelais_smartNames, db_smartNames, category);
|
|
142
165
|
}
|
|
143
166
|
|
|
144
167
|
// Steckdose:
|
|
145
168
|
export function createSteckdose(adapter:any, rawId: number, baseState: string, etage: string, raum: string, device: string, alexaSmartNamesForOn:string[],
|
|
146
|
-
alexaActionNamesForOn:string[], alexaSmartNamesForOff: string[],alexaActionNamesForOff: string[], additionalStates4TurnOn:string[], additionalStates4TurnOff:string[]) {
|
|
169
|
+
alexaActionNamesForOn:string[], alexaSmartNamesForOff: string[],alexaActionNamesForOff: string[], additionalStates4TurnOn:string[], additionalStates4TurnOff:string[], category:string) {
|
|
147
170
|
|
|
148
171
|
// Allgemein:
|
|
149
172
|
createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, deviceZigbeeSteckdose);
|
|
@@ -159,7 +182,7 @@ export function createSteckdose(adapter:any, rawId: number, baseState: string, e
|
|
|
159
182
|
db_alexaSmartNamesForOn += "|" + value;
|
|
160
183
|
}
|
|
161
184
|
});
|
|
162
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn);
|
|
185
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn, category);
|
|
163
186
|
|
|
164
187
|
// alexaActionNamesForOn:string[]
|
|
165
188
|
var db_alexaActionNamesForOn = null;
|
|
@@ -172,7 +195,7 @@ export function createSteckdose(adapter:any, rawId: number, baseState: string, e
|
|
|
172
195
|
db_alexaActionNamesForOn += "|" + value;
|
|
173
196
|
}
|
|
174
197
|
});
|
|
175
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn);
|
|
198
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn, category);
|
|
176
199
|
|
|
177
200
|
// alexaSmartNamesForOff:string[]
|
|
178
201
|
var db_alexaSmartNamesForOff = null;
|
|
@@ -185,7 +208,7 @@ export function createSteckdose(adapter:any, rawId: number, baseState: string, e
|
|
|
185
208
|
db_alexaSmartNamesForOff += "|" + value;
|
|
186
209
|
}
|
|
187
210
|
});
|
|
188
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff);
|
|
211
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff, category);
|
|
189
212
|
|
|
190
213
|
// alexaActionNamesForOff:string[]
|
|
191
214
|
var db_alexaActionNamesForOff = null;
|
|
@@ -198,7 +221,7 @@ export function createSteckdose(adapter:any, rawId: number, baseState: string, e
|
|
|
198
221
|
db_alexaActionNamesForOff += "|" + value;
|
|
199
222
|
}
|
|
200
223
|
});
|
|
201
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff);
|
|
224
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff, category);
|
|
202
225
|
|
|
203
226
|
// additionalStates4TurnOn: string[]
|
|
204
227
|
var db_additionalStates4TurnOn = null;
|
|
@@ -211,7 +234,7 @@ export function createSteckdose(adapter:any, rawId: number, baseState: string, e
|
|
|
211
234
|
db_additionalStates4TurnOn += "|" + value;
|
|
212
235
|
}
|
|
213
236
|
});
|
|
214
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOn, db_additionalStates4TurnOn);
|
|
237
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOn, db_additionalStates4TurnOn, category);
|
|
215
238
|
|
|
216
239
|
// additionalStates4TurnOff: string[]
|
|
217
240
|
var db_additionalStates4TurnOff = null;
|
|
@@ -224,7 +247,7 @@ export function createSteckdose(adapter:any, rawId: number, baseState: string, e
|
|
|
224
247
|
db_additionalStates4TurnOff += "|" + value;
|
|
225
248
|
}
|
|
226
249
|
});
|
|
227
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_additionalStates4TurnOff);
|
|
250
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_additionalStates4TurnOff, category);
|
|
228
251
|
}
|
|
229
252
|
|
|
230
253
|
// LampeWeiss:
|
|
@@ -234,7 +257,7 @@ export function createLampeWeiss(adapter:any, rawId: number, baseState: string,
|
|
|
234
257
|
isGroup: boolean,
|
|
235
258
|
tasterBooleanOn1: InstanceType<typeof LampeWeissTasterScheme>, tasterBooleanOn2: InstanceType<typeof LampeWeissTasterScheme>, tasterBooleanOn3: InstanceType<typeof LampeWeissTasterScheme>, tasterBooleanOn4: InstanceType<typeof LampeWeissTasterScheme>,
|
|
236
259
|
tasterBooleanOff: string[], nachtbeleuchtung:boolean,
|
|
237
|
-
turnOffExitHouseSummer:boolean, turnOffExitHouseWinter:boolean, turnOnEnterHouseSummer:boolean, turnOnEnterHouseWinter:boolean) {
|
|
260
|
+
turnOffExitHouseSummer:boolean, turnOffExitHouseWinter:boolean, turnOnEnterHouseSummer:boolean, turnOnEnterHouseWinter:boolean, category:string) {
|
|
238
261
|
|
|
239
262
|
// Allgemein:
|
|
240
263
|
createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, deviceZigbeeLampeWeiss);
|
|
@@ -250,7 +273,7 @@ export function createLampeWeiss(adapter:any, rawId: number, baseState: string,
|
|
|
250
273
|
db_alexaSmartNamesForOn += "|" + value;
|
|
251
274
|
}
|
|
252
275
|
});
|
|
253
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn);
|
|
276
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn, category);
|
|
254
277
|
|
|
255
278
|
// alexaActionNamesForOn:string[]
|
|
256
279
|
var db_alexaActionNamesForOn = null;
|
|
@@ -263,7 +286,7 @@ export function createLampeWeiss(adapter:any, rawId: number, baseState: string,
|
|
|
263
286
|
db_alexaActionNamesForOn += "|" + value;
|
|
264
287
|
}
|
|
265
288
|
});
|
|
266
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn);
|
|
289
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn, category);
|
|
267
290
|
|
|
268
291
|
// alexaSmartNamesForOff:string[]
|
|
269
292
|
var db_alexaSmartNamesForOff = null;
|
|
@@ -276,7 +299,7 @@ export function createLampeWeiss(adapter:any, rawId: number, baseState: string,
|
|
|
276
299
|
db_alexaSmartNamesForOff += "|" + value;
|
|
277
300
|
}
|
|
278
301
|
});
|
|
279
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff);
|
|
302
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff, category);
|
|
280
303
|
|
|
281
304
|
// alexaActionNamesForOff:string[]
|
|
282
305
|
var db_alexaActionNamesForOff = null;
|
|
@@ -289,58 +312,58 @@ export function createLampeWeiss(adapter:any, rawId: number, baseState: string,
|
|
|
289
312
|
db_alexaActionNamesForOff += "|" + value;
|
|
290
313
|
}
|
|
291
314
|
});
|
|
292
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff);
|
|
315
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff, category);
|
|
293
316
|
|
|
294
317
|
// tasterBooleanOn1 : LampeWeissTasterScheme
|
|
295
318
|
if (tasterBooleanOn1 != null) {
|
|
296
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn1_aktiv, true);
|
|
297
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn1_name, tasterBooleanOn1.getTasterBooleanOnName());
|
|
298
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_level, tasterBooleanOn1.getLevel());
|
|
299
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_ct, tasterBooleanOn1.getCt());
|
|
319
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn1_aktiv, true, category);
|
|
320
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn1_name, tasterBooleanOn1.getTasterBooleanOnName(), category);
|
|
321
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_level, tasterBooleanOn1.getLevel(), category);
|
|
322
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_ct, tasterBooleanOn1.getCt(), category);
|
|
300
323
|
} else {
|
|
301
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn1_aktiv, false);
|
|
302
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn1_name, null);
|
|
303
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_level, null);
|
|
304
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_ct, null);
|
|
324
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn1_aktiv, false, category);
|
|
325
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn1_name, null, category);
|
|
326
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_level, null, category);
|
|
327
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_ct, null, category);
|
|
305
328
|
}
|
|
306
329
|
|
|
307
330
|
// tasterBooleanOn2 : LampeWeissTasterScheme
|
|
308
331
|
if (tasterBooleanOn2 != null) {
|
|
309
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn2_aktiv, true);
|
|
310
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn2_name, tasterBooleanOn2.getTasterBooleanOnName());
|
|
311
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_level, tasterBooleanOn2.getLevel());
|
|
312
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_ct, tasterBooleanOn2.getCt());
|
|
332
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn2_aktiv, true, category);
|
|
333
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn2_name, tasterBooleanOn2.getTasterBooleanOnName(), category);
|
|
334
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_level, tasterBooleanOn2.getLevel(), category);
|
|
335
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_ct, tasterBooleanOn2.getCt(), category);
|
|
313
336
|
} else {
|
|
314
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn2_aktiv, false);
|
|
315
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn2_name, null);
|
|
316
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_level, null);
|
|
317
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_ct, null);
|
|
337
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn2_aktiv, false, category);
|
|
338
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn2_name, null, category);
|
|
339
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_level, null, category);
|
|
340
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_ct, null, category);
|
|
318
341
|
}
|
|
319
342
|
|
|
320
343
|
// tasterBooleanOn3 : LampeWeissTasterScheme
|
|
321
344
|
if (tasterBooleanOn3 != null) {
|
|
322
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn3_aktiv, true);
|
|
323
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn3_name, tasterBooleanOn3.getTasterBooleanOnName());
|
|
324
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_level, tasterBooleanOn3.getLevel());
|
|
325
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_ct, tasterBooleanOn3.getCt());
|
|
345
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn3_aktiv, true, category);
|
|
346
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn3_name, tasterBooleanOn3.getTasterBooleanOnName(), category);
|
|
347
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_level, tasterBooleanOn3.getLevel(), category);
|
|
348
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_ct, tasterBooleanOn3.getCt(), category);
|
|
326
349
|
} else {
|
|
327
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn3_aktiv, false);
|
|
328
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn3_name, null);
|
|
329
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_level, null);
|
|
330
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_ct, null);
|
|
350
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn3_aktiv, false, category);
|
|
351
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn3_name, null, category);
|
|
352
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_level, null, category);
|
|
353
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_ct, null, category);
|
|
331
354
|
}
|
|
332
355
|
|
|
333
356
|
// tasterBooleanOn4 : LampeWeissTasterScheme
|
|
334
357
|
if (tasterBooleanOn4 != null) {
|
|
335
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn4_aktiv, true);
|
|
336
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn4_name, tasterBooleanOn4.getTasterBooleanOnName());
|
|
337
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_level, tasterBooleanOn4.getLevel());
|
|
338
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_ct, tasterBooleanOn4.getCt());
|
|
358
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn4_aktiv, true, category);
|
|
359
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn4_name, tasterBooleanOn4.getTasterBooleanOnName(), category);
|
|
360
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_level, tasterBooleanOn4.getLevel(), category);
|
|
361
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_ct, tasterBooleanOn4.getCt(), category);
|
|
339
362
|
} else {
|
|
340
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn4_aktiv, false);
|
|
341
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn4_name, null);
|
|
342
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_level, null);
|
|
343
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_ct, null);
|
|
363
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn4_aktiv, false, category);
|
|
364
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn4_name, null, category);
|
|
365
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_level, null, category);
|
|
366
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_ct, null, category);
|
|
344
367
|
}
|
|
345
368
|
|
|
346
369
|
// tasterBooleanOff: string[]
|
|
@@ -354,79 +377,79 @@ export function createLampeWeiss(adapter:any, rawId: number, baseState: string,
|
|
|
354
377
|
db_tasterBooleanOff += "|" + value;
|
|
355
378
|
}
|
|
356
379
|
});
|
|
357
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_tasterBooleanOff);
|
|
380
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_tasterBooleanOff, category);
|
|
358
381
|
|
|
359
382
|
// Weitere:
|
|
360
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_Nachtbeleuchtung, nachtbeleuchtung);
|
|
361
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseSummer, turnOffExitHouseSummer);
|
|
362
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseWinter, turnOffExitHouseWinter);
|
|
363
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseSummer, turnOnEnterHouseSummer);
|
|
364
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseWinter, turnOnEnterHouseWinter);
|
|
383
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_Nachtbeleuchtung, nachtbeleuchtung, category);
|
|
384
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseSummer, turnOffExitHouseSummer, category);
|
|
385
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseWinter, turnOffExitHouseWinter, category);
|
|
386
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseSummer, turnOnEnterHouseSummer, category);
|
|
387
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseWinter, turnOnEnterHouseWinter, category);
|
|
365
388
|
|
|
366
389
|
// Gruppe:
|
|
367
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampeWeissGroup, isGroup);
|
|
390
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampeWeissGroup, isGroup, category);
|
|
368
391
|
|
|
369
392
|
// alexaLevelSchemeForOn: LampeWeissColorScheme
|
|
370
393
|
if (alexaLevelSchemeForOn != null) {
|
|
371
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv, true);
|
|
372
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level, alexaLevelSchemeForOn.getLevel());
|
|
373
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct, alexaLevelSchemeForOn.getCt());
|
|
394
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv, true, category);
|
|
395
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level, alexaLevelSchemeForOn.getLevel(), category);
|
|
396
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct, alexaLevelSchemeForOn.getCt(), category);
|
|
374
397
|
} else {
|
|
375
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv, false);
|
|
376
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level, null);
|
|
377
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct, null);
|
|
398
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv, false, category);
|
|
399
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level, null, category);
|
|
400
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct, null, category);
|
|
378
401
|
}
|
|
379
402
|
|
|
380
403
|
// colorSchemesWeiss1: LampeWeissAlexaScheme
|
|
381
404
|
if (colorSchemesWeiss1 != null) {
|
|
382
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss1_aktiv, true);
|
|
383
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss1_name, colorSchemesWeiss1.getAlexaName());
|
|
384
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_level, colorSchemesWeiss1.getLevel());
|
|
385
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_ct, colorSchemesWeiss1.getCt());
|
|
405
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss1_aktiv, true, category);
|
|
406
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss1_name, colorSchemesWeiss1.getAlexaName(), category);
|
|
407
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_level, colorSchemesWeiss1.getLevel(), category);
|
|
408
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_ct, colorSchemesWeiss1.getCt(), category);
|
|
386
409
|
} else {
|
|
387
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss1_aktiv, false);
|
|
388
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss1_name, null);
|
|
389
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_level, null);
|
|
390
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_ct, null);
|
|
410
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss1_aktiv, false, category);
|
|
411
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss1_name, null, category);
|
|
412
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_level, null, category);
|
|
413
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_ct, null, category);
|
|
391
414
|
}
|
|
392
415
|
|
|
393
416
|
// colorSchemesWeiss2: LampeWeissAlexaScheme
|
|
394
417
|
if (colorSchemesWeiss2 != null) {
|
|
395
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss2_aktiv, true);
|
|
396
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss2_name, colorSchemesWeiss2.getAlexaName());
|
|
397
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_level, colorSchemesWeiss2.getLevel());
|
|
398
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_ct, colorSchemesWeiss2.getCt());
|
|
418
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss2_aktiv, true, category);
|
|
419
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss2_name, colorSchemesWeiss2.getAlexaName(), category);
|
|
420
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_level, colorSchemesWeiss2.getLevel(), category);
|
|
421
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_ct, colorSchemesWeiss2.getCt(), category);
|
|
399
422
|
} else {
|
|
400
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss2_aktiv, false);
|
|
401
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss2_name, null);
|
|
402
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_level, null);
|
|
403
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_ct, null);
|
|
423
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss2_aktiv, false, category);
|
|
424
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss2_name, null, category);
|
|
425
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_level, null, category);
|
|
426
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_ct, null, category);
|
|
404
427
|
}
|
|
405
428
|
|
|
406
429
|
// colorSchemesWeiss3: LampeWeissAlexaScheme
|
|
407
430
|
if (colorSchemesWeiss3 != null) {
|
|
408
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss3_aktiv, true);
|
|
409
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss3_name, colorSchemesWeiss3.getAlexaName());
|
|
410
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_level, colorSchemesWeiss3.getLevel());
|
|
411
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_ct, colorSchemesWeiss3.getCt());
|
|
431
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss3_aktiv, true, category);
|
|
432
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss3_name, colorSchemesWeiss3.getAlexaName(), category);
|
|
433
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_level, colorSchemesWeiss3.getLevel(), category);
|
|
434
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_ct, colorSchemesWeiss3.getCt(), category);
|
|
412
435
|
} else {
|
|
413
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss3_aktiv, false);
|
|
414
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss3_name, null);
|
|
415
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_level, null);
|
|
416
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_ct, null);
|
|
436
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss3_aktiv, false, category);
|
|
437
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss3_name, null, category);
|
|
438
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_level, null, category);
|
|
439
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_ct, null, category);
|
|
417
440
|
}
|
|
418
441
|
|
|
419
442
|
// colorSchemesWeiss4: LampeWeissAlexaScheme
|
|
420
443
|
if (colorSchemesWeiss4 != null) {
|
|
421
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss4_aktiv, true);
|
|
422
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss4_name, colorSchemesWeiss4.getAlexaName());
|
|
423
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_level, colorSchemesWeiss4.getLevel());
|
|
424
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_ct, colorSchemesWeiss4.getCt());
|
|
444
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss4_aktiv, true, category);
|
|
445
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss4_name, colorSchemesWeiss4.getAlexaName(), category);
|
|
446
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_level, colorSchemesWeiss4.getLevel(), category);
|
|
447
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_ct, colorSchemesWeiss4.getCt(), category);
|
|
425
448
|
} else {
|
|
426
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss4_aktiv, false);
|
|
427
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss4_name, null);
|
|
428
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_level, null);
|
|
429
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_ct, null);
|
|
449
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss4_aktiv, false, category);
|
|
450
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss4_name, null, category);
|
|
451
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_level, null, category);
|
|
452
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_ct, null, category);
|
|
430
453
|
}
|
|
431
454
|
}
|
|
432
455
|
|
|
@@ -436,13 +459,13 @@ export function createLampeRGB(adapter:any, rawId: number, baseState: string, et
|
|
|
436
459
|
colorSchemesFarbe1: InstanceType<typeof RGBColorScheme>, colorSchemesFarbe2: InstanceType<typeof RGBColorScheme>, colorSchemesFarbe3: InstanceType<typeof RGBColorScheme>, colorSchemesFarbe4: InstanceType<typeof RGBColorScheme>,
|
|
437
460
|
colorSchemesWeiss1: InstanceType<typeof WhiteColorScheme>, colorSchemesWeiss2: InstanceType<typeof WhiteColorScheme>, colorSchemesWeiss3: InstanceType<typeof WhiteColorScheme>, colorSchemesWeiss4: InstanceType<typeof WhiteColorScheme>,
|
|
438
461
|
tasterBooleanOn: string[], tasterBooleanOff: string[],nachtbeleuchtung:boolean, turnOffExitHouseSummer:boolean, turnOffExitHouseWinter:boolean,
|
|
439
|
-
turnOnEnterHouseSummer:boolean, turnOnEnterHouseWinter:boolean) {
|
|
462
|
+
turnOnEnterHouseSummer:boolean, turnOnEnterHouseWinter:boolean, category: string) {
|
|
440
463
|
|
|
441
464
|
// Allgemein:
|
|
442
465
|
createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, deviceZigbeeLampeRGB);
|
|
443
466
|
|
|
444
467
|
// Lampe-RGB spezifisch:
|
|
445
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_Group, isGroup);
|
|
468
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_Group, isGroup, category);
|
|
446
469
|
|
|
447
470
|
// groupMembers:string[]
|
|
448
471
|
var db_groupMembers = null;
|
|
@@ -455,7 +478,7 @@ export function createLampeRGB(adapter:any, rawId: number, baseState: string, et
|
|
|
455
478
|
db_groupMembers += "|" + value;
|
|
456
479
|
}
|
|
457
480
|
});
|
|
458
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_Groupmembers, db_groupMembers);
|
|
481
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_Groupmembers, db_groupMembers, category);
|
|
459
482
|
|
|
460
483
|
// alexaSmartNamesForOn:string[]
|
|
461
484
|
var db_alexaSmartNamesForOn = null;
|
|
@@ -468,7 +491,7 @@ export function createLampeRGB(adapter:any, rawId: number, baseState: string, et
|
|
|
468
491
|
db_alexaSmartNamesForOn += "|" + value;
|
|
469
492
|
}
|
|
470
493
|
});
|
|
471
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn);
|
|
494
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn, category);
|
|
472
495
|
|
|
473
496
|
// alexaActionNamesForOn:string[]
|
|
474
497
|
var db_alexaActionNamesForOn = null;
|
|
@@ -481,7 +504,7 @@ export function createLampeRGB(adapter:any, rawId: number, baseState: string, et
|
|
|
481
504
|
db_alexaActionNamesForOn += "|" + value;
|
|
482
505
|
}
|
|
483
506
|
});
|
|
484
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn);
|
|
507
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn, category);
|
|
485
508
|
|
|
486
509
|
// alexaSmartNamesForOff:string[]
|
|
487
510
|
var db_alexaSmartNamesForOff = null;
|
|
@@ -494,7 +517,7 @@ export function createLampeRGB(adapter:any, rawId: number, baseState: string, et
|
|
|
494
517
|
db_alexaSmartNamesForOff += "|" + value;
|
|
495
518
|
}
|
|
496
519
|
});
|
|
497
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff);
|
|
520
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff, category);
|
|
498
521
|
|
|
499
522
|
// alexaActionNamesForOff:string[]
|
|
500
523
|
var db_alexaActionNamesForOff = null;
|
|
@@ -507,7 +530,7 @@ export function createLampeRGB(adapter:any, rawId: number, baseState: string, et
|
|
|
507
530
|
db_alexaActionNamesForOff += "|" + value;
|
|
508
531
|
}
|
|
509
532
|
});
|
|
510
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff);
|
|
533
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff, category);
|
|
511
534
|
|
|
512
535
|
// tasterBooleanOn: string[]
|
|
513
536
|
var db_tasterBooleanOn = null;
|
|
@@ -520,7 +543,7 @@ export function createLampeRGB(adapter:any, rawId: number, baseState: string, et
|
|
|
520
543
|
db_tasterBooleanOn += "|" + value;
|
|
521
544
|
}
|
|
522
545
|
});
|
|
523
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOn, db_tasterBooleanOn);
|
|
546
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOn, db_tasterBooleanOn, category);
|
|
524
547
|
|
|
525
548
|
// tasterBooleanOff: string[]
|
|
526
549
|
var db_tasterBooleanOff = null;
|
|
@@ -533,154 +556,154 @@ export function createLampeRGB(adapter:any, rawId: number, baseState: string, et
|
|
|
533
556
|
db_tasterBooleanOff += "|" + value;
|
|
534
557
|
}
|
|
535
558
|
});
|
|
536
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_tasterBooleanOff);
|
|
559
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_tasterBooleanOff, category);
|
|
537
560
|
|
|
538
561
|
// Weitere:
|
|
539
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_Nachtbeleuchtung, nachtbeleuchtung);
|
|
540
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseSummer, turnOffExitHouseSummer);
|
|
541
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseWinter, turnOffExitHouseWinter);
|
|
542
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseSummer, turnOnEnterHouseSummer);
|
|
543
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseWinter, turnOnEnterHouseWinter);
|
|
562
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_Nachtbeleuchtung, nachtbeleuchtung, category);
|
|
563
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseSummer, turnOffExitHouseSummer, category);
|
|
564
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseWinter, turnOffExitHouseWinter, category);
|
|
565
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseSummer, turnOnEnterHouseSummer, category);
|
|
566
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseWinter, turnOnEnterHouseWinter, category);
|
|
544
567
|
|
|
545
568
|
// alexaColorSchemeForOnFarbe: RGBColorScheme
|
|
546
569
|
if (alexaColorSchemeForOnFarbe != null) {
|
|
547
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_aktiv, true);
|
|
548
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_level, alexaColorSchemeForOnFarbe.getLevel());
|
|
549
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_hue, alexaColorSchemeForOnFarbe.getHue());
|
|
550
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_sat, alexaColorSchemeForOnFarbe.getSat());
|
|
570
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_aktiv, true, category);
|
|
571
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_level, alexaColorSchemeForOnFarbe.getLevel(), category);
|
|
572
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_hue, alexaColorSchemeForOnFarbe.getHue(), category);
|
|
573
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_sat, alexaColorSchemeForOnFarbe.getSat(), category);
|
|
551
574
|
} else {
|
|
552
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_aktiv, false);
|
|
553
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_level, null);
|
|
554
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_hue, null);
|
|
555
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_sat, null);
|
|
575
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_aktiv, false, category);
|
|
576
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_level, null, category);
|
|
577
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_hue, null, category);
|
|
578
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_sat, null, category);
|
|
556
579
|
}
|
|
557
580
|
|
|
558
581
|
// alexaColorSchemeForOnWeiss: WhiteColorScheme
|
|
559
582
|
if (alexaColorSchemeForOnWeiss != null) {
|
|
560
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_aktiv, true);
|
|
561
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_level, alexaColorSchemeForOnWeiss.getLevel());
|
|
562
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_ct, alexaColorSchemeForOnWeiss.getCt());
|
|
583
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_aktiv, true, category);
|
|
584
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_level, alexaColorSchemeForOnWeiss.getLevel(), category);
|
|
585
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_ct, alexaColorSchemeForOnWeiss.getCt(), category);
|
|
563
586
|
} else {
|
|
564
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_aktiv, false);
|
|
565
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_level, null);
|
|
566
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_ct, null);
|
|
587
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_aktiv, false, category);
|
|
588
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_level, null, category);
|
|
589
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_ct, null, category);
|
|
567
590
|
}
|
|
568
591
|
|
|
569
592
|
// colorSchemesFarbe1: RGBColorScheme
|
|
570
593
|
if (colorSchemesFarbe1 != null) {
|
|
571
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe1_aktiv, true);
|
|
572
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe1_name, colorSchemesFarbe1.getAlexaName());
|
|
573
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_level, colorSchemesFarbe1.getLevel());
|
|
574
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_hue, colorSchemesFarbe1.getHue());
|
|
575
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_sat, colorSchemesFarbe1.getSat());
|
|
594
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe1_aktiv, true, category);
|
|
595
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe1_name, colorSchemesFarbe1.getAlexaName(), category);
|
|
596
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_level, colorSchemesFarbe1.getLevel(), category);
|
|
597
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_hue, colorSchemesFarbe1.getHue(), category);
|
|
598
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_sat, colorSchemesFarbe1.getSat(), category);
|
|
576
599
|
} else {
|
|
577
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe1_aktiv, false);
|
|
578
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe1_name, null);
|
|
579
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_level, null);
|
|
580
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_hue, null);
|
|
581
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_sat, null);
|
|
600
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe1_aktiv, false, category);
|
|
601
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe1_name, null, category);
|
|
602
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_level, null, category);
|
|
603
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_hue, null, category);
|
|
604
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_sat, null, category);
|
|
582
605
|
}
|
|
583
606
|
|
|
584
607
|
// colorSchemesFarbe2: RGBColorScheme
|
|
585
608
|
if (colorSchemesFarbe2 != null) {
|
|
586
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe2_aktiv, true);
|
|
587
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe2_name, colorSchemesFarbe2.getAlexaName());
|
|
588
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_level, colorSchemesFarbe2.getLevel());
|
|
589
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_hue, colorSchemesFarbe2.getHue());
|
|
590
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_sat, colorSchemesFarbe2.getSat());
|
|
609
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe2_aktiv, true, category);
|
|
610
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe2_name, colorSchemesFarbe2.getAlexaName(), category);
|
|
611
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_level, colorSchemesFarbe2.getLevel(), category);
|
|
612
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_hue, colorSchemesFarbe2.getHue(), category);
|
|
613
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_sat, colorSchemesFarbe2.getSat(), category);
|
|
591
614
|
} else {
|
|
592
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe2_aktiv, false);
|
|
593
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe2_name, null);
|
|
594
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_level, null);
|
|
595
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_hue, null);
|
|
596
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_sat, null);
|
|
615
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe2_aktiv, false, category);
|
|
616
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe2_name, null, category);
|
|
617
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_level, null, category);
|
|
618
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_hue, null, category);
|
|
619
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_sat, null, category);
|
|
597
620
|
}
|
|
598
621
|
|
|
599
622
|
// colorSchemesFarbe3: RGBColorScheme
|
|
600
623
|
if (colorSchemesFarbe3 != null) {
|
|
601
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe3_aktiv, true);
|
|
602
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe3_name, colorSchemesFarbe3.getAlexaName());
|
|
603
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_level, colorSchemesFarbe3.getLevel());
|
|
604
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_hue, colorSchemesFarbe3.getHue());
|
|
605
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_sat, colorSchemesFarbe3.getSat());
|
|
624
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe3_aktiv, true, category);
|
|
625
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe3_name, colorSchemesFarbe3.getAlexaName(), category);
|
|
626
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_level, colorSchemesFarbe3.getLevel(), category);
|
|
627
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_hue, colorSchemesFarbe3.getHue(), category);
|
|
628
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_sat, colorSchemesFarbe3.getSat(), category);
|
|
606
629
|
} else {
|
|
607
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe3_aktiv, false);
|
|
608
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe3_name, null);
|
|
609
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_level, null);
|
|
610
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_hue, null);
|
|
611
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_sat, null);
|
|
630
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe3_aktiv, false, category);
|
|
631
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe3_name, null, category);
|
|
632
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_level, null, category);
|
|
633
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_hue, null, category);
|
|
634
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_sat, null, category);
|
|
612
635
|
}
|
|
613
636
|
|
|
614
637
|
// colorSchemesFarbe4: RGBColorScheme
|
|
615
638
|
if (colorSchemesFarbe4 != null) {
|
|
616
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe4_aktiv, true);
|
|
617
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe4_name, colorSchemesFarbe4.getAlexaName());
|
|
618
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_level, colorSchemesFarbe4.getLevel());
|
|
619
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_hue, colorSchemesFarbe4.getHue());
|
|
620
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_sat, colorSchemesFarbe4.getSat());
|
|
639
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe4_aktiv, true, category);
|
|
640
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe4_name, colorSchemesFarbe4.getAlexaName(), category);
|
|
641
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_level, colorSchemesFarbe4.getLevel(), category);
|
|
642
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_hue, colorSchemesFarbe4.getHue(), category);
|
|
643
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_sat, colorSchemesFarbe4.getSat(), category);
|
|
621
644
|
} else {
|
|
622
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe4_aktiv, false);
|
|
623
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe4_name, null);
|
|
624
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_level, null);
|
|
625
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_hue, null);
|
|
626
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_sat, null);
|
|
645
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe4_aktiv, false, category);
|
|
646
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe4_name, null, category);
|
|
647
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_level, null, category);
|
|
648
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_hue, null, category);
|
|
649
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_sat, null, category);
|
|
627
650
|
}
|
|
628
651
|
|
|
629
652
|
// colorSchemesWeiss1: WhiteColorScheme
|
|
630
653
|
if (colorSchemesWeiss1 != null) {
|
|
631
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss1_aktiv, true);
|
|
632
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss1_name, colorSchemesWeiss1.getAlexaName());
|
|
633
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss1_level, colorSchemesWeiss1.getLevel());
|
|
634
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss1_ct, colorSchemesWeiss1.getCt());
|
|
654
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss1_aktiv, true, category);
|
|
655
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss1_name, colorSchemesWeiss1.getAlexaName(), category);
|
|
656
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss1_level, colorSchemesWeiss1.getLevel(), category);
|
|
657
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss1_ct, colorSchemesWeiss1.getCt(), category);
|
|
635
658
|
} else {
|
|
636
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss1_aktiv, false);
|
|
637
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss1_name, null);
|
|
638
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss1_level, null);
|
|
639
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss1_ct, null);
|
|
659
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss1_aktiv, false, category);
|
|
660
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss1_name, null, category);
|
|
661
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss1_level, null, category);
|
|
662
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss1_ct, null, category);
|
|
640
663
|
}
|
|
641
664
|
|
|
642
665
|
// colorSchemesWeiss2: WhiteColorScheme
|
|
643
666
|
if (colorSchemesWeiss2 != null) {
|
|
644
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss2_aktiv, true);
|
|
645
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss2_name, colorSchemesWeiss2.getAlexaName());
|
|
646
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss2_level, colorSchemesWeiss2.getLevel());
|
|
647
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss2_ct, colorSchemesWeiss2.getCt());
|
|
667
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss2_aktiv, true, category);
|
|
668
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss2_name, colorSchemesWeiss2.getAlexaName(), category);
|
|
669
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss2_level, colorSchemesWeiss2.getLevel(), category);
|
|
670
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss2_ct, colorSchemesWeiss2.getCt(), category);
|
|
648
671
|
} else {
|
|
649
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss2_aktiv, false);
|
|
650
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss2_name, null);
|
|
651
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss2_level, null);
|
|
652
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss2_ct, null);
|
|
672
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss2_aktiv, false, category);
|
|
673
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss2_name, null, category);
|
|
674
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss2_level, null, category);
|
|
675
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss2_ct, null, category);
|
|
653
676
|
}
|
|
654
677
|
|
|
655
678
|
// colorSchemesWeiss3: WhiteColorScheme
|
|
656
679
|
if (colorSchemesWeiss3 != null) {
|
|
657
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss3_aktiv, true);
|
|
658
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss3_name, colorSchemesWeiss3.getAlexaName());
|
|
659
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss3_level, colorSchemesWeiss3.getLevel());
|
|
660
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss3_ct, colorSchemesWeiss3.getCt());
|
|
680
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss3_aktiv, true, category);
|
|
681
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss3_name, colorSchemesWeiss3.getAlexaName(), category);
|
|
682
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss3_level, colorSchemesWeiss3.getLevel(), category);
|
|
683
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss3_ct, colorSchemesWeiss3.getCt(), category);
|
|
661
684
|
} else {
|
|
662
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss3_aktiv, false);
|
|
663
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss3_name, null);
|
|
664
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss3_level, null);
|
|
665
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss3_ct, null);
|
|
685
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss3_aktiv, false, category);
|
|
686
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss3_name, null, category);
|
|
687
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss3_level, null, category);
|
|
688
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss3_ct, null, category);
|
|
666
689
|
}
|
|
667
690
|
|
|
668
691
|
// colorSchemesWeiss4: WhiteColorScheme
|
|
669
692
|
if (colorSchemesWeiss4 != null) {
|
|
670
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss4_aktiv, true);
|
|
671
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss4_name, colorSchemesWeiss4.getAlexaName());
|
|
672
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss4_level, colorSchemesWeiss4.getLevel());
|
|
673
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss4_ct, colorSchemesWeiss4.getCt());
|
|
693
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss4_aktiv, true, category);
|
|
694
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss4_name, colorSchemesWeiss4.getAlexaName(), category);
|
|
695
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss4_level, colorSchemesWeiss4.getLevel(), category);
|
|
696
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss4_ct, colorSchemesWeiss4.getCt(), category);
|
|
674
697
|
} else {
|
|
675
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss4_aktiv, false);
|
|
676
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss4_name, null);
|
|
677
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss4_level, null);
|
|
678
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss4_ct, null);
|
|
698
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss4_aktiv, false, category);
|
|
699
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss4_name, null, category);
|
|
700
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss4_level, null, category);
|
|
701
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss4_ct, null, category);
|
|
679
702
|
}
|
|
680
703
|
}
|
|
681
704
|
|
|
682
|
-
function createDatenpunktSingle(adapter:any, deviceRawId, attributeType, attributeName, attributeValue) {
|
|
683
|
-
var stateDatenpunkt = "0_userdata.0.devices.zigbee." + deviceRawId + "." + attributeName;
|
|
705
|
+
function createDatenpunktSingle(adapter:any, deviceRawId, attributeType, attributeName, attributeValue, category:string) {
|
|
706
|
+
var stateDatenpunkt = "0_userdata.0.devices.zigbee." + category + "." + deviceRawId + "." + attributeName;
|
|
684
707
|
adapter.createState(stateDatenpunkt, null, {
|
|
685
708
|
name: stateDatenpunkt,
|
|
686
709
|
desc: stateDatenpunkt,
|
|
@@ -694,7 +717,7 @@ function createDatenpunktSingle(adapter:any, deviceRawId, attributeType, attribu
|
|
|
694
717
|
export function getZigbeeDevices(adapter: any, filterCategory: string) {
|
|
695
718
|
var zigbeeArray = [];
|
|
696
719
|
|
|
697
|
-
adapter.$('state[id=0_userdata.0.devices.zigbee
|
|
720
|
+
adapter.$('state[id=0_userdata.0.devices.zigbee.*.*.category]').each(datenpunktKey => { // 0_userdata.0.devices.zigbee.30.type
|
|
698
721
|
var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
|
|
699
722
|
if (adapter.getState(datenpunktKey).val == filterCategory) {
|
|
700
723
|
//constructor(adapter:any, id: number, baseState: string, etage: string, raum: string,
|
|
@@ -999,7 +1022,8 @@ export function getZigbeeDevices(adapter: any, filterCategory: string) {
|
|
|
999
1022
|
adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
|
|
1000
1023
|
adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
|
|
1001
1024
|
adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
|
|
1002
|
-
adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
|
|
1025
|
+
adapter.getState(datenpunktPraefix + "." + attributeDevice).val, // [4] Device (z.B. Stehlampe)
|
|
1026
|
+
adapter.getState(datenpunktPraefix + "." + attributeDosenrelais_smartNames).val.split('|'), // 14 TasterBoolOff
|
|
1003
1027
|
));
|
|
1004
1028
|
} else if (filterCategory == deviceZigbeeSchalter) {
|
|
1005
1029
|
// @ts-ignore
|
|
@@ -1082,4 +1106,4 @@ export function getZigbeeDevicesAll(adapter: any) {
|
|
|
1082
1106
|
return zigbeeArray;
|
|
1083
1107
|
}
|
|
1084
1108
|
|
|
1085
|
-
module.exports = { createZigbeeDevice, createLampeWeiss, createSteckdose, getZigbeeDevices, getZigbeeDevicesAll };
|
|
1109
|
+
module.exports = { createZigbeeDevice, createDosenrelaisDevice, createLampeWeiss, createSteckdose, getZigbeeDevices, getZigbeeDevicesAll };
|