iobroker-ucl 1.0.69 → 1.0.71
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/package.json +1 -1
- package/zigbeeFunctions.js +119 -109
- package/zigbeeFunctions.ts +120 -109
package/package.json
CHANGED
package/zigbeeFunctions.js
CHANGED
@@ -141,7 +141,7 @@ function createDosenrelaisDevice(adapter, rawId, baseState, etage, raum, device,
|
|
141
141
|
}
|
142
142
|
exports.createDosenrelaisDevice = createDosenrelaisDevice;
|
143
143
|
// Steckdose:
|
144
|
-
function createSteckdose(adapter, rawId, baseState, etage, raum, device, alexaSmartNamesForOn, alexaActionNamesForOn, alexaSmartNamesForOff, alexaActionNamesForOff, additionalStates4TurnOn, additionalStates4TurnOff
|
144
|
+
function createSteckdose(adapter, rawId, baseState, etage, raum, device, alexaSmartNamesForOn, alexaActionNamesForOn, alexaSmartNamesForOff, alexaActionNamesForOff, additionalStates4TurnOn, additionalStates4TurnOff) {
|
145
145
|
// Allgemein:
|
146
146
|
createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, deviceZigbeeSteckdose);
|
147
147
|
// alexaSmartNamesForOn:string[]
|
@@ -156,7 +156,7 @@ function createSteckdose(adapter, rawId, baseState, etage, raum, device, alexaSm
|
|
156
156
|
db_alexaSmartNamesForOn += "|" + value;
|
157
157
|
}
|
158
158
|
});
|
159
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn,
|
159
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn, deviceZigbeeSteckdose);
|
160
160
|
// alexaActionNamesForOn:string[]
|
161
161
|
var db_alexaActionNamesForOn = null;
|
162
162
|
alexaActionNamesForOn.forEach(function (value) {
|
@@ -169,7 +169,7 @@ function createSteckdose(adapter, rawId, baseState, etage, raum, device, alexaSm
|
|
169
169
|
db_alexaActionNamesForOn += "|" + value;
|
170
170
|
}
|
171
171
|
});
|
172
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn,
|
172
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn, deviceZigbeeSteckdose);
|
173
173
|
// alexaSmartNamesForOff:string[]
|
174
174
|
var db_alexaSmartNamesForOff = null;
|
175
175
|
alexaSmartNamesForOff.forEach(function (value) {
|
@@ -182,7 +182,7 @@ function createSteckdose(adapter, rawId, baseState, etage, raum, device, alexaSm
|
|
182
182
|
db_alexaSmartNamesForOff += "|" + value;
|
183
183
|
}
|
184
184
|
});
|
185
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff,
|
185
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff, deviceZigbeeSteckdose);
|
186
186
|
// alexaActionNamesForOff:string[]
|
187
187
|
var db_alexaActionNamesForOff = null;
|
188
188
|
alexaActionNamesForOff.forEach(function (value) {
|
@@ -195,7 +195,7 @@ function createSteckdose(adapter, rawId, baseState, etage, raum, device, alexaSm
|
|
195
195
|
db_alexaActionNamesForOff += "|" + value;
|
196
196
|
}
|
197
197
|
});
|
198
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff,
|
198
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff, deviceZigbeeSteckdose);
|
199
199
|
// additionalStates4TurnOn: string[]
|
200
200
|
var db_additionalStates4TurnOn = null;
|
201
201
|
additionalStates4TurnOn.forEach(function (value) {
|
@@ -208,7 +208,7 @@ function createSteckdose(adapter, rawId, baseState, etage, raum, device, alexaSm
|
|
208
208
|
db_additionalStates4TurnOn += "|" + value;
|
209
209
|
}
|
210
210
|
});
|
211
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOn, db_additionalStates4TurnOn,
|
211
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOn, db_additionalStates4TurnOn, deviceZigbeeSteckdose);
|
212
212
|
// additionalStates4TurnOff: string[]
|
213
213
|
var db_additionalStates4TurnOff = null;
|
214
214
|
additionalStates4TurnOff.forEach(function (value) {
|
@@ -221,11 +221,11 @@ function createSteckdose(adapter, rawId, baseState, etage, raum, device, alexaSm
|
|
221
221
|
db_additionalStates4TurnOff += "|" + value;
|
222
222
|
}
|
223
223
|
});
|
224
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_additionalStates4TurnOff,
|
224
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_additionalStates4TurnOff, deviceZigbeeSteckdose);
|
225
225
|
}
|
226
226
|
exports.createSteckdose = createSteckdose;
|
227
227
|
// LampeWeiss:
|
228
|
-
function createLampeWeiss(adapter, rawId, baseState, etage, raum, device, alexaSmartNamesForOn, alexaActionNamesForOn, alexaLevelSchemeForOn, alexaSmartNamesForOff, alexaActionNamesForOff, colorSchemesWeiss1, colorSchemesWeiss2, colorSchemesWeiss3, colorSchemesWeiss4, isGroup, tasterBooleanOn1, tasterBooleanOn2, tasterBooleanOn3, tasterBooleanOn4, tasterBooleanOff, nachtbeleuchtung, turnOffExitHouseSummer, turnOffExitHouseWinter, turnOnEnterHouseSummer, turnOnEnterHouseWinter
|
228
|
+
function createLampeWeiss(adapter, rawId, baseState, etage, raum, device, alexaSmartNamesForOn, alexaActionNamesForOn, alexaLevelSchemeForOn, alexaSmartNamesForOff, alexaActionNamesForOff, colorSchemesWeiss1, colorSchemesWeiss2, colorSchemesWeiss3, colorSchemesWeiss4, isGroup, tasterBooleanOn1, tasterBooleanOn2, tasterBooleanOn3, tasterBooleanOn4, tasterBooleanOff, nachtbeleuchtung, turnOffExitHouseSummer, turnOffExitHouseWinter, turnOnEnterHouseSummer, turnOnEnterHouseWinter) {
|
229
229
|
// Allgemein:
|
230
230
|
createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, deviceZigbeeLampeWeiss);
|
231
231
|
// alexaSmartNamesForOn:string[]
|
@@ -240,7 +240,7 @@ function createLampeWeiss(adapter, rawId, baseState, etage, raum, device, alexaS
|
|
240
240
|
db_alexaSmartNamesForOn += "|" + value;
|
241
241
|
}
|
242
242
|
});
|
243
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn,
|
243
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn, deviceZigbeeLampeWeiss);
|
244
244
|
// alexaActionNamesForOn:string[]
|
245
245
|
var db_alexaActionNamesForOn = null;
|
246
246
|
alexaActionNamesForOn.forEach(function (value) {
|
@@ -253,7 +253,7 @@ function createLampeWeiss(adapter, rawId, baseState, etage, raum, device, alexaS
|
|
253
253
|
db_alexaActionNamesForOn += "|" + value;
|
254
254
|
}
|
255
255
|
});
|
256
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn,
|
256
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn, deviceZigbeeLampeWeiss);
|
257
257
|
// alexaSmartNamesForOff:string[]
|
258
258
|
var db_alexaSmartNamesForOff = null;
|
259
259
|
alexaSmartNamesForOff.forEach(function (value) {
|
@@ -266,7 +266,7 @@ function createLampeWeiss(adapter, rawId, baseState, etage, raum, device, alexaS
|
|
266
266
|
db_alexaSmartNamesForOff += "|" + value;
|
267
267
|
}
|
268
268
|
});
|
269
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff,
|
269
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff, deviceZigbeeLampeWeiss);
|
270
270
|
// alexaActionNamesForOff:string[]
|
271
271
|
var db_alexaActionNamesForOff = null;
|
272
272
|
alexaActionNamesForOff.forEach(function (value) {
|
@@ -279,58 +279,58 @@ function createLampeWeiss(adapter, rawId, baseState, etage, raum, device, alexaS
|
|
279
279
|
db_alexaActionNamesForOff += "|" + value;
|
280
280
|
}
|
281
281
|
});
|
282
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff,
|
282
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff, deviceZigbeeLampeWeiss);
|
283
283
|
// tasterBooleanOn1 : LampeWeissTasterScheme
|
284
284
|
if (tasterBooleanOn1 != null) {
|
285
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn1_aktiv, true,
|
286
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn1_name, tasterBooleanOn1.getTasterBooleanOnName(),
|
287
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_level, tasterBooleanOn1.getLevel(),
|
288
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_ct, tasterBooleanOn1.getCt(),
|
285
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn1_aktiv, true, deviceZigbeeLampeWeiss);
|
286
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn1_name, tasterBooleanOn1.getTasterBooleanOnName(), deviceZigbeeLampeWeiss);
|
287
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_level, tasterBooleanOn1.getLevel(), deviceZigbeeLampeWeiss);
|
288
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_ct, tasterBooleanOn1.getCt(), deviceZigbeeLampeWeiss);
|
289
289
|
}
|
290
290
|
else {
|
291
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn1_aktiv, false,
|
292
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn1_name, null,
|
293
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_level, null,
|
294
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_ct, null,
|
291
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn1_aktiv, false, deviceZigbeeLampeWeiss);
|
292
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn1_name, null, deviceZigbeeLampeWeiss);
|
293
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_level, null, deviceZigbeeLampeWeiss);
|
294
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_ct, null, deviceZigbeeLampeWeiss);
|
295
295
|
}
|
296
296
|
// tasterBooleanOn2 : LampeWeissTasterScheme
|
297
297
|
if (tasterBooleanOn2 != null) {
|
298
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn2_aktiv, true,
|
299
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn2_name, tasterBooleanOn2.getTasterBooleanOnName(),
|
300
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_level, tasterBooleanOn2.getLevel(),
|
301
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_ct, tasterBooleanOn2.getCt(),
|
298
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn2_aktiv, true, deviceZigbeeLampeWeiss);
|
299
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn2_name, tasterBooleanOn2.getTasterBooleanOnName(), deviceZigbeeLampeWeiss);
|
300
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_level, tasterBooleanOn2.getLevel(), deviceZigbeeLampeWeiss);
|
301
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_ct, tasterBooleanOn2.getCt(), deviceZigbeeLampeWeiss);
|
302
302
|
}
|
303
303
|
else {
|
304
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn2_aktiv, false,
|
305
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn2_name, null,
|
306
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_level, null,
|
307
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_ct, null,
|
304
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn2_aktiv, false, deviceZigbeeLampeWeiss);
|
305
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn2_name, null, deviceZigbeeLampeWeiss);
|
306
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_level, null, deviceZigbeeLampeWeiss);
|
307
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_ct, null, deviceZigbeeLampeWeiss);
|
308
308
|
}
|
309
309
|
// tasterBooleanOn3 : LampeWeissTasterScheme
|
310
310
|
if (tasterBooleanOn3 != null) {
|
311
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn3_aktiv, true,
|
312
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn3_name, tasterBooleanOn3.getTasterBooleanOnName(),
|
313
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_level, tasterBooleanOn3.getLevel(),
|
314
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_ct, tasterBooleanOn3.getCt(),
|
311
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn3_aktiv, true, deviceZigbeeLampeWeiss);
|
312
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn3_name, tasterBooleanOn3.getTasterBooleanOnName(), deviceZigbeeLampeWeiss);
|
313
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_level, tasterBooleanOn3.getLevel(), deviceZigbeeLampeWeiss);
|
314
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_ct, tasterBooleanOn3.getCt(), deviceZigbeeLampeWeiss);
|
315
315
|
}
|
316
316
|
else {
|
317
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn3_aktiv, false,
|
318
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn3_name, null,
|
319
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_level, null,
|
320
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_ct, null,
|
317
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn3_aktiv, false, deviceZigbeeLampeWeiss);
|
318
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn3_name, null, deviceZigbeeLampeWeiss);
|
319
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_level, null, deviceZigbeeLampeWeiss);
|
320
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_ct, null, deviceZigbeeLampeWeiss);
|
321
321
|
}
|
322
322
|
// tasterBooleanOn4 : LampeWeissTasterScheme
|
323
323
|
if (tasterBooleanOn4 != null) {
|
324
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn4_aktiv, true,
|
325
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn4_name, tasterBooleanOn4.getTasterBooleanOnName(),
|
326
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_level, tasterBooleanOn4.getLevel(),
|
327
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_ct, tasterBooleanOn4.getCt(),
|
324
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn4_aktiv, true, deviceZigbeeLampeWeiss);
|
325
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn4_name, tasterBooleanOn4.getTasterBooleanOnName(), deviceZigbeeLampeWeiss);
|
326
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_level, tasterBooleanOn4.getLevel(), deviceZigbeeLampeWeiss);
|
327
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_ct, tasterBooleanOn4.getCt(), deviceZigbeeLampeWeiss);
|
328
328
|
}
|
329
329
|
else {
|
330
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn4_aktiv, false,
|
331
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn4_name, null,
|
332
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_level, null,
|
333
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_ct, null,
|
330
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn4_aktiv, false, deviceZigbeeLampeWeiss);
|
331
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn4_name, null, deviceZigbeeLampeWeiss);
|
332
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_level, null, deviceZigbeeLampeWeiss);
|
333
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_ct, null, deviceZigbeeLampeWeiss);
|
334
334
|
}
|
335
335
|
// tasterBooleanOff: string[]
|
336
336
|
var db_tasterBooleanOff = null;
|
@@ -344,82 +344,83 @@ function createLampeWeiss(adapter, rawId, baseState, etage, raum, device, alexaS
|
|
344
344
|
db_tasterBooleanOff += "|" + value;
|
345
345
|
}
|
346
346
|
});
|
347
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_tasterBooleanOff,
|
347
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_tasterBooleanOff, deviceZigbeeLampeWeiss);
|
348
348
|
// Weitere:
|
349
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_Nachtbeleuchtung, nachtbeleuchtung,
|
350
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseSummer, turnOffExitHouseSummer,
|
351
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseWinter, turnOffExitHouseWinter,
|
352
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseSummer, turnOnEnterHouseSummer,
|
353
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseWinter, turnOnEnterHouseWinter,
|
349
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_Nachtbeleuchtung, nachtbeleuchtung, deviceZigbeeLampeWeiss);
|
350
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseSummer, turnOffExitHouseSummer, deviceZigbeeLampeWeiss);
|
351
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseWinter, turnOffExitHouseWinter, deviceZigbeeLampeWeiss);
|
352
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseSummer, turnOnEnterHouseSummer, deviceZigbeeLampeWeiss);
|
353
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseWinter, turnOnEnterHouseWinter, deviceZigbeeLampeWeiss);
|
354
354
|
// Gruppe:
|
355
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampeWeissGroup, isGroup,
|
355
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampeWeissGroup, isGroup, deviceZigbeeLampeWeiss);
|
356
356
|
// alexaLevelSchemeForOn: LampeWeissColorScheme
|
357
357
|
if (alexaLevelSchemeForOn != null) {
|
358
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv, true,
|
359
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level, alexaLevelSchemeForOn.getLevel(),
|
360
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct, alexaLevelSchemeForOn.getCt(),
|
358
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv, true, deviceZigbeeLampeWeiss);
|
359
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level, alexaLevelSchemeForOn.getLevel(), deviceZigbeeLampeWeiss);
|
360
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct, alexaLevelSchemeForOn.getCt(), deviceZigbeeLampeWeiss);
|
361
361
|
}
|
362
362
|
else {
|
363
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv, false,
|
364
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level, null,
|
365
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct, null,
|
363
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv, false, deviceZigbeeLampeWeiss);
|
364
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level, null, deviceZigbeeLampeWeiss);
|
365
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct, null, deviceZigbeeLampeWeiss);
|
366
366
|
}
|
367
367
|
// colorSchemesWeiss1: LampeWeissAlexaScheme
|
368
368
|
if (colorSchemesWeiss1 != null) {
|
369
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss1_aktiv, true,
|
370
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss1_name, colorSchemesWeiss1.getAlexaName(),
|
371
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_level, colorSchemesWeiss1.getLevel(),
|
372
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_ct, colorSchemesWeiss1.getCt(),
|
369
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss1_aktiv, true, deviceZigbeeLampeWeiss);
|
370
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss1_name, colorSchemesWeiss1.getAlexaName(), deviceZigbeeLampeWeiss);
|
371
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_level, colorSchemesWeiss1.getLevel(), deviceZigbeeLampeWeiss);
|
372
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_ct, colorSchemesWeiss1.getCt(), deviceZigbeeLampeWeiss);
|
373
373
|
}
|
374
374
|
else {
|
375
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss1_aktiv, false,
|
376
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss1_name, null,
|
377
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_level, null,
|
378
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_ct, null,
|
375
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss1_aktiv, false, deviceZigbeeLampeWeiss);
|
376
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss1_name, null, deviceZigbeeLampeWeiss);
|
377
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_level, null, deviceZigbeeLampeWeiss);
|
378
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_ct, null, deviceZigbeeLampeWeiss);
|
379
379
|
}
|
380
380
|
// colorSchemesWeiss2: LampeWeissAlexaScheme
|
381
381
|
if (colorSchemesWeiss2 != null) {
|
382
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss2_aktiv, true,
|
383
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss2_name, colorSchemesWeiss2.getAlexaName(),
|
384
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_level, colorSchemesWeiss2.getLevel(),
|
385
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_ct, colorSchemesWeiss2.getCt(),
|
382
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss2_aktiv, true, deviceZigbeeLampeWeiss);
|
383
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss2_name, colorSchemesWeiss2.getAlexaName(), deviceZigbeeLampeWeiss);
|
384
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_level, colorSchemesWeiss2.getLevel(), deviceZigbeeLampeWeiss);
|
385
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_ct, colorSchemesWeiss2.getCt(), deviceZigbeeLampeWeiss);
|
386
386
|
}
|
387
387
|
else {
|
388
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss2_aktiv, false,
|
389
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss2_name, null,
|
390
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_level, null,
|
391
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_ct, null,
|
388
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss2_aktiv, false, deviceZigbeeLampeWeiss);
|
389
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss2_name, null, deviceZigbeeLampeWeiss);
|
390
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_level, null, deviceZigbeeLampeWeiss);
|
391
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_ct, null, deviceZigbeeLampeWeiss);
|
392
392
|
}
|
393
393
|
// colorSchemesWeiss3: LampeWeissAlexaScheme
|
394
394
|
if (colorSchemesWeiss3 != null) {
|
395
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss3_aktiv, true,
|
396
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss3_name, colorSchemesWeiss3.getAlexaName(),
|
397
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_level, colorSchemesWeiss3.getLevel(),
|
398
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_ct, colorSchemesWeiss3.getCt(),
|
395
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss3_aktiv, true, deviceZigbeeLampeWeiss);
|
396
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss3_name, colorSchemesWeiss3.getAlexaName(), deviceZigbeeLampeWeiss);
|
397
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_level, colorSchemesWeiss3.getLevel(), deviceZigbeeLampeWeiss);
|
398
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_ct, colorSchemesWeiss3.getCt(), deviceZigbeeLampeWeiss);
|
399
399
|
}
|
400
400
|
else {
|
401
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss3_aktiv, false,
|
402
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss3_name, null,
|
403
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_level, null,
|
404
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_ct, null,
|
401
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss3_aktiv, false, deviceZigbeeLampeWeiss);
|
402
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss3_name, null, deviceZigbeeLampeWeiss);
|
403
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_level, null, deviceZigbeeLampeWeiss);
|
404
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_ct, null, deviceZigbeeLampeWeiss);
|
405
405
|
}
|
406
406
|
// colorSchemesWeiss4: LampeWeissAlexaScheme
|
407
407
|
if (colorSchemesWeiss4 != null) {
|
408
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss4_aktiv, true,
|
409
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss4_name, colorSchemesWeiss4.getAlexaName(),
|
410
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_level, colorSchemesWeiss4.getLevel(),
|
411
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_ct, colorSchemesWeiss4.getCt(),
|
408
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss4_aktiv, true, deviceZigbeeLampeWeiss);
|
409
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss4_name, colorSchemesWeiss4.getAlexaName(), deviceZigbeeLampeWeiss);
|
410
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_level, colorSchemesWeiss4.getLevel(), deviceZigbeeLampeWeiss);
|
411
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_ct, colorSchemesWeiss4.getCt(), deviceZigbeeLampeWeiss);
|
412
412
|
}
|
413
413
|
else {
|
414
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss4_aktiv, false,
|
415
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss4_name, null,
|
416
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_level, null,
|
417
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_ct, null,
|
414
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss4_aktiv, false, deviceZigbeeLampeWeiss);
|
415
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss4_name, null, deviceZigbeeLampeWeiss);
|
416
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_level, null, deviceZigbeeLampeWeiss);
|
417
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_ct, null, deviceZigbeeLampeWeiss);
|
418
418
|
}
|
419
419
|
}
|
420
420
|
exports.createLampeWeiss = createLampeWeiss;
|
421
421
|
// LampeRGB:
|
422
|
-
function createLampeRGB(adapter, rawId, baseState, etage, raum, device, isGroup, groupMembers, alexaSmartNamesForOn, alexaActionNamesForOn, alexaColorSchemeForOnFarbe, alexaColorSchemeForOnWeiss, alexaSmartNamesForOff, alexaActionNamesForOff, colorSchemesFarbe1, colorSchemesFarbe2, colorSchemesFarbe3, colorSchemesFarbe4, colorSchemesWeiss1, colorSchemesWeiss2, colorSchemesWeiss3, colorSchemesWeiss4, tasterBooleanOn, tasterBooleanOff, nachtbeleuchtung, turnOffExitHouseSummer, turnOffExitHouseWinter, turnOnEnterHouseSummer, turnOnEnterHouseWinter
|
422
|
+
function createLampeRGB(adapter, rawId, baseState, etage, raum, device, isGroup, groupMembers, alexaSmartNamesForOn, alexaActionNamesForOn, alexaColorSchemeForOnFarbe, alexaColorSchemeForOnWeiss, alexaSmartNamesForOff, alexaActionNamesForOff, colorSchemesFarbe1, colorSchemesFarbe2, colorSchemesFarbe3, colorSchemesFarbe4, colorSchemesWeiss1, colorSchemesWeiss2, colorSchemesWeiss3, colorSchemesWeiss4, tasterBooleanOn, tasterBooleanOff, nachtbeleuchtung, turnOffExitHouseSummer, turnOffExitHouseWinter, turnOnEnterHouseSummer, turnOnEnterHouseWinter) {
|
423
|
+
var category = deviceZigbeeLampeRGB;
|
423
424
|
// Allgemein:
|
424
425
|
createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, deviceZigbeeLampeRGB);
|
425
426
|
// Lampe-RGB spezifisch:
|
@@ -670,6 +671,15 @@ function createDatenpunktSingle(adapter, deviceRawId, attributeType, attributeNa
|
|
670
671
|
});
|
671
672
|
adapter.setState(stateDatenpunkt, attributeValue);
|
672
673
|
}
|
674
|
+
function toStringArray(databaseValue) {
|
675
|
+
var stringArray = [];
|
676
|
+
if (databaseValue == null) {
|
677
|
+
return stringArray;
|
678
|
+
}
|
679
|
+
else {
|
680
|
+
return databaseValue.split('|');
|
681
|
+
}
|
682
|
+
}
|
673
683
|
function getZigbeeDevices(adapter, filterCategory) {
|
674
684
|
var zigbeeArray = [];
|
675
685
|
adapter.$('state[id=0_userdata.0.devices.zigbee.*.*.category]').each(function (datenpunktKey) {
|
@@ -685,12 +695,12 @@ function getZigbeeDevices(adapter, filterCategory) {
|
|
685
695
|
adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
|
686
696
|
adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
|
687
697
|
adapter.getState(datenpunktPraefix + "." + attributeDevice).val, // [4] Device (z.B. Stehlampe)
|
688
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOn).val
|
689
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaActionNamesForOn).val
|
690
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOff).val
|
691
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaActionNamesForOff).val
|
692
|
-
adapter.getState(datenpunktPraefix + "." + attribute_TasterBooleanOn).val
|
693
|
-
adapter.getState(datenpunktPraefix + "." + attribute_TasterBooleanOff).val
|
698
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOn).val), // 08 Alexa-Ein
|
699
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaActionNamesForOn).val), // Alexa-Action-Ein, z.B. "Guten morgen" (Würde auch funktionieren, wenn dies bei [06] eingetragen ist)
|
700
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOff).val), // 09 Alexa-Aus
|
701
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaActionNamesForOff).val), // [10] Alexa-Action Aus, z.B. "Gute Nacht". Wir müssen hier zu [09] unterscheiden, da wir über "Gute Nacht" und isActionTurnedOn=true informiert werden.
|
702
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_TasterBooleanOn).val), // 07 TunrnOn-DP
|
703
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_TasterBooleanOff).val) // 08 TasterBoolOff-DP
|
694
704
|
));
|
695
705
|
}
|
696
706
|
else if (filterCategory == deviceZigbeeBewegungsmelder) {
|
@@ -760,15 +770,15 @@ function getZigbeeDevices(adapter, filterCategory) {
|
|
760
770
|
adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
|
761
771
|
adapter.getState(datenpunktPraefix + "." + attributeDevice).val, // [4] Device (z.B. Stehlampe)
|
762
772
|
adapter.getState(datenpunktPraefix + "." + attributeRGBLamp_Group).val, // [5] Gruppe
|
763
|
-
adapter.getState(datenpunktPraefix + "." + attributeRGBLamp_Groupmembers).val
|
764
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOn).val
|
765
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaActionNamesForOn).val
|
773
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attributeRGBLamp_Groupmembers).val), // [6] Gruppenmitglieder
|
774
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOn).val), // 08 Alexa-Ein
|
775
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaActionNamesForOn).val), // Alexa-Action-Ein, z.B. "Guten morgen" (Würde auch funktionieren, wenn dies bei [06] eingetragen ist)
|
766
776
|
alexaOnScheme, // [09 A.-Ein-Scheme]
|
767
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOff).val
|
768
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaActionNamesForOff).val
|
777
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOff).val), // 10 Alexa-Aus
|
778
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaActionNamesForOff).val), // [10] Alexa-Action Aus, z.B. "Gute Nacht". Wir müssen hier zu [09] unterscheiden, da wir über "Gute Nacht" und isActionTurnedOn=true informiert werden.
|
769
779
|
schemeArray, // [12 Alexa-Schemes]
|
770
|
-
adapter.getState(datenpunktPraefix + "." + attribute_TasterBooleanOn).val
|
771
|
-
adapter.getState(datenpunktPraefix + "." + attribute_TasterBooleanOff).val
|
780
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_TasterBooleanOn).val), // 13 TasterBoolOn
|
781
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_TasterBooleanOff).val), // 14 TasterBoolOff
|
772
782
|
adapter.getState(datenpunktPraefix + "." + attribute_Nachtbeleuchtung).val, // Gehört zur Nachtbeleuchtung ja/nein
|
773
783
|
adapter.getState(datenpunktPraefix + "." + attribute_TurnOffExitHouseSummer).val, // turnOffExitHouseSummer (Ausschalten, wenn Haus verlassen - Sommer)
|
774
784
|
adapter.getState(datenpunktPraefix + "." + attribute_TurnOffExitHouseWinter).val, // turnOffExitHouseWinter (Ausschalten, wenn Haus verlassen - Winter)
|
@@ -834,15 +844,15 @@ function getZigbeeDevices(adapter, filterCategory) {
|
|
834
844
|
adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
|
835
845
|
adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
|
836
846
|
adapter.getState(datenpunktPraefix + "." + attributeDevice).val, // [4] Device (z.B. Stehlampe)
|
837
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOn).val
|
838
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaActionNamesForOn).val
|
847
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOn).val), // 08 Alexa-Ein
|
848
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaActionNamesForOn).val), // Alexa-Action-Ein, z.B. "Guten morgen" (Würde auch funktionieren, wenn dies bei [06] eingetragen ist)
|
839
849
|
alexaOnScheme, // [06 A.-Ein-Scheme] */ new LampeWeissAlexaScheme(null, 100, -1), // Letzter Paramter = -1 heußt, dass diese Lampe keine Farbtemperatur unterstützt. Ansonsten hier die Temperatur angeben
|
840
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOff).val
|
841
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaActionNamesForOff).val
|
850
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOff).val), // 09 Alexa-Aus
|
851
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaActionNamesForOff).val), // [10] Alexa-Action Aus, z.B. "Gute Nacht". Wir müssen hier zu [09] unterscheiden, da wir über "Gute Nacht" und isActionTurnedOn=true informiert werden.
|
842
852
|
schemeArray, // [08 Alexa-Schemes]
|
843
853
|
adapter.getState(datenpunktPraefix + "." + attributeLampeWeissGroup).val, // [6] Gruppe
|
844
854
|
tasterOnBoolschemeArray, // [07 TasterBoolOn ]
|
845
|
-
adapter.getState(datenpunktPraefix + "." + attribute_TasterBooleanOff).val
|
855
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_TasterBooleanOff).val), // 14 TasterBoolOff
|
846
856
|
adapter.getState(datenpunktPraefix + "." + attribute_Nachtbeleuchtung).val, // Gehört zur Nachtbeleuchtung ja/nein
|
847
857
|
adapter.getState(datenpunktPraefix + "." + attribute_TurnOffExitHouseSummer).val, // turnOffExitHouseSummer (Ausschalten, wenn Haus verlassen - Sommer)
|
848
858
|
adapter.getState(datenpunktPraefix + "." + attribute_TurnOffExitHouseWinter).val, // turnOffExitHouseWinter (Ausschalten, wenn Haus verlassen - Winter)
|
@@ -875,7 +885,7 @@ function getZigbeeDevices(adapter, filterCategory) {
|
|
875
885
|
adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
|
876
886
|
adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
|
877
887
|
adapter.getState(datenpunktPraefix + "." + attributeDevice).val, // [4] Device (z.B. Stehlampe)
|
878
|
-
adapter.getState(datenpunktPraefix + "." + attributeDosenrelais_smartNames).val
|
888
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attributeDosenrelais_smartNames).val) // 14 TasterBoolOff
|
879
889
|
));
|
880
890
|
}
|
881
891
|
else if (filterCategory == deviceZigbeeSchalter) {
|
package/zigbeeFunctions.ts
CHANGED
@@ -166,7 +166,7 @@ export function createDosenrelaisDevice(adapter:any, rawId: number, baseState: s
|
|
166
166
|
|
167
167
|
// Steckdose:
|
168
168
|
export function createSteckdose(adapter:any, rawId: number, baseState: string, etage: string, raum: string, device: string, alexaSmartNamesForOn:string[],
|
169
|
-
alexaActionNamesForOn:string[], alexaSmartNamesForOff: string[],alexaActionNamesForOff: string[], additionalStates4TurnOn:string[], additionalStates4TurnOff:string[]
|
169
|
+
alexaActionNamesForOn:string[], alexaSmartNamesForOff: string[],alexaActionNamesForOff: string[], additionalStates4TurnOn:string[], additionalStates4TurnOff:string[]) {
|
170
170
|
|
171
171
|
// Allgemein:
|
172
172
|
createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, deviceZigbeeSteckdose);
|
@@ -182,7 +182,7 @@ export function createSteckdose(adapter:any, rawId: number, baseState: string, e
|
|
182
182
|
db_alexaSmartNamesForOn += "|" + value;
|
183
183
|
}
|
184
184
|
});
|
185
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn,
|
185
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn, deviceZigbeeSteckdose);
|
186
186
|
|
187
187
|
// alexaActionNamesForOn:string[]
|
188
188
|
var db_alexaActionNamesForOn = null;
|
@@ -195,7 +195,7 @@ export function createSteckdose(adapter:any, rawId: number, baseState: string, e
|
|
195
195
|
db_alexaActionNamesForOn += "|" + value;
|
196
196
|
}
|
197
197
|
});
|
198
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn,
|
198
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn, deviceZigbeeSteckdose);
|
199
199
|
|
200
200
|
// alexaSmartNamesForOff:string[]
|
201
201
|
var db_alexaSmartNamesForOff = null;
|
@@ -208,7 +208,7 @@ export function createSteckdose(adapter:any, rawId: number, baseState: string, e
|
|
208
208
|
db_alexaSmartNamesForOff += "|" + value;
|
209
209
|
}
|
210
210
|
});
|
211
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff,
|
211
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff, deviceZigbeeSteckdose);
|
212
212
|
|
213
213
|
// alexaActionNamesForOff:string[]
|
214
214
|
var db_alexaActionNamesForOff = null;
|
@@ -221,7 +221,7 @@ export function createSteckdose(adapter:any, rawId: number, baseState: string, e
|
|
221
221
|
db_alexaActionNamesForOff += "|" + value;
|
222
222
|
}
|
223
223
|
});
|
224
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff,
|
224
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff, deviceZigbeeSteckdose);
|
225
225
|
|
226
226
|
// additionalStates4TurnOn: string[]
|
227
227
|
var db_additionalStates4TurnOn = null;
|
@@ -234,7 +234,7 @@ export function createSteckdose(adapter:any, rawId: number, baseState: string, e
|
|
234
234
|
db_additionalStates4TurnOn += "|" + value;
|
235
235
|
}
|
236
236
|
});
|
237
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOn, db_additionalStates4TurnOn,
|
237
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOn, db_additionalStates4TurnOn, deviceZigbeeSteckdose);
|
238
238
|
|
239
239
|
// additionalStates4TurnOff: string[]
|
240
240
|
var db_additionalStates4TurnOff = null;
|
@@ -247,7 +247,7 @@ export function createSteckdose(adapter:any, rawId: number, baseState: string, e
|
|
247
247
|
db_additionalStates4TurnOff += "|" + value;
|
248
248
|
}
|
249
249
|
});
|
250
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_additionalStates4TurnOff,
|
250
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_additionalStates4TurnOff, deviceZigbeeSteckdose);
|
251
251
|
}
|
252
252
|
|
253
253
|
// LampeWeiss:
|
@@ -257,7 +257,7 @@ export function createLampeWeiss(adapter:any, rawId: number, baseState: string,
|
|
257
257
|
isGroup: boolean,
|
258
258
|
tasterBooleanOn1: InstanceType<typeof LampeWeissTasterScheme>, tasterBooleanOn2: InstanceType<typeof LampeWeissTasterScheme>, tasterBooleanOn3: InstanceType<typeof LampeWeissTasterScheme>, tasterBooleanOn4: InstanceType<typeof LampeWeissTasterScheme>,
|
259
259
|
tasterBooleanOff: string[], nachtbeleuchtung:boolean,
|
260
|
-
turnOffExitHouseSummer:boolean, turnOffExitHouseWinter:boolean, turnOnEnterHouseSummer:boolean, turnOnEnterHouseWinter:boolean
|
260
|
+
turnOffExitHouseSummer:boolean, turnOffExitHouseWinter:boolean, turnOnEnterHouseSummer:boolean, turnOnEnterHouseWinter:boolean) {
|
261
261
|
|
262
262
|
// Allgemein:
|
263
263
|
createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, deviceZigbeeLampeWeiss);
|
@@ -273,7 +273,7 @@ export function createLampeWeiss(adapter:any, rawId: number, baseState: string,
|
|
273
273
|
db_alexaSmartNamesForOn += "|" + value;
|
274
274
|
}
|
275
275
|
});
|
276
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn,
|
276
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn, deviceZigbeeLampeWeiss);
|
277
277
|
|
278
278
|
// alexaActionNamesForOn:string[]
|
279
279
|
var db_alexaActionNamesForOn = null;
|
@@ -286,7 +286,7 @@ export function createLampeWeiss(adapter:any, rawId: number, baseState: string,
|
|
286
286
|
db_alexaActionNamesForOn += "|" + value;
|
287
287
|
}
|
288
288
|
});
|
289
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn,
|
289
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn, deviceZigbeeLampeWeiss);
|
290
290
|
|
291
291
|
// alexaSmartNamesForOff:string[]
|
292
292
|
var db_alexaSmartNamesForOff = null;
|
@@ -299,7 +299,7 @@ export function createLampeWeiss(adapter:any, rawId: number, baseState: string,
|
|
299
299
|
db_alexaSmartNamesForOff += "|" + value;
|
300
300
|
}
|
301
301
|
});
|
302
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff,
|
302
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff, deviceZigbeeLampeWeiss);
|
303
303
|
|
304
304
|
// alexaActionNamesForOff:string[]
|
305
305
|
var db_alexaActionNamesForOff = null;
|
@@ -312,58 +312,58 @@ export function createLampeWeiss(adapter:any, rawId: number, baseState: string,
|
|
312
312
|
db_alexaActionNamesForOff += "|" + value;
|
313
313
|
}
|
314
314
|
});
|
315
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff,
|
315
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff, deviceZigbeeLampeWeiss);
|
316
316
|
|
317
317
|
// tasterBooleanOn1 : LampeWeissTasterScheme
|
318
318
|
if (tasterBooleanOn1 != null) {
|
319
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn1_aktiv, true,
|
320
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn1_name, tasterBooleanOn1.getTasterBooleanOnName(),
|
321
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_level, tasterBooleanOn1.getLevel(),
|
322
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_ct, tasterBooleanOn1.getCt(),
|
319
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn1_aktiv, true, deviceZigbeeLampeWeiss);
|
320
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn1_name, tasterBooleanOn1.getTasterBooleanOnName(), deviceZigbeeLampeWeiss);
|
321
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_level, tasterBooleanOn1.getLevel(), deviceZigbeeLampeWeiss);
|
322
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_ct, tasterBooleanOn1.getCt(), deviceZigbeeLampeWeiss);
|
323
323
|
} else {
|
324
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn1_aktiv, false,
|
325
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn1_name, null,
|
326
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_level, null,
|
327
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_ct, null,
|
324
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn1_aktiv, false, deviceZigbeeLampeWeiss);
|
325
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn1_name, null, deviceZigbeeLampeWeiss);
|
326
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_level, null, deviceZigbeeLampeWeiss);
|
327
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_ct, null, deviceZigbeeLampeWeiss);
|
328
328
|
}
|
329
329
|
|
330
330
|
// tasterBooleanOn2 : LampeWeissTasterScheme
|
331
331
|
if (tasterBooleanOn2 != null) {
|
332
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn2_aktiv, true,
|
333
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn2_name, tasterBooleanOn2.getTasterBooleanOnName(),
|
334
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_level, tasterBooleanOn2.getLevel(),
|
335
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_ct, tasterBooleanOn2.getCt(),
|
332
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn2_aktiv, true, deviceZigbeeLampeWeiss);
|
333
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn2_name, tasterBooleanOn2.getTasterBooleanOnName(), deviceZigbeeLampeWeiss);
|
334
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_level, tasterBooleanOn2.getLevel(), deviceZigbeeLampeWeiss);
|
335
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_ct, tasterBooleanOn2.getCt(), deviceZigbeeLampeWeiss);
|
336
336
|
} else {
|
337
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn2_aktiv, false,
|
338
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn2_name, null,
|
339
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_level, null,
|
340
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_ct, null,
|
337
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn2_aktiv, false, deviceZigbeeLampeWeiss);
|
338
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn2_name, null, deviceZigbeeLampeWeiss);
|
339
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_level, null, deviceZigbeeLampeWeiss);
|
340
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_ct, null, deviceZigbeeLampeWeiss);
|
341
341
|
}
|
342
342
|
|
343
343
|
// tasterBooleanOn3 : LampeWeissTasterScheme
|
344
344
|
if (tasterBooleanOn3 != null) {
|
345
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn3_aktiv, true,
|
346
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn3_name, tasterBooleanOn3.getTasterBooleanOnName(),
|
347
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_level, tasterBooleanOn3.getLevel(),
|
348
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_ct, tasterBooleanOn3.getCt(),
|
345
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn3_aktiv, true, deviceZigbeeLampeWeiss);
|
346
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn3_name, tasterBooleanOn3.getTasterBooleanOnName(), deviceZigbeeLampeWeiss);
|
347
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_level, tasterBooleanOn3.getLevel(), deviceZigbeeLampeWeiss);
|
348
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_ct, tasterBooleanOn3.getCt(), deviceZigbeeLampeWeiss);
|
349
349
|
} else {
|
350
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn3_aktiv, false,
|
351
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn3_name, null,
|
352
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_level, null,
|
353
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_ct, null,
|
350
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn3_aktiv, false, deviceZigbeeLampeWeiss);
|
351
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn3_name, null, deviceZigbeeLampeWeiss);
|
352
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_level, null, deviceZigbeeLampeWeiss);
|
353
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_ct, null, deviceZigbeeLampeWeiss);
|
354
354
|
}
|
355
355
|
|
356
356
|
// tasterBooleanOn4 : LampeWeissTasterScheme
|
357
357
|
if (tasterBooleanOn4 != null) {
|
358
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn4_aktiv, true,
|
359
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn4_name, tasterBooleanOn4.getTasterBooleanOnName(),
|
360
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_level, tasterBooleanOn4.getLevel(),
|
361
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_ct, tasterBooleanOn4.getCt(),
|
358
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn4_aktiv, true, deviceZigbeeLampeWeiss);
|
359
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn4_name, tasterBooleanOn4.getTasterBooleanOnName(), deviceZigbeeLampeWeiss);
|
360
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_level, tasterBooleanOn4.getLevel(), deviceZigbeeLampeWeiss);
|
361
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_ct, tasterBooleanOn4.getCt(), deviceZigbeeLampeWeiss);
|
362
362
|
} else {
|
363
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn4_aktiv, false,
|
364
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn4_name, null,
|
365
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_level, null,
|
366
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_ct, null,
|
363
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn4_aktiv, false, deviceZigbeeLampeWeiss);
|
364
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn4_name, null, deviceZigbeeLampeWeiss);
|
365
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_level, null, deviceZigbeeLampeWeiss);
|
366
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_ct, null, deviceZigbeeLampeWeiss);
|
367
367
|
}
|
368
368
|
|
369
369
|
// tasterBooleanOff: string[]
|
@@ -377,79 +377,79 @@ export function createLampeWeiss(adapter:any, rawId: number, baseState: string,
|
|
377
377
|
db_tasterBooleanOff += "|" + value;
|
378
378
|
}
|
379
379
|
});
|
380
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_tasterBooleanOff,
|
380
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_tasterBooleanOff, deviceZigbeeLampeWeiss);
|
381
381
|
|
382
382
|
// Weitere:
|
383
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_Nachtbeleuchtung, nachtbeleuchtung,
|
384
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseSummer, turnOffExitHouseSummer,
|
385
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseWinter, turnOffExitHouseWinter,
|
386
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseSummer, turnOnEnterHouseSummer,
|
387
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseWinter, turnOnEnterHouseWinter,
|
383
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_Nachtbeleuchtung, nachtbeleuchtung, deviceZigbeeLampeWeiss);
|
384
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseSummer, turnOffExitHouseSummer, deviceZigbeeLampeWeiss);
|
385
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseWinter, turnOffExitHouseWinter, deviceZigbeeLampeWeiss);
|
386
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseSummer, turnOnEnterHouseSummer, deviceZigbeeLampeWeiss);
|
387
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseWinter, turnOnEnterHouseWinter, deviceZigbeeLampeWeiss);
|
388
388
|
|
389
389
|
// Gruppe:
|
390
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampeWeissGroup, isGroup,
|
390
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampeWeissGroup, isGroup, deviceZigbeeLampeWeiss);
|
391
391
|
|
392
392
|
// alexaLevelSchemeForOn: LampeWeissColorScheme
|
393
393
|
if (alexaLevelSchemeForOn != null) {
|
394
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv, true,
|
395
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level, alexaLevelSchemeForOn.getLevel(),
|
396
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct, alexaLevelSchemeForOn.getCt(),
|
394
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv, true, deviceZigbeeLampeWeiss);
|
395
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level, alexaLevelSchemeForOn.getLevel(), deviceZigbeeLampeWeiss);
|
396
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct, alexaLevelSchemeForOn.getCt(), deviceZigbeeLampeWeiss);
|
397
397
|
} else {
|
398
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv, false,
|
399
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level, null,
|
400
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct, null,
|
398
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv, false, deviceZigbeeLampeWeiss);
|
399
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level, null, deviceZigbeeLampeWeiss);
|
400
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct, null, deviceZigbeeLampeWeiss);
|
401
401
|
}
|
402
402
|
|
403
403
|
// colorSchemesWeiss1: LampeWeissAlexaScheme
|
404
404
|
if (colorSchemesWeiss1 != null) {
|
405
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss1_aktiv, true,
|
406
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss1_name, colorSchemesWeiss1.getAlexaName(),
|
407
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_level, colorSchemesWeiss1.getLevel(),
|
408
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_ct, colorSchemesWeiss1.getCt(),
|
405
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss1_aktiv, true, deviceZigbeeLampeWeiss);
|
406
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss1_name, colorSchemesWeiss1.getAlexaName(), deviceZigbeeLampeWeiss);
|
407
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_level, colorSchemesWeiss1.getLevel(), deviceZigbeeLampeWeiss);
|
408
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_ct, colorSchemesWeiss1.getCt(), deviceZigbeeLampeWeiss);
|
409
409
|
} else {
|
410
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss1_aktiv, false,
|
411
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss1_name, null,
|
412
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_level, null,
|
413
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_ct, null,
|
410
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss1_aktiv, false, deviceZigbeeLampeWeiss);
|
411
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss1_name, null, deviceZigbeeLampeWeiss);
|
412
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_level, null, deviceZigbeeLampeWeiss);
|
413
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_ct, null, deviceZigbeeLampeWeiss);
|
414
414
|
}
|
415
415
|
|
416
416
|
// colorSchemesWeiss2: LampeWeissAlexaScheme
|
417
417
|
if (colorSchemesWeiss2 != null) {
|
418
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss2_aktiv, true,
|
419
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss2_name, colorSchemesWeiss2.getAlexaName(),
|
420
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_level, colorSchemesWeiss2.getLevel(),
|
421
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_ct, colorSchemesWeiss2.getCt(),
|
418
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss2_aktiv, true, deviceZigbeeLampeWeiss);
|
419
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss2_name, colorSchemesWeiss2.getAlexaName(), deviceZigbeeLampeWeiss);
|
420
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_level, colorSchemesWeiss2.getLevel(), deviceZigbeeLampeWeiss);
|
421
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_ct, colorSchemesWeiss2.getCt(), deviceZigbeeLampeWeiss);
|
422
422
|
} else {
|
423
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss2_aktiv, false,
|
424
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss2_name, null,
|
425
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_level, null,
|
426
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_ct, null,
|
423
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss2_aktiv, false, deviceZigbeeLampeWeiss);
|
424
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss2_name, null, deviceZigbeeLampeWeiss);
|
425
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_level, null, deviceZigbeeLampeWeiss);
|
426
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_ct, null, deviceZigbeeLampeWeiss);
|
427
427
|
}
|
428
428
|
|
429
429
|
// colorSchemesWeiss3: LampeWeissAlexaScheme
|
430
430
|
if (colorSchemesWeiss3 != null) {
|
431
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss3_aktiv, true,
|
432
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss3_name, colorSchemesWeiss3.getAlexaName(),
|
433
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_level, colorSchemesWeiss3.getLevel(),
|
434
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_ct, colorSchemesWeiss3.getCt(),
|
431
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss3_aktiv, true, deviceZigbeeLampeWeiss);
|
432
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss3_name, colorSchemesWeiss3.getAlexaName(), deviceZigbeeLampeWeiss);
|
433
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_level, colorSchemesWeiss3.getLevel(), deviceZigbeeLampeWeiss);
|
434
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_ct, colorSchemesWeiss3.getCt(), deviceZigbeeLampeWeiss);
|
435
435
|
} else {
|
436
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss3_aktiv, false,
|
437
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss3_name, null,
|
438
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_level, null,
|
439
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_ct, null,
|
436
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss3_aktiv, false, deviceZigbeeLampeWeiss);
|
437
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss3_name, null, deviceZigbeeLampeWeiss);
|
438
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_level, null, deviceZigbeeLampeWeiss);
|
439
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_ct, null, deviceZigbeeLampeWeiss);
|
440
440
|
}
|
441
441
|
|
442
442
|
// colorSchemesWeiss4: LampeWeissAlexaScheme
|
443
443
|
if (colorSchemesWeiss4 != null) {
|
444
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss4_aktiv, true,
|
445
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss4_name, colorSchemesWeiss4.getAlexaName(),
|
446
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_level, colorSchemesWeiss4.getLevel(),
|
447
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_ct, colorSchemesWeiss4.getCt(),
|
444
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss4_aktiv, true, deviceZigbeeLampeWeiss);
|
445
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss4_name, colorSchemesWeiss4.getAlexaName(), deviceZigbeeLampeWeiss);
|
446
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_level, colorSchemesWeiss4.getLevel(), deviceZigbeeLampeWeiss);
|
447
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_ct, colorSchemesWeiss4.getCt(), deviceZigbeeLampeWeiss);
|
448
448
|
} else {
|
449
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss4_aktiv, false,
|
450
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss4_name, null,
|
451
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_level, null,
|
452
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_ct, null,
|
449
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss4_aktiv, false, deviceZigbeeLampeWeiss);
|
450
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss4_name, null, deviceZigbeeLampeWeiss);
|
451
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_level, null, deviceZigbeeLampeWeiss);
|
452
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_ct, null, deviceZigbeeLampeWeiss);
|
453
453
|
}
|
454
454
|
}
|
455
455
|
|
@@ -459,7 +459,9 @@ export function createLampeRGB(adapter:any, rawId: number, baseState: string, et
|
|
459
459
|
colorSchemesFarbe1: InstanceType<typeof RGBColorScheme>, colorSchemesFarbe2: InstanceType<typeof RGBColorScheme>, colorSchemesFarbe3: InstanceType<typeof RGBColorScheme>, colorSchemesFarbe4: InstanceType<typeof RGBColorScheme>,
|
460
460
|
colorSchemesWeiss1: InstanceType<typeof WhiteColorScheme>, colorSchemesWeiss2: InstanceType<typeof WhiteColorScheme>, colorSchemesWeiss3: InstanceType<typeof WhiteColorScheme>, colorSchemesWeiss4: InstanceType<typeof WhiteColorScheme>,
|
461
461
|
tasterBooleanOn: string[], tasterBooleanOff: string[],nachtbeleuchtung:boolean, turnOffExitHouseSummer:boolean, turnOffExitHouseWinter:boolean,
|
462
|
-
turnOnEnterHouseSummer:boolean, turnOnEnterHouseWinter:boolean
|
462
|
+
turnOnEnterHouseSummer:boolean, turnOnEnterHouseWinter:boolean) {
|
463
|
+
|
464
|
+
var category: string = deviceZigbeeLampeRGB;
|
463
465
|
|
464
466
|
// Allgemein:
|
465
467
|
createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, deviceZigbeeLampeRGB);
|
@@ -714,6 +716,15 @@ function createDatenpunktSingle(adapter:any, deviceRawId, attributeType, attribu
|
|
714
716
|
adapter.setState(stateDatenpunkt, attributeValue);
|
715
717
|
}
|
716
718
|
|
719
|
+
function toStringArray(databaseValue) { // z.B. "Werkbank|Arbeiten|Keller"
|
720
|
+
var stringArray = [];
|
721
|
+
if (databaseValue == null) {
|
722
|
+
return stringArray;
|
723
|
+
} else {
|
724
|
+
return databaseValue.split('|');
|
725
|
+
}
|
726
|
+
}
|
727
|
+
|
717
728
|
export function getZigbeeDevices(adapter: any, filterCategory: string) {
|
718
729
|
var zigbeeArray = [];
|
719
730
|
|
@@ -732,12 +743,12 @@ export function getZigbeeDevices(adapter: any, filterCategory: string) {
|
|
732
743
|
adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
|
733
744
|
adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
|
734
745
|
adapter.getState(datenpunktPraefix + "." + attributeDevice).val, // [4] Device (z.B. Stehlampe)
|
735
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOn).val
|
736
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaActionNamesForOn).val
|
737
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOff).val
|
738
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaActionNamesForOff).val
|
739
|
-
adapter.getState(datenpunktPraefix + "." + attribute_TasterBooleanOn).val
|
740
|
-
adapter.getState(datenpunktPraefix + "." + attribute_TasterBooleanOff).val
|
746
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOn).val), // 08 Alexa-Ein
|
747
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaActionNamesForOn).val), // Alexa-Action-Ein, z.B. "Guten morgen" (Würde auch funktionieren, wenn dies bei [06] eingetragen ist)
|
748
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOff).val), // 09 Alexa-Aus
|
749
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaActionNamesForOff).val), // [10] Alexa-Action Aus, z.B. "Gute Nacht". Wir müssen hier zu [09] unterscheiden, da wir über "Gute Nacht" und isActionTurnedOn=true informiert werden.
|
750
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_TasterBooleanOn).val), // 07 TunrnOn-DP
|
751
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_TasterBooleanOff).val) // 08 TasterBoolOff-DP
|
741
752
|
));
|
742
753
|
|
743
754
|
} else if (filterCategory == deviceZigbeeBewegungsmelder) {
|
@@ -861,15 +872,15 @@ export function getZigbeeDevices(adapter: any, filterCategory: string) {
|
|
861
872
|
adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
|
862
873
|
adapter.getState(datenpunktPraefix + "." + attributeDevice).val, // [4] Device (z.B. Stehlampe)
|
863
874
|
adapter.getState(datenpunktPraefix + "." + attributeRGBLamp_Group).val, // [5] Gruppe
|
864
|
-
adapter.getState(datenpunktPraefix + "." + attributeRGBLamp_Groupmembers).val
|
865
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOn).val
|
866
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaActionNamesForOn).val
|
875
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attributeRGBLamp_Groupmembers).val), // [6] Gruppenmitglieder
|
876
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOn).val), // 08 Alexa-Ein
|
877
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaActionNamesForOn).val), // Alexa-Action-Ein, z.B. "Guten morgen" (Würde auch funktionieren, wenn dies bei [06] eingetragen ist)
|
867
878
|
alexaOnScheme, // [09 A.-Ein-Scheme]
|
868
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOff).val
|
869
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaActionNamesForOff).val
|
879
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOff).val), // 10 Alexa-Aus
|
880
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaActionNamesForOff).val), // [10] Alexa-Action Aus, z.B. "Gute Nacht". Wir müssen hier zu [09] unterscheiden, da wir über "Gute Nacht" und isActionTurnedOn=true informiert werden.
|
870
881
|
schemeArray, // [12 Alexa-Schemes]
|
871
|
-
adapter.getState(datenpunktPraefix + "." + attribute_TasterBooleanOn).val
|
872
|
-
adapter.getState(datenpunktPraefix + "." + attribute_TasterBooleanOff).val
|
882
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_TasterBooleanOn).val), // 13 TasterBoolOn
|
883
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_TasterBooleanOff).val), // 14 TasterBoolOff
|
873
884
|
adapter.getState(datenpunktPraefix + "." + attribute_Nachtbeleuchtung).val, // Gehört zur Nachtbeleuchtung ja/nein
|
874
885
|
adapter.getState(datenpunktPraefix + "." + attribute_TurnOffExitHouseSummer).val, // turnOffExitHouseSummer (Ausschalten, wenn Haus verlassen - Sommer)
|
875
886
|
adapter.getState(datenpunktPraefix + "." + attribute_TurnOffExitHouseWinter).val, // turnOffExitHouseWinter (Ausschalten, wenn Haus verlassen - Winter)
|
@@ -982,15 +993,15 @@ export function getZigbeeDevices(adapter: any, filterCategory: string) {
|
|
982
993
|
adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
|
983
994
|
adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
|
984
995
|
adapter.getState(datenpunktPraefix + "." + attributeDevice).val, // [4] Device (z.B. Stehlampe)
|
985
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOn).val
|
986
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaActionNamesForOn).val
|
996
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOn).val), // 08 Alexa-Ein
|
997
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaActionNamesForOn).val), // Alexa-Action-Ein, z.B. "Guten morgen" (Würde auch funktionieren, wenn dies bei [06] eingetragen ist)
|
987
998
|
alexaOnScheme, // [06 A.-Ein-Scheme] */ new LampeWeissAlexaScheme(null, 100, -1), // Letzter Paramter = -1 heußt, dass diese Lampe keine Farbtemperatur unterstützt. Ansonsten hier die Temperatur angeben
|
988
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOff).val
|
989
|
-
adapter.getState(datenpunktPraefix + "." + attribute_AlexaActionNamesForOff).val
|
999
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaSmartNamesForOff).val), // 09 Alexa-Aus
|
1000
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_AlexaActionNamesForOff).val), // [10] Alexa-Action Aus, z.B. "Gute Nacht". Wir müssen hier zu [09] unterscheiden, da wir über "Gute Nacht" und isActionTurnedOn=true informiert werden.
|
990
1001
|
schemeArray, // [08 Alexa-Schemes]
|
991
1002
|
adapter.getState(datenpunktPraefix + "." + attributeLampeWeissGroup).val, // [6] Gruppe
|
992
1003
|
tasterOnBoolschemeArray, // [07 TasterBoolOn ]
|
993
|
-
adapter.getState(datenpunktPraefix + "." + attribute_TasterBooleanOff).val
|
1004
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attribute_TasterBooleanOff).val), // 14 TasterBoolOff
|
994
1005
|
adapter.getState(datenpunktPraefix + "." + attribute_Nachtbeleuchtung).val, // Gehört zur Nachtbeleuchtung ja/nein
|
995
1006
|
adapter.getState(datenpunktPraefix + "." + attribute_TurnOffExitHouseSummer).val, // turnOffExitHouseSummer (Ausschalten, wenn Haus verlassen - Sommer)
|
996
1007
|
adapter.getState(datenpunktPraefix + "." + attribute_TurnOffExitHouseWinter).val, // turnOffExitHouseWinter (Ausschalten, wenn Haus verlassen - Winter)
|
@@ -1023,7 +1034,7 @@ export function getZigbeeDevices(adapter: any, filterCategory: string) {
|
|
1023
1034
|
adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
|
1024
1035
|
adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
|
1025
1036
|
adapter.getState(datenpunktPraefix + "." + attributeDevice).val, // [4] Device (z.B. Stehlampe)
|
1026
|
-
adapter.getState(datenpunktPraefix + "." + attributeDosenrelais_smartNames).val
|
1037
|
+
adapter.getState(toStringArray(datenpunktPraefix + "." + attributeDosenrelais_smartNames).val) // 14 TasterBoolOff
|
1027
1038
|
));
|
1028
1039
|
} else if (filterCategory == deviceZigbeeSchalter) {
|
1029
1040
|
// @ts-ignore
|