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.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getZigbeeDevicesAll = exports.getZigbeeDevices = exports.createLampeRGB = exports.createLampeWeiss = exports.createSteckdose = exports.createZigbeeDevice = void 0;
|
|
3
|
+
exports.getZigbeeDevicesAll = exports.getZigbeeDevices = exports.createLampeRGB = exports.createLampeWeiss = exports.createSteckdose = exports.createDosenrelaisDevice = exports.createZigbeeDevice = void 0;
|
|
4
4
|
var _a = require('./zigbeeClasses.js'), AbstractZigbee = _a.AbstractZigbee, ColorScheme = _a.ColorScheme, RGBColorScheme = _a.RGBColorScheme, WhiteColorScheme = _a.WhiteColorScheme, ZigbeeLampeRGB = _a.ZigbeeLampeRGB, LampeWeissTasterScheme = _a.LampeWeissTasterScheme, LampeWeissAlexaScheme = _a.LampeWeissAlexaScheme, ZigbeeLampeWeiss = _a.ZigbeeLampeWeiss, ZigbeeSteckdose = _a.ZigbeeSteckdose, ZigbeeSchalter = _a.ZigbeeSchalter, ZigbeeRepeater = _a.ZigbeeRepeater, ZigbeeFenstersensor = _a.ZigbeeFenstersensor, ZigbeeRauchmelder = _a.ZigbeeRauchmelder, ZigbeeBewegungsmelder = _a.ZigbeeBewegungsmelder, ZigbeeWandtaster = _a.ZigbeeWandtaster, ZigbeeDosenrelais = _a.ZigbeeDosenrelais, AlexaInputConverter = _a.AlexaInputConverter, deviceZigbeeSteckdose = _a.deviceZigbeeSteckdose, deviceZigbeeBewegungsmelder = _a.deviceZigbeeBewegungsmelder, deviceZigbeeLampeRGB = _a.deviceZigbeeLampeRGB, deviceZigbeeLampeWeiss = _a.deviceZigbeeLampeWeiss, deviceZigbeeRauchmelder = _a.deviceZigbeeRauchmelder, deviceZigbeeWandtaster = _a.deviceZigbeeWandtaster, deviceZigbeeDosenrelais = _a.deviceZigbeeDosenrelais, deviceZigbeeSchalter = _a.deviceZigbeeSchalter, deviceZigbeeRepeater = _a.deviceZigbeeRepeater, deviceZigbeeFenstersensor = _a.deviceZigbeeFenstersensor;
|
|
5
5
|
// Alexa:
|
|
6
6
|
var attribute_AlexaSmartNamesForOn = "alexaSmartNamesForOn";
|
|
@@ -90,6 +90,8 @@ var attributeRGBLamp_ColorSchemes_Weiss4_aktiv = "alexaColorSchemeForOn_Weiss4_a
|
|
|
90
90
|
var attributeRGBLamp_ColorSchemes_Weiss4_name = "alexaColorSchemeForOn_Weiss4_name";
|
|
91
91
|
var attributeRGBLamp_ColorSchemes_Weiss4_level = "alexaColorSchemeForOn_Weiss4_level";
|
|
92
92
|
var attributeRGBLamp_ColorSchemes_Weiss4_ct = "alexaColorSchemeForOn_Weiss4_ct";
|
|
93
|
+
// Dosenrelais:
|
|
94
|
+
var attributeDosenrelais_smartNames = "smartNames";
|
|
93
95
|
// Lampen/Steckdosen allgemein:
|
|
94
96
|
var attribute_TasterBooleanOn = "tasterBooleanOn";
|
|
95
97
|
var attribute_TasterBooleanOff = "tasterBooleanOff";
|
|
@@ -111,16 +113,35 @@ var attributeDevice = "device";
|
|
|
111
113
|
var attributeCategory = "category";
|
|
112
114
|
// Standarddevices, ohne zusätzliche Attribute:
|
|
113
115
|
function createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, category) {
|
|
114
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRawID, rawId);
|
|
115
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeCategory, category);
|
|
116
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeBaseState, baseState);
|
|
117
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeEtage, etage);
|
|
118
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRaum, raum);
|
|
119
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDevice, device);
|
|
116
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRawID, rawId, category);
|
|
117
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeCategory, category, category);
|
|
118
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeBaseState, baseState, category);
|
|
119
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeEtage, etage, category);
|
|
120
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRaum, raum, category);
|
|
121
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDevice, device, category);
|
|
120
122
|
}
|
|
121
123
|
exports.createZigbeeDevice = createZigbeeDevice;
|
|
124
|
+
// Dosenrelais:
|
|
125
|
+
function createDosenrelaisDevice(adapter, rawId, baseState, etage, raum, device, category, smartNames) {
|
|
126
|
+
// Allgemein:
|
|
127
|
+
createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, deviceZigbeeSteckdose);
|
|
128
|
+
// Spezifisch:
|
|
129
|
+
var db_smartNames = null;
|
|
130
|
+
smartNames.forEach(function (value) {
|
|
131
|
+
if (db_smartNames == null) {
|
|
132
|
+
// @ts-ignore
|
|
133
|
+
db_smartNames = value;
|
|
134
|
+
}
|
|
135
|
+
else {
|
|
136
|
+
// @ts-ignore
|
|
137
|
+
db_smartNames += "|" + value;
|
|
138
|
+
}
|
|
139
|
+
});
|
|
140
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDosenrelais_smartNames, db_smartNames, category);
|
|
141
|
+
}
|
|
142
|
+
exports.createDosenrelaisDevice = createDosenrelaisDevice;
|
|
122
143
|
// Steckdose:
|
|
123
|
-
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, category) {
|
|
124
145
|
// Allgemein:
|
|
125
146
|
createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, deviceZigbeeSteckdose);
|
|
126
147
|
// alexaSmartNamesForOn:string[]
|
|
@@ -135,7 +156,7 @@ function createSteckdose(adapter, rawId, baseState, etage, raum, device, alexaSm
|
|
|
135
156
|
db_alexaSmartNamesForOn += "|" + value;
|
|
136
157
|
}
|
|
137
158
|
});
|
|
138
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn);
|
|
159
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn, category);
|
|
139
160
|
// alexaActionNamesForOn:string[]
|
|
140
161
|
var db_alexaActionNamesForOn = null;
|
|
141
162
|
alexaActionNamesForOn.forEach(function (value) {
|
|
@@ -148,7 +169,7 @@ function createSteckdose(adapter, rawId, baseState, etage, raum, device, alexaSm
|
|
|
148
169
|
db_alexaActionNamesForOn += "|" + value;
|
|
149
170
|
}
|
|
150
171
|
});
|
|
151
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn);
|
|
172
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn, category);
|
|
152
173
|
// alexaSmartNamesForOff:string[]
|
|
153
174
|
var db_alexaSmartNamesForOff = null;
|
|
154
175
|
alexaSmartNamesForOff.forEach(function (value) {
|
|
@@ -161,7 +182,7 @@ function createSteckdose(adapter, rawId, baseState, etage, raum, device, alexaSm
|
|
|
161
182
|
db_alexaSmartNamesForOff += "|" + value;
|
|
162
183
|
}
|
|
163
184
|
});
|
|
164
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff);
|
|
185
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff, category);
|
|
165
186
|
// alexaActionNamesForOff:string[]
|
|
166
187
|
var db_alexaActionNamesForOff = null;
|
|
167
188
|
alexaActionNamesForOff.forEach(function (value) {
|
|
@@ -174,7 +195,7 @@ function createSteckdose(adapter, rawId, baseState, etage, raum, device, alexaSm
|
|
|
174
195
|
db_alexaActionNamesForOff += "|" + value;
|
|
175
196
|
}
|
|
176
197
|
});
|
|
177
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff);
|
|
198
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff, category);
|
|
178
199
|
// additionalStates4TurnOn: string[]
|
|
179
200
|
var db_additionalStates4TurnOn = null;
|
|
180
201
|
additionalStates4TurnOn.forEach(function (value) {
|
|
@@ -187,7 +208,7 @@ function createSteckdose(adapter, rawId, baseState, etage, raum, device, alexaSm
|
|
|
187
208
|
db_additionalStates4TurnOn += "|" + value;
|
|
188
209
|
}
|
|
189
210
|
});
|
|
190
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOn, db_additionalStates4TurnOn);
|
|
211
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOn, db_additionalStates4TurnOn, category);
|
|
191
212
|
// additionalStates4TurnOff: string[]
|
|
192
213
|
var db_additionalStates4TurnOff = null;
|
|
193
214
|
additionalStates4TurnOff.forEach(function (value) {
|
|
@@ -200,11 +221,11 @@ function createSteckdose(adapter, rawId, baseState, etage, raum, device, alexaSm
|
|
|
200
221
|
db_additionalStates4TurnOff += "|" + value;
|
|
201
222
|
}
|
|
202
223
|
});
|
|
203
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_additionalStates4TurnOff);
|
|
224
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_additionalStates4TurnOff, category);
|
|
204
225
|
}
|
|
205
226
|
exports.createSteckdose = createSteckdose;
|
|
206
227
|
// LampeWeiss:
|
|
207
|
-
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, category) {
|
|
208
229
|
// Allgemein:
|
|
209
230
|
createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, deviceZigbeeLampeWeiss);
|
|
210
231
|
// alexaSmartNamesForOn:string[]
|
|
@@ -219,7 +240,7 @@ function createLampeWeiss(adapter, rawId, baseState, etage, raum, device, alexaS
|
|
|
219
240
|
db_alexaSmartNamesForOn += "|" + value;
|
|
220
241
|
}
|
|
221
242
|
});
|
|
222
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn);
|
|
243
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn, category);
|
|
223
244
|
// alexaActionNamesForOn:string[]
|
|
224
245
|
var db_alexaActionNamesForOn = null;
|
|
225
246
|
alexaActionNamesForOn.forEach(function (value) {
|
|
@@ -232,7 +253,7 @@ function createLampeWeiss(adapter, rawId, baseState, etage, raum, device, alexaS
|
|
|
232
253
|
db_alexaActionNamesForOn += "|" + value;
|
|
233
254
|
}
|
|
234
255
|
});
|
|
235
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn);
|
|
256
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn, category);
|
|
236
257
|
// alexaSmartNamesForOff:string[]
|
|
237
258
|
var db_alexaSmartNamesForOff = null;
|
|
238
259
|
alexaSmartNamesForOff.forEach(function (value) {
|
|
@@ -245,7 +266,7 @@ function createLampeWeiss(adapter, rawId, baseState, etage, raum, device, alexaS
|
|
|
245
266
|
db_alexaSmartNamesForOff += "|" + value;
|
|
246
267
|
}
|
|
247
268
|
});
|
|
248
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff);
|
|
269
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff, category);
|
|
249
270
|
// alexaActionNamesForOff:string[]
|
|
250
271
|
var db_alexaActionNamesForOff = null;
|
|
251
272
|
alexaActionNamesForOff.forEach(function (value) {
|
|
@@ -258,58 +279,58 @@ function createLampeWeiss(adapter, rawId, baseState, etage, raum, device, alexaS
|
|
|
258
279
|
db_alexaActionNamesForOff += "|" + value;
|
|
259
280
|
}
|
|
260
281
|
});
|
|
261
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff);
|
|
282
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff, category);
|
|
262
283
|
// tasterBooleanOn1 : LampeWeissTasterScheme
|
|
263
284
|
if (tasterBooleanOn1 != null) {
|
|
264
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn1_aktiv, true);
|
|
265
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn1_name, tasterBooleanOn1.getTasterBooleanOnName());
|
|
266
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_level, tasterBooleanOn1.getLevel());
|
|
267
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_ct, tasterBooleanOn1.getCt());
|
|
285
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn1_aktiv, true, category);
|
|
286
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn1_name, tasterBooleanOn1.getTasterBooleanOnName(), category);
|
|
287
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_level, tasterBooleanOn1.getLevel(), category);
|
|
288
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_ct, tasterBooleanOn1.getCt(), category);
|
|
268
289
|
}
|
|
269
290
|
else {
|
|
270
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn1_aktiv, false);
|
|
271
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn1_name, null);
|
|
272
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_level, null);
|
|
273
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_ct, null);
|
|
291
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn1_aktiv, false, category);
|
|
292
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn1_name, null, category);
|
|
293
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_level, null, category);
|
|
294
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn1_ct, null, category);
|
|
274
295
|
}
|
|
275
296
|
// tasterBooleanOn2 : LampeWeissTasterScheme
|
|
276
297
|
if (tasterBooleanOn2 != null) {
|
|
277
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn2_aktiv, true);
|
|
278
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn2_name, tasterBooleanOn2.getTasterBooleanOnName());
|
|
279
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_level, tasterBooleanOn2.getLevel());
|
|
280
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_ct, tasterBooleanOn2.getCt());
|
|
298
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn2_aktiv, true, category);
|
|
299
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn2_name, tasterBooleanOn2.getTasterBooleanOnName(), category);
|
|
300
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_level, tasterBooleanOn2.getLevel(), category);
|
|
301
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_ct, tasterBooleanOn2.getCt(), category);
|
|
281
302
|
}
|
|
282
303
|
else {
|
|
283
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn2_aktiv, false);
|
|
284
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn2_name, null);
|
|
285
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_level, null);
|
|
286
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_ct, null);
|
|
304
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn2_aktiv, false, category);
|
|
305
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn2_name, null, category);
|
|
306
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_level, null, category);
|
|
307
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn2_ct, null, category);
|
|
287
308
|
}
|
|
288
309
|
// tasterBooleanOn3 : LampeWeissTasterScheme
|
|
289
310
|
if (tasterBooleanOn3 != null) {
|
|
290
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn3_aktiv, true);
|
|
291
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn3_name, tasterBooleanOn3.getTasterBooleanOnName());
|
|
292
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_level, tasterBooleanOn3.getLevel());
|
|
293
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_ct, tasterBooleanOn3.getCt());
|
|
311
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn3_aktiv, true, category);
|
|
312
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn3_name, tasterBooleanOn3.getTasterBooleanOnName(), category);
|
|
313
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_level, tasterBooleanOn3.getLevel(), category);
|
|
314
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_ct, tasterBooleanOn3.getCt(), category);
|
|
294
315
|
}
|
|
295
316
|
else {
|
|
296
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn3_aktiv, false);
|
|
297
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn3_name, null);
|
|
298
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_level, null);
|
|
299
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_ct, null);
|
|
317
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn3_aktiv, false, category);
|
|
318
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn3_name, null, category);
|
|
319
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_level, null, category);
|
|
320
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn3_ct, null, category);
|
|
300
321
|
}
|
|
301
322
|
// tasterBooleanOn4 : LampeWeissTasterScheme
|
|
302
323
|
if (tasterBooleanOn4 != null) {
|
|
303
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn4_aktiv, true);
|
|
304
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn4_name, tasterBooleanOn4.getTasterBooleanOnName());
|
|
305
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_level, tasterBooleanOn4.getLevel());
|
|
306
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_ct, tasterBooleanOn4.getCt());
|
|
324
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn4_aktiv, true, category);
|
|
325
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn4_name, tasterBooleanOn4.getTasterBooleanOnName(), category);
|
|
326
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_level, tasterBooleanOn4.getLevel(), category);
|
|
327
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_ct, tasterBooleanOn4.getCt(), category);
|
|
307
328
|
}
|
|
308
329
|
else {
|
|
309
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn4_aktiv, false);
|
|
310
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn4_name, null);
|
|
311
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_level, null);
|
|
312
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_ct, null);
|
|
330
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_tasterBoolOn4_aktiv, false, category);
|
|
331
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_tasterBoolOn4_name, null, category);
|
|
332
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_level, null, category);
|
|
333
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_tasterBoolOn4_ct, null, category);
|
|
313
334
|
}
|
|
314
335
|
// tasterBooleanOff: string[]
|
|
315
336
|
var db_tasterBooleanOff = null;
|
|
@@ -323,86 +344,86 @@ function createLampeWeiss(adapter, rawId, baseState, etage, raum, device, alexaS
|
|
|
323
344
|
db_tasterBooleanOff += "|" + value;
|
|
324
345
|
}
|
|
325
346
|
});
|
|
326
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_tasterBooleanOff);
|
|
347
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_tasterBooleanOff, category);
|
|
327
348
|
// Weitere:
|
|
328
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_Nachtbeleuchtung, nachtbeleuchtung);
|
|
329
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseSummer, turnOffExitHouseSummer);
|
|
330
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseWinter, turnOffExitHouseWinter);
|
|
331
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseSummer, turnOnEnterHouseSummer);
|
|
332
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseWinter, turnOnEnterHouseWinter);
|
|
349
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_Nachtbeleuchtung, nachtbeleuchtung, category);
|
|
350
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseSummer, turnOffExitHouseSummer, category);
|
|
351
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseWinter, turnOffExitHouseWinter, category);
|
|
352
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseSummer, turnOnEnterHouseSummer, category);
|
|
353
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseWinter, turnOnEnterHouseWinter, category);
|
|
333
354
|
// Gruppe:
|
|
334
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampeWeissGroup, isGroup);
|
|
355
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampeWeissGroup, isGroup, category);
|
|
335
356
|
// alexaLevelSchemeForOn: LampeWeissColorScheme
|
|
336
357
|
if (alexaLevelSchemeForOn != null) {
|
|
337
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv, true);
|
|
338
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level, alexaLevelSchemeForOn.getLevel());
|
|
339
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct, alexaLevelSchemeForOn.getCt());
|
|
358
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv, true, category);
|
|
359
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level, alexaLevelSchemeForOn.getLevel(), category);
|
|
360
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct, alexaLevelSchemeForOn.getCt(), category);
|
|
340
361
|
}
|
|
341
362
|
else {
|
|
342
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv, false);
|
|
343
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level, null);
|
|
344
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct, null);
|
|
363
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_aktiv, false, category);
|
|
364
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_level, null, category);
|
|
365
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_AlexaColorSchemeForOn_Weiss_ct, null, category);
|
|
345
366
|
}
|
|
346
367
|
// colorSchemesWeiss1: LampeWeissAlexaScheme
|
|
347
368
|
if (colorSchemesWeiss1 != null) {
|
|
348
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss1_aktiv, true);
|
|
349
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss1_name, colorSchemesWeiss1.getAlexaName());
|
|
350
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_level, colorSchemesWeiss1.getLevel());
|
|
351
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_ct, colorSchemesWeiss1.getCt());
|
|
369
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss1_aktiv, true, category);
|
|
370
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss1_name, colorSchemesWeiss1.getAlexaName(), category);
|
|
371
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_level, colorSchemesWeiss1.getLevel(), category);
|
|
372
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_ct, colorSchemesWeiss1.getCt(), category);
|
|
352
373
|
}
|
|
353
374
|
else {
|
|
354
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss1_aktiv, false);
|
|
355
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss1_name, null);
|
|
356
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_level, null);
|
|
357
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_ct, null);
|
|
375
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss1_aktiv, false, category);
|
|
376
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss1_name, null, category);
|
|
377
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_level, null, category);
|
|
378
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss1_ct, null, category);
|
|
358
379
|
}
|
|
359
380
|
// colorSchemesWeiss2: LampeWeissAlexaScheme
|
|
360
381
|
if (colorSchemesWeiss2 != null) {
|
|
361
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss2_aktiv, true);
|
|
362
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss2_name, colorSchemesWeiss2.getAlexaName());
|
|
363
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_level, colorSchemesWeiss2.getLevel());
|
|
364
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_ct, colorSchemesWeiss2.getCt());
|
|
382
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss2_aktiv, true, category);
|
|
383
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss2_name, colorSchemesWeiss2.getAlexaName(), category);
|
|
384
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_level, colorSchemesWeiss2.getLevel(), category);
|
|
385
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_ct, colorSchemesWeiss2.getCt(), category);
|
|
365
386
|
}
|
|
366
387
|
else {
|
|
367
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss2_aktiv, false);
|
|
368
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss2_name, null);
|
|
369
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_level, null);
|
|
370
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_ct, null);
|
|
388
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss2_aktiv, false, category);
|
|
389
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss2_name, null, category);
|
|
390
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_level, null, category);
|
|
391
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss2_ct, null, category);
|
|
371
392
|
}
|
|
372
393
|
// colorSchemesWeiss3: LampeWeissAlexaScheme
|
|
373
394
|
if (colorSchemesWeiss3 != null) {
|
|
374
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss3_aktiv, true);
|
|
375
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss3_name, colorSchemesWeiss3.getAlexaName());
|
|
376
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_level, colorSchemesWeiss3.getLevel());
|
|
377
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_ct, colorSchemesWeiss3.getCt());
|
|
395
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss3_aktiv, true, category);
|
|
396
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss3_name, colorSchemesWeiss3.getAlexaName(), category);
|
|
397
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_level, colorSchemesWeiss3.getLevel(), category);
|
|
398
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_ct, colorSchemesWeiss3.getCt(), category);
|
|
378
399
|
}
|
|
379
400
|
else {
|
|
380
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss3_aktiv, false);
|
|
381
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss3_name, null);
|
|
382
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_level, null);
|
|
383
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_ct, null);
|
|
401
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss3_aktiv, false, category);
|
|
402
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss3_name, null, category);
|
|
403
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_level, null, category);
|
|
404
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss3_ct, null, category);
|
|
384
405
|
}
|
|
385
406
|
// colorSchemesWeiss4: LampeWeissAlexaScheme
|
|
386
407
|
if (colorSchemesWeiss4 != null) {
|
|
387
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss4_aktiv, true);
|
|
388
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss4_name, colorSchemesWeiss4.getAlexaName());
|
|
389
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_level, colorSchemesWeiss4.getLevel());
|
|
390
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_ct, colorSchemesWeiss4.getCt());
|
|
408
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss4_aktiv, true, category);
|
|
409
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss4_name, colorSchemesWeiss4.getAlexaName(), category);
|
|
410
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_level, colorSchemesWeiss4.getLevel(), category);
|
|
411
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_ct, colorSchemesWeiss4.getCt(), category);
|
|
391
412
|
}
|
|
392
413
|
else {
|
|
393
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss4_aktiv, false);
|
|
394
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss4_name, null);
|
|
395
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_level, null);
|
|
396
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_ct, null);
|
|
414
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeLampWeiss_ColorSchemes_Weiss4_aktiv, false, category);
|
|
415
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeLampWeiss_ColorSchemes_Weiss4_name, null, category);
|
|
416
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_level, null, category);
|
|
417
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeLampWeiss_ColorSchemes_Weiss4_ct, null, category);
|
|
397
418
|
}
|
|
398
419
|
}
|
|
399
420
|
exports.createLampeWeiss = createLampeWeiss;
|
|
400
421
|
// LampeRGB:
|
|
401
|
-
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, category) {
|
|
402
423
|
// Allgemein:
|
|
403
424
|
createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, deviceZigbeeLampeRGB);
|
|
404
425
|
// Lampe-RGB spezifisch:
|
|
405
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_Group, isGroup);
|
|
426
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_Group, isGroup, category);
|
|
406
427
|
// groupMembers:string[]
|
|
407
428
|
var db_groupMembers = null;
|
|
408
429
|
groupMembers.forEach(function (value) {
|
|
@@ -415,7 +436,7 @@ function createLampeRGB(adapter, rawId, baseState, etage, raum, device, isGroup,
|
|
|
415
436
|
db_groupMembers += "|" + value;
|
|
416
437
|
}
|
|
417
438
|
});
|
|
418
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_Groupmembers, db_groupMembers);
|
|
439
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_Groupmembers, db_groupMembers, category);
|
|
419
440
|
// alexaSmartNamesForOn:string[]
|
|
420
441
|
var db_alexaSmartNamesForOn = null;
|
|
421
442
|
alexaSmartNamesForOn.forEach(function (value) {
|
|
@@ -428,7 +449,7 @@ function createLampeRGB(adapter, rawId, baseState, etage, raum, device, isGroup,
|
|
|
428
449
|
db_alexaSmartNamesForOn += "|" + value;
|
|
429
450
|
}
|
|
430
451
|
});
|
|
431
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn);
|
|
452
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOn, db_alexaSmartNamesForOn, category);
|
|
432
453
|
// alexaActionNamesForOn:string[]
|
|
433
454
|
var db_alexaActionNamesForOn = null;
|
|
434
455
|
alexaActionNamesForOn.forEach(function (value) {
|
|
@@ -441,7 +462,7 @@ function createLampeRGB(adapter, rawId, baseState, etage, raum, device, isGroup,
|
|
|
441
462
|
db_alexaActionNamesForOn += "|" + value;
|
|
442
463
|
}
|
|
443
464
|
});
|
|
444
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn);
|
|
465
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOn, db_alexaActionNamesForOn, category);
|
|
445
466
|
// alexaSmartNamesForOff:string[]
|
|
446
467
|
var db_alexaSmartNamesForOff = null;
|
|
447
468
|
alexaSmartNamesForOff.forEach(function (value) {
|
|
@@ -454,7 +475,7 @@ function createLampeRGB(adapter, rawId, baseState, etage, raum, device, isGroup,
|
|
|
454
475
|
db_alexaSmartNamesForOff += "|" + value;
|
|
455
476
|
}
|
|
456
477
|
});
|
|
457
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff);
|
|
478
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaSmartNamesForOff, db_alexaSmartNamesForOff, category);
|
|
458
479
|
// alexaActionNamesForOff:string[]
|
|
459
480
|
var db_alexaActionNamesForOff = null;
|
|
460
481
|
alexaActionNamesForOff.forEach(function (value) {
|
|
@@ -467,7 +488,7 @@ function createLampeRGB(adapter, rawId, baseState, etage, raum, device, isGroup,
|
|
|
467
488
|
db_alexaActionNamesForOff += "|" + value;
|
|
468
489
|
}
|
|
469
490
|
});
|
|
470
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff);
|
|
491
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_AlexaActionNamesForOff, db_alexaActionNamesForOff, category);
|
|
471
492
|
// tasterBooleanOn: string[]
|
|
472
493
|
var db_tasterBooleanOn = null;
|
|
473
494
|
tasterBooleanOn.forEach(function (value) {
|
|
@@ -480,7 +501,7 @@ function createLampeRGB(adapter, rawId, baseState, etage, raum, device, isGroup,
|
|
|
480
501
|
db_tasterBooleanOn += "|" + value;
|
|
481
502
|
}
|
|
482
503
|
});
|
|
483
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOn, db_tasterBooleanOn);
|
|
504
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOn, db_tasterBooleanOn, category);
|
|
484
505
|
// tasterBooleanOff: string[]
|
|
485
506
|
var db_tasterBooleanOff = null;
|
|
486
507
|
tasterBooleanOff.forEach(function (value) {
|
|
@@ -493,153 +514,153 @@ function createLampeRGB(adapter, rawId, baseState, etage, raum, device, isGroup,
|
|
|
493
514
|
db_tasterBooleanOff += "|" + value;
|
|
494
515
|
}
|
|
495
516
|
});
|
|
496
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_tasterBooleanOff);
|
|
517
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attribute_TasterBooleanOff, db_tasterBooleanOff, category);
|
|
497
518
|
// Weitere:
|
|
498
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_Nachtbeleuchtung, nachtbeleuchtung);
|
|
499
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseSummer, turnOffExitHouseSummer);
|
|
500
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseWinter, turnOffExitHouseWinter);
|
|
501
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseSummer, turnOnEnterHouseSummer);
|
|
502
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseWinter, turnOnEnterHouseWinter);
|
|
519
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_Nachtbeleuchtung, nachtbeleuchtung, category);
|
|
520
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseSummer, turnOffExitHouseSummer, category);
|
|
521
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOffExitHouseWinter, turnOffExitHouseWinter, category);
|
|
522
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseSummer, turnOnEnterHouseSummer, category);
|
|
523
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attribute_TurnOnEnterHouseWinter, turnOnEnterHouseWinter, category);
|
|
503
524
|
// alexaColorSchemeForOnFarbe: RGBColorScheme
|
|
504
525
|
if (alexaColorSchemeForOnFarbe != null) {
|
|
505
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_aktiv, true);
|
|
506
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_level, alexaColorSchemeForOnFarbe.getLevel());
|
|
507
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_hue, alexaColorSchemeForOnFarbe.getHue());
|
|
508
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_sat, alexaColorSchemeForOnFarbe.getSat());
|
|
526
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_aktiv, true, category);
|
|
527
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_level, alexaColorSchemeForOnFarbe.getLevel(), category);
|
|
528
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_hue, alexaColorSchemeForOnFarbe.getHue(), category);
|
|
529
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_sat, alexaColorSchemeForOnFarbe.getSat(), category);
|
|
509
530
|
}
|
|
510
531
|
else {
|
|
511
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_aktiv, false);
|
|
512
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_level, null);
|
|
513
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_hue, null);
|
|
514
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_sat, null);
|
|
532
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_aktiv, false, category);
|
|
533
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_level, null, category);
|
|
534
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_hue, null, category);
|
|
535
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Farbe_sat, null, category);
|
|
515
536
|
}
|
|
516
537
|
// alexaColorSchemeForOnWeiss: WhiteColorScheme
|
|
517
538
|
if (alexaColorSchemeForOnWeiss != null) {
|
|
518
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_aktiv, true);
|
|
519
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_level, alexaColorSchemeForOnWeiss.getLevel());
|
|
520
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_ct, alexaColorSchemeForOnWeiss.getCt());
|
|
539
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_aktiv, true, category);
|
|
540
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_level, alexaColorSchemeForOnWeiss.getLevel(), category);
|
|
541
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_ct, alexaColorSchemeForOnWeiss.getCt(), category);
|
|
521
542
|
}
|
|
522
543
|
else {
|
|
523
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_aktiv, false);
|
|
524
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_level, null);
|
|
525
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_ct, null);
|
|
544
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_aktiv, false, category);
|
|
545
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_level, null, category);
|
|
546
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_AlexaColorSchemeForOn_Weiss_ct, null, category);
|
|
526
547
|
}
|
|
527
548
|
// colorSchemesFarbe1: RGBColorScheme
|
|
528
549
|
if (colorSchemesFarbe1 != null) {
|
|
529
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe1_aktiv, true);
|
|
530
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe1_name, colorSchemesFarbe1.getAlexaName());
|
|
531
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_level, colorSchemesFarbe1.getLevel());
|
|
532
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_hue, colorSchemesFarbe1.getHue());
|
|
533
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_sat, colorSchemesFarbe1.getSat());
|
|
550
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe1_aktiv, true, category);
|
|
551
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe1_name, colorSchemesFarbe1.getAlexaName(), category);
|
|
552
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_level, colorSchemesFarbe1.getLevel(), category);
|
|
553
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_hue, colorSchemesFarbe1.getHue(), category);
|
|
554
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_sat, colorSchemesFarbe1.getSat(), category);
|
|
534
555
|
}
|
|
535
556
|
else {
|
|
536
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe1_aktiv, false);
|
|
537
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe1_name, null);
|
|
538
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_level, null);
|
|
539
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_hue, null);
|
|
540
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_sat, null);
|
|
557
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe1_aktiv, false, category);
|
|
558
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe1_name, null, category);
|
|
559
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_level, null, category);
|
|
560
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_hue, null, category);
|
|
561
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe1_sat, null, category);
|
|
541
562
|
}
|
|
542
563
|
// colorSchemesFarbe2: RGBColorScheme
|
|
543
564
|
if (colorSchemesFarbe2 != null) {
|
|
544
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe2_aktiv, true);
|
|
545
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe2_name, colorSchemesFarbe2.getAlexaName());
|
|
546
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_level, colorSchemesFarbe2.getLevel());
|
|
547
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_hue, colorSchemesFarbe2.getHue());
|
|
548
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_sat, colorSchemesFarbe2.getSat());
|
|
565
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe2_aktiv, true, category);
|
|
566
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe2_name, colorSchemesFarbe2.getAlexaName(), category);
|
|
567
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_level, colorSchemesFarbe2.getLevel(), category);
|
|
568
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_hue, colorSchemesFarbe2.getHue(), category);
|
|
569
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_sat, colorSchemesFarbe2.getSat(), category);
|
|
549
570
|
}
|
|
550
571
|
else {
|
|
551
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe2_aktiv, false);
|
|
552
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe2_name, null);
|
|
553
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_level, null);
|
|
554
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_hue, null);
|
|
555
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_sat, null);
|
|
572
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe2_aktiv, false, category);
|
|
573
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe2_name, null, category);
|
|
574
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_level, null, category);
|
|
575
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_hue, null, category);
|
|
576
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe2_sat, null, category);
|
|
556
577
|
}
|
|
557
578
|
// colorSchemesFarbe3: RGBColorScheme
|
|
558
579
|
if (colorSchemesFarbe3 != null) {
|
|
559
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe3_aktiv, true);
|
|
560
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe3_name, colorSchemesFarbe3.getAlexaName());
|
|
561
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_level, colorSchemesFarbe3.getLevel());
|
|
562
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_hue, colorSchemesFarbe3.getHue());
|
|
563
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_sat, colorSchemesFarbe3.getSat());
|
|
580
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe3_aktiv, true, category);
|
|
581
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe3_name, colorSchemesFarbe3.getAlexaName(), category);
|
|
582
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_level, colorSchemesFarbe3.getLevel(), category);
|
|
583
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_hue, colorSchemesFarbe3.getHue(), category);
|
|
584
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_sat, colorSchemesFarbe3.getSat(), category);
|
|
564
585
|
}
|
|
565
586
|
else {
|
|
566
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe3_aktiv, false);
|
|
567
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe3_name, null);
|
|
568
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_level, null);
|
|
569
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_hue, null);
|
|
570
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_sat, null);
|
|
587
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe3_aktiv, false, category);
|
|
588
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe3_name, null, category);
|
|
589
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_level, null, category);
|
|
590
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_hue, null, category);
|
|
591
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe3_sat, null, category);
|
|
571
592
|
}
|
|
572
593
|
// colorSchemesFarbe4: RGBColorScheme
|
|
573
594
|
if (colorSchemesFarbe4 != null) {
|
|
574
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe4_aktiv, true);
|
|
575
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe4_name, colorSchemesFarbe4.getAlexaName());
|
|
576
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_level, colorSchemesFarbe4.getLevel());
|
|
577
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_hue, colorSchemesFarbe4.getHue());
|
|
578
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_sat, colorSchemesFarbe4.getSat());
|
|
595
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe4_aktiv, true, category);
|
|
596
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe4_name, colorSchemesFarbe4.getAlexaName(), category);
|
|
597
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_level, colorSchemesFarbe4.getLevel(), category);
|
|
598
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_hue, colorSchemesFarbe4.getHue(), category);
|
|
599
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_sat, colorSchemesFarbe4.getSat(), category);
|
|
579
600
|
}
|
|
580
601
|
else {
|
|
581
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe4_aktiv, false);
|
|
582
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe4_name, null);
|
|
583
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_level, null);
|
|
584
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_hue, null);
|
|
585
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_sat, null);
|
|
602
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Farbe4_aktiv, false, category);
|
|
603
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Farbe4_name, null, category);
|
|
604
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_level, null, category);
|
|
605
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_hue, null, category);
|
|
606
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Farbe4_sat, null, category);
|
|
586
607
|
}
|
|
587
608
|
// colorSchemesWeiss1: WhiteColorScheme
|
|
588
609
|
if (colorSchemesWeiss1 != null) {
|
|
589
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss1_aktiv, true);
|
|
590
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss1_name, colorSchemesWeiss1.getAlexaName());
|
|
591
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss1_level, colorSchemesWeiss1.getLevel());
|
|
592
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss1_ct, colorSchemesWeiss1.getCt());
|
|
610
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss1_aktiv, true, category);
|
|
611
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss1_name, colorSchemesWeiss1.getAlexaName(), category);
|
|
612
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss1_level, colorSchemesWeiss1.getLevel(), category);
|
|
613
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss1_ct, colorSchemesWeiss1.getCt(), category);
|
|
593
614
|
}
|
|
594
615
|
else {
|
|
595
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss1_aktiv, false);
|
|
596
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss1_name, null);
|
|
597
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss1_level, null);
|
|
598
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss1_ct, null);
|
|
616
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss1_aktiv, false, category);
|
|
617
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss1_name, null, category);
|
|
618
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss1_level, null, category);
|
|
619
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss1_ct, null, category);
|
|
599
620
|
}
|
|
600
621
|
// colorSchemesWeiss2: WhiteColorScheme
|
|
601
622
|
if (colorSchemesWeiss2 != null) {
|
|
602
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss2_aktiv, true);
|
|
603
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss2_name, colorSchemesWeiss2.getAlexaName());
|
|
604
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss2_level, colorSchemesWeiss2.getLevel());
|
|
605
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss2_ct, colorSchemesWeiss2.getCt());
|
|
623
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss2_aktiv, true, category);
|
|
624
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss2_name, colorSchemesWeiss2.getAlexaName(), category);
|
|
625
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss2_level, colorSchemesWeiss2.getLevel(), category);
|
|
626
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss2_ct, colorSchemesWeiss2.getCt(), category);
|
|
606
627
|
}
|
|
607
628
|
else {
|
|
608
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss2_aktiv, false);
|
|
609
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss2_name, null);
|
|
610
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss2_level, null);
|
|
611
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss2_ct, null);
|
|
629
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss2_aktiv, false, category);
|
|
630
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss2_name, null, category);
|
|
631
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss2_level, null, category);
|
|
632
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss2_ct, null, category);
|
|
612
633
|
}
|
|
613
634
|
// colorSchemesWeiss3: WhiteColorScheme
|
|
614
635
|
if (colorSchemesWeiss3 != null) {
|
|
615
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss3_aktiv, true);
|
|
616
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss3_name, colorSchemesWeiss3.getAlexaName());
|
|
617
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss3_level, colorSchemesWeiss3.getLevel());
|
|
618
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss3_ct, colorSchemesWeiss3.getCt());
|
|
636
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss3_aktiv, true, category);
|
|
637
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss3_name, colorSchemesWeiss3.getAlexaName(), category);
|
|
638
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss3_level, colorSchemesWeiss3.getLevel(), category);
|
|
639
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss3_ct, colorSchemesWeiss3.getCt(), category);
|
|
619
640
|
}
|
|
620
641
|
else {
|
|
621
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss3_aktiv, false);
|
|
622
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss3_name, null);
|
|
623
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss3_level, null);
|
|
624
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss3_ct, null);
|
|
642
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss3_aktiv, false, category);
|
|
643
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss3_name, null, category);
|
|
644
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss3_level, null, category);
|
|
645
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss3_ct, null, category);
|
|
625
646
|
}
|
|
626
647
|
// colorSchemesWeiss4: WhiteColorScheme
|
|
627
648
|
if (colorSchemesWeiss4 != null) {
|
|
628
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss4_aktiv, true);
|
|
629
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss4_name, colorSchemesWeiss4.getAlexaName());
|
|
630
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss4_level, colorSchemesWeiss4.getLevel());
|
|
631
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss4_ct, colorSchemesWeiss4.getCt());
|
|
649
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss4_aktiv, true, category);
|
|
650
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss4_name, colorSchemesWeiss4.getAlexaName(), category);
|
|
651
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss4_level, colorSchemesWeiss4.getLevel(), category);
|
|
652
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss4_ct, colorSchemesWeiss4.getCt(), category);
|
|
632
653
|
}
|
|
633
654
|
else {
|
|
634
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss4_aktiv, false);
|
|
635
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss4_name, null);
|
|
636
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss4_level, null);
|
|
637
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss4_ct, null);
|
|
655
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeRGBLamp_ColorSchemes_Weiss4_aktiv, false, category);
|
|
656
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeRGBLamp_ColorSchemes_Weiss4_name, null, category);
|
|
657
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss4_level, null, category);
|
|
658
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeRGBLamp_ColorSchemes_Weiss4_ct, null, category);
|
|
638
659
|
}
|
|
639
660
|
}
|
|
640
661
|
exports.createLampeRGB = createLampeRGB;
|
|
641
|
-
function createDatenpunktSingle(adapter, deviceRawId, attributeType, attributeName, attributeValue) {
|
|
642
|
-
var stateDatenpunkt = "0_userdata.0.devices.zigbee." + deviceRawId + "." + attributeName;
|
|
662
|
+
function createDatenpunktSingle(adapter, deviceRawId, attributeType, attributeName, attributeValue, category) {
|
|
663
|
+
var stateDatenpunkt = "0_userdata.0.devices.zigbee." + category + "." + deviceRawId + "." + attributeName;
|
|
643
664
|
adapter.createState(stateDatenpunkt, null, {
|
|
644
665
|
name: stateDatenpunkt,
|
|
645
666
|
desc: stateDatenpunkt,
|
|
@@ -651,7 +672,7 @@ function createDatenpunktSingle(adapter, deviceRawId, attributeType, attributeNa
|
|
|
651
672
|
}
|
|
652
673
|
function getZigbeeDevices(adapter, filterCategory) {
|
|
653
674
|
var zigbeeArray = [];
|
|
654
|
-
adapter.$('state[id=0_userdata.0.devices.zigbee
|
|
675
|
+
adapter.$('state[id=0_userdata.0.devices.zigbee.*.*.category]').each(function (datenpunktKey) {
|
|
655
676
|
var datenpunktPraefix = datenpunktKey.replaceAll(".category", "");
|
|
656
677
|
if (adapter.getState(datenpunktKey).val == filterCategory) {
|
|
657
678
|
//constructor(adapter:any, id: number, baseState: string, etage: string, raum: string,
|
|
@@ -853,8 +874,8 @@ function getZigbeeDevices(adapter, filterCategory) {
|
|
|
853
874
|
adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
|
|
854
875
|
adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
|
|
855
876
|
adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
|
|
856
|
-
adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
|
|
857
|
-
));
|
|
877
|
+
adapter.getState(datenpunktPraefix + "." + attributeDevice).val, // [4] Device (z.B. Stehlampe)
|
|
878
|
+
adapter.getState(datenpunktPraefix + "." + attributeDosenrelais_smartNames).val.split('|')));
|
|
858
879
|
}
|
|
859
880
|
else if (filterCategory == deviceZigbeeSchalter) {
|
|
860
881
|
// @ts-ignore
|
|
@@ -933,4 +954,4 @@ function getZigbeeDevicesAll(adapter) {
|
|
|
933
954
|
return zigbeeArray;
|
|
934
955
|
}
|
|
935
956
|
exports.getZigbeeDevicesAll = getZigbeeDevicesAll;
|
|
936
|
-
module.exports = { createZigbeeDevice: createZigbeeDevice, createLampeWeiss: createLampeWeiss, createSteckdose: createSteckdose, getZigbeeDevices: getZigbeeDevices, getZigbeeDevicesAll: getZigbeeDevicesAll };
|
|
957
|
+
module.exports = { createZigbeeDevice: createZigbeeDevice, createDosenrelaisDevice: createDosenrelaisDevice, createLampeWeiss: createLampeWeiss, createSteckdose: createSteckdose, getZigbeeDevices: getZigbeeDevices, getZigbeeDevicesAll: getZigbeeDevicesAll };
|