hoffmation-base 3.0.0-alpha.10 → 3.0.0-alpha.11
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.
|
@@ -70,7 +70,7 @@ class LightGroup extends base_group_1.BaseGroup {
|
|
|
70
70
|
switchAll(c) {
|
|
71
71
|
this.getAllAsActuator().forEach((a) => {
|
|
72
72
|
if (a.settings.includeInAmbientLight && !c.isForceAction && !c.on && this._ambientLightOn) {
|
|
73
|
-
a.log(models_1.LogLevel.Info, `Ambient light mode is active --> Skip non force light off command in ${this.roomName}`);
|
|
73
|
+
a.log(models_1.LogLevel.Info, `Ambient light mode is active --> Skip non force light off command in ${this.roomName}; command: ${c.logMessage}`);
|
|
74
74
|
return;
|
|
75
75
|
}
|
|
76
76
|
a.setActuator(c);
|
|
@@ -59,14 +59,14 @@ class ZigbeeLedRGBCCT extends zigbeeDimmer_1.ZigbeeDimmer {
|
|
|
59
59
|
if (c.on && c.brightness === -1 && this.brightness < 10) {
|
|
60
60
|
c.brightness = 10;
|
|
61
61
|
}
|
|
62
|
+
super.setLight(c);
|
|
62
63
|
const formattedColor = services_1.Utils.formatHex(c.color);
|
|
63
|
-
if (formattedColor !== null && c.on) {
|
|
64
|
+
if (formattedColor !== null && c.on && (c.color !== this.color || c.isForceAction)) {
|
|
64
65
|
this.setState(this._stateIdColor, formattedColor);
|
|
65
66
|
}
|
|
66
|
-
if (c.colorTemp > -1 && c.on) {
|
|
67
|
+
if (c.colorTemp > -1 && c.on && (c.colorTemp !== this.colortemp || c.isForceAction)) {
|
|
67
68
|
this.setState(this._stateIdColorTemp, c.colorTemp);
|
|
68
69
|
}
|
|
69
|
-
super.setLight(c);
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
exports.ZigbeeLedRGBCCT = ZigbeeLedRGBCCT;
|
|
@@ -77,7 +77,7 @@ class OwnGoveeDevice {
|
|
|
77
77
|
}
|
|
78
78
|
log(level, message, debugType = log_service_1.LogDebugType.None) {
|
|
79
79
|
var _a, _b;
|
|
80
|
-
log_service_1.ServerLogService.writeLog(level,
|
|
80
|
+
log_service_1.ServerLogService.writeLog(level, message, {
|
|
81
81
|
debugType: debugType,
|
|
82
82
|
room: (_b = (_a = this._room) === null || _a === void 0 ? void 0 : _a.roomName) !== null && _b !== void 0 ? _b : '',
|
|
83
83
|
deviceId: this.name,
|