iobroker-ucl 1.0.67 → 1.0.69
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 +9 -10
- package/zigbeeFunctions.ts +4 -5
package/package.json
CHANGED
package/zigbeeFunctions.js
CHANGED
@@ -124,21 +124,20 @@ exports.createZigbeeDevice = createZigbeeDevice;
|
|
124
124
|
// Dosenrelais:
|
125
125
|
function createDosenrelaisDevice(adapter, rawId, baseState, etage, raum, device, smartNames) {
|
126
126
|
// Allgemein:
|
127
|
-
|
128
|
-
|
127
|
+
createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, deviceZigbeeDosenrelais);
|
129
128
|
// Spezifisch:
|
130
129
|
var db_smartNames = null;
|
131
|
-
smartNames.forEach(value
|
130
|
+
smartNames.forEach(function (value) {
|
132
131
|
if (db_smartNames == null) {
|
133
|
-
// @ts-ignore
|
132
|
+
// @ts-ignore
|
134
133
|
db_smartNames = value;
|
135
|
-
}
|
136
|
-
|
134
|
+
}
|
135
|
+
else {
|
136
|
+
// @ts-ignore
|
137
137
|
db_smartNames += "|" + value;
|
138
138
|
}
|
139
139
|
});
|
140
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDosenrelais_smartNames, db_smartNames, deviceZigbeeDosenrelais)
|
141
|
-
adapter.log("i do nothing!");
|
140
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDosenrelais_smartNames, db_smartNames, deviceZigbeeDosenrelais);
|
142
141
|
}
|
143
142
|
exports.createDosenrelaisDevice = createDosenrelaisDevice;
|
144
143
|
// Steckdose:
|
@@ -875,8 +874,8 @@ function getZigbeeDevices(adapter, filterCategory) {
|
|
875
874
|
adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
|
876
875
|
adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
|
877
876
|
adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
|
878
|
-
adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
|
879
|
-
|
877
|
+
adapter.getState(datenpunktPraefix + "." + attributeDevice).val, // [4] Device (z.B. Stehlampe)
|
878
|
+
adapter.getState(datenpunktPraefix + "." + attributeDosenrelais_smartNames).val.split('|') // 14 TasterBoolOff
|
880
879
|
));
|
881
880
|
}
|
882
881
|
else if (filterCategory == deviceZigbeeSchalter) {
|
package/zigbeeFunctions.ts
CHANGED
@@ -148,7 +148,7 @@ export function createZigbeeDevice(adapter:any, rawId: number, baseState: string
|
|
148
148
|
export function createDosenrelaisDevice(adapter:any, rawId: number, baseState: string, etage:string, raum:string, device:string, smartNames:string[]) {
|
149
149
|
|
150
150
|
// Allgemein:
|
151
|
-
|
151
|
+
createZigbeeDevice(adapter, rawId, baseState, etage, raum, device, deviceZigbeeDosenrelais);
|
152
152
|
|
153
153
|
// Spezifisch:
|
154
154
|
var db_smartNames = null;
|
@@ -161,8 +161,7 @@ export function createDosenrelaisDevice(adapter:any, rawId: number, baseState: s
|
|
161
161
|
db_smartNames += "|" + value;
|
162
162
|
}
|
163
163
|
});
|
164
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDosenrelais_smartNames, db_smartNames, deviceZigbeeDosenrelais)
|
165
|
-
adapter.log("i do nothing!");
|
164
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDosenrelais_smartNames, db_smartNames, deviceZigbeeDosenrelais);
|
166
165
|
}
|
167
166
|
|
168
167
|
// Steckdose:
|
@@ -1023,8 +1022,8 @@ export function getZigbeeDevices(adapter: any, filterCategory: string) {
|
|
1023
1022
|
adapter.getState(datenpunktPraefix + "." + attributeBaseState).val, // [1] Datenpunkt Device (z.B. hm-rpc.1.001B9D898F9CBC)
|
1024
1023
|
adapter.getState(datenpunktPraefix + "." + attributeEtage).val, // [2] Etage/Bereich (z.B. EG)
|
1025
1024
|
adapter.getState(datenpunktPraefix + "." + attributeRaum).val, // [3] Raum/Unterbereich (z.B. Wohnzimmer)
|
1026
|
-
adapter.getState(datenpunktPraefix + "." + attributeDevice).val // [4] Device (z.B. Stehlampe)
|
1027
|
-
|
1025
|
+
adapter.getState(datenpunktPraefix + "." + attributeDevice).val, // [4] Device (z.B. Stehlampe)
|
1026
|
+
adapter.getState(datenpunktPraefix + "." + attributeDosenrelais_smartNames).val.split('|') // 14 TasterBoolOff
|
1028
1027
|
));
|
1029
1028
|
} else if (filterCategory == deviceZigbeeSchalter) {
|
1030
1029
|
// @ts-ignore
|