iobroker-ucl 1.4.22 → 1.4.24
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/alexa.js +21 -18
- package/alexa.ts +2 -2
- package/package.json +1 -1
- package/shellyFunctions.js +6 -6
- package/shellyFunctions.ts +6 -6
package/alexa.js
CHANGED
@@ -39,29 +39,32 @@ var AlexaInputConverter = /** @class */ (function () {
|
|
39
39
|
_this.ctNew = _this.adapter.getState(value).val;
|
40
40
|
_this.actionChangeCT = true;
|
41
41
|
}
|
42
|
-
|
42
|
+
adapter.log("");
|
43
43
|
adapter.log(">>> ALEXA (" + logContext + ") >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
|
44
|
-
adapter.log(" Value : " +
|
45
|
-
adapter.log(" smartName : " +
|
46
|
-
adapter.log(" actionTurnOn : " +
|
47
|
-
adapter.log(" actionTurnOff : " +
|
48
|
-
if (
|
49
|
-
adapter.log(" actionChangeLevel: " +
|
50
|
-
} else {
|
51
|
-
adapter.log(" actionChangeLevel: " + this.actionChangeLevel);
|
44
|
+
adapter.log(" Value : " + _this.value);
|
45
|
+
adapter.log(" smartName : " + _this.smartName);
|
46
|
+
adapter.log(" actionTurnOn : " + _this.actionTurnOn);
|
47
|
+
adapter.log(" actionTurnOff : " + _this.actionTurnOff);
|
48
|
+
if (_this.actionChangeLevel) {
|
49
|
+
adapter.log(" actionChangeLevel: " + _this.actionChangeLevel + " (" + _this.levelNew + ")");
|
52
50
|
}
|
53
|
-
|
54
|
-
adapter.log("
|
55
|
-
} else {
|
56
|
-
adapter.log(" actionChangeColor: " + this.actionChangeColor);
|
51
|
+
else {
|
52
|
+
adapter.log(" actionChangeLevel: " + _this.actionChangeLevel);
|
57
53
|
}
|
58
|
-
if (
|
59
|
-
adapter.log("
|
60
|
-
}
|
61
|
-
|
54
|
+
if (_this.actionChangeColor) {
|
55
|
+
adapter.log(" actionChangeColor: " + _this.actionChangeColor + " (" + _this.hueNew + ")");
|
56
|
+
}
|
57
|
+
else {
|
58
|
+
adapter.log(" actionChangeColor: " + _this.actionChangeColor);
|
59
|
+
}
|
60
|
+
if (_this.actionChangeCT) {
|
61
|
+
adapter.log(" actionChangeCT: " + _this.actionChangeCT + " (" + _this.ctNew + ")");
|
62
|
+
}
|
63
|
+
else {
|
64
|
+
adapter.log(" actionChangeCT: " + _this.actionChangeCT);
|
62
65
|
}
|
63
66
|
adapter.log("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
|
64
|
-
adapter.log("return now")
|
67
|
+
adapter.log("return now");
|
65
68
|
callback(_this);
|
66
69
|
}, 75);
|
67
70
|
}
|
package/alexa.ts
CHANGED
@@ -34,7 +34,7 @@ export class AlexaInputConverter {
|
|
34
34
|
this.ctNew = this.adapter.getState(value).val;
|
35
35
|
this.actionChangeCT = true;
|
36
36
|
}
|
37
|
-
|
37
|
+
adapter.log("");
|
38
38
|
adapter.log(">>> ALEXA (" + logContext + ") >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
|
39
39
|
adapter.log(" Value : " + this.value);
|
40
40
|
adapter.log(" smartName : " + this.smartName);
|
@@ -56,7 +56,7 @@ export class AlexaInputConverter {
|
|
56
56
|
adapter.log(" actionChangeCT: " + this.actionChangeCT);
|
57
57
|
}
|
58
58
|
adapter.log("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
|
59
|
-
adapter.log("return now")
|
59
|
+
adapter.log("return now");
|
60
60
|
callback(this);
|
61
61
|
}, 75);
|
62
62
|
}
|
package/package.json
CHANGED
package/shellyFunctions.js
CHANGED
@@ -160,8 +160,8 @@ function createShellyDimmer(adapter, rawId, etage, raum, device, baseState, alex
|
|
160
160
|
// tasterBooleanOn2: InstanceType<typeof ShellyDimmerTasterScheme>
|
161
161
|
if (tasterBooleanOn2 != null) {
|
162
162
|
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeDimmer_tasterScheme_aktiv2, true, deviceShellyDimmer);
|
163
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDimmer_tasterScheme_name2,
|
164
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeDimmer_tasterScheme_level2,
|
163
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDimmer_tasterScheme_name2, tasterBooleanOn2.getTasterBooleanOnName(), deviceShellyDimmer);
|
164
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeDimmer_tasterScheme_level2, tasterBooleanOn2.getLevel(), deviceShellyDimmer);
|
165
165
|
}
|
166
166
|
else {
|
167
167
|
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeDimmer_tasterScheme_aktiv2, false, deviceShellyDimmer);
|
@@ -169,8 +169,8 @@ function createShellyDimmer(adapter, rawId, etage, raum, device, baseState, alex
|
|
169
169
|
// tasterBooleanOn3: InstanceType<typeof ShellyDimmerTasterScheme>
|
170
170
|
if (tasterBooleanOn3 != null) {
|
171
171
|
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeDimmer_tasterScheme_aktiv3, true, deviceShellyDimmer);
|
172
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDimmer_tasterScheme_name3,
|
173
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeDimmer_tasterScheme_level3,
|
172
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDimmer_tasterScheme_name3, tasterBooleanOn3.getTasterBooleanOnName(), deviceShellyDimmer);
|
173
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeDimmer_tasterScheme_level3, tasterBooleanOn3.getLevel(), deviceShellyDimmer);
|
174
174
|
}
|
175
175
|
else {
|
176
176
|
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeDimmer_tasterScheme_aktiv3, false, deviceShellyDimmer);
|
@@ -178,8 +178,8 @@ function createShellyDimmer(adapter, rawId, etage, raum, device, baseState, alex
|
|
178
178
|
// tasterBooleanOn4: InstanceType<typeof ShellyDimmerTasterScheme>
|
179
179
|
if (tasterBooleanOn4 != null) {
|
180
180
|
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeDimmer_tasterScheme_aktiv4, true, deviceShellyDimmer);
|
181
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDimmer_tasterScheme_name4,
|
182
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeDimmer_tasterScheme_level4,
|
181
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDimmer_tasterScheme_name4, tasterBooleanOn4.getTasterBooleanOnName(), deviceShellyDimmer);
|
182
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeDimmer_tasterScheme_level4, tasterBooleanOn4.getLevel(), deviceShellyDimmer);
|
183
183
|
}
|
184
184
|
else {
|
185
185
|
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeDimmer_tasterScheme_aktiv4, false, deviceShellyDimmer);
|
package/shellyFunctions.ts
CHANGED
@@ -177,8 +177,8 @@ export function createShellyDimmer(adapter: any, rawId: number, etage: string,
|
|
177
177
|
// tasterBooleanOn2: InstanceType<typeof ShellyDimmerTasterScheme>
|
178
178
|
if (tasterBooleanOn2 != null) {
|
179
179
|
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeDimmer_tasterScheme_aktiv2, true, deviceShellyDimmer);
|
180
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDimmer_tasterScheme_name2,
|
181
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeDimmer_tasterScheme_level2,
|
180
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDimmer_tasterScheme_name2, tasterBooleanOn2.getTasterBooleanOnName(), deviceShellyDimmer);
|
181
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeDimmer_tasterScheme_level2, tasterBooleanOn2.getLevel(), deviceShellyDimmer);
|
182
182
|
} else {
|
183
183
|
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeDimmer_tasterScheme_aktiv2, false, deviceShellyDimmer);
|
184
184
|
}
|
@@ -186,8 +186,8 @@ export function createShellyDimmer(adapter: any, rawId: number, etage: string,
|
|
186
186
|
// tasterBooleanOn3: InstanceType<typeof ShellyDimmerTasterScheme>
|
187
187
|
if (tasterBooleanOn3 != null) {
|
188
188
|
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeDimmer_tasterScheme_aktiv3, true, deviceShellyDimmer);
|
189
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDimmer_tasterScheme_name3,
|
190
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeDimmer_tasterScheme_level3,
|
189
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDimmer_tasterScheme_name3, tasterBooleanOn3.getTasterBooleanOnName(), deviceShellyDimmer);
|
190
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeDimmer_tasterScheme_level3, tasterBooleanOn3.getLevel(), deviceShellyDimmer);
|
191
191
|
} else {
|
192
192
|
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeDimmer_tasterScheme_aktiv3, false, deviceShellyDimmer);
|
193
193
|
}
|
@@ -195,8 +195,8 @@ export function createShellyDimmer(adapter: any, rawId: number, etage: string,
|
|
195
195
|
// tasterBooleanOn4: InstanceType<typeof ShellyDimmerTasterScheme>
|
196
196
|
if (tasterBooleanOn4 != null) {
|
197
197
|
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeDimmer_tasterScheme_aktiv4, true, deviceShellyDimmer);
|
198
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDimmer_tasterScheme_name4,
|
199
|
-
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeDimmer_tasterScheme_level4,
|
198
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeString, attributeDimmer_tasterScheme_name4, tasterBooleanOn4.getTasterBooleanOnName(), deviceShellyDimmer);
|
199
|
+
createDatenpunktSingle(adapter, rawId, attributeTypeNumber, attributeDimmer_tasterScheme_level4, tasterBooleanOn4.getLevel(), deviceShellyDimmer);
|
200
200
|
} else {
|
201
201
|
createDatenpunktSingle(adapter, rawId, attributeTypeBoolean, attributeDimmer_tasterScheme_aktiv4, false, deviceShellyDimmer);
|
202
202
|
}
|