hoffmation-base 3.0.0-alpha.7 → 3.0.0-alpha.9

package/lib/models/command/actuatorSetStateCommand.js

@@ -8,7 +8,7 @@ class ActuatorSetStateCommand extends baseCommand_1.BaseCommand {
         super(source, reason);
         this.on = on;
         this.timeout = timeout;
-        this._commandType = commandType_1.CommandType.ShutterSetLevelCommand;
+        this._commandType = commandType_1.CommandType.ActuatorSetStateCommand;
     }
     get logMessage() {
         return `Actuator setState to ${this.on} for reason: ${this.reasonTrace}`;

package/lib/models/rooms/RoomBase.js

@@ -115,7 +115,7 @@ class RoomBase {
         }
         if (c.movementDependant && this.PraesenzGroup && !((_a = this.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent())) {
             this.log(logLevel_1.LogLevel.Trace, 'Turn off lights as no-one is present.');
-            this.LightGroup.switchAll(new command_1.ActuatorSetStateCommand(c, false, 'Room.setLightTimeBased but no one is present'));
+            this.LightGroup.switchAll(new command_1.ActuatorSetStateCommand(c, false, 'No one is present --> Turn off lights.'));
             return;
         }
         if (!this.settings.lampOffset && !this.settings.roomIsAlwaysDark) {

package/lib/server/devices/zigbee/BaseDevices/zigbeeDimmer.js

@@ -62,7 +62,7 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
         this.setLight(models_1.DimmerSetLightCommand.byTimeBased(this.settings, c));
     }
     setActuator(c) {
-        this.setLight(new models_1.DimmerSetLightCommand(c, c.on, 'Set dimmer due to set ActuactorCommand', c.timeout));
+        this.setLight(new models_1.DimmerSetLightCommand(c, c.on, '', c.timeout));
     }
     toggleActuator(c) {
         const setActuatorCommand = models_1.ActuatorSetStateCommand.byActuatorAndToggleCommand(this, c);
@@ -92,16 +92,16 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
         if (c.on && c.brightness <= 0 && this.brightness < 10) {
             c.brightness = 10;
         }
-        this.log(models_1.LogLevel.Debug, c.logMessage, services_1.LogDebugType.SetActuator);
         if (c.timeout > -1 && !dontBlock) {
             this.blockAutomationHandler.disableAutomatic(c.timeout, models_1.CollisionSolving.overrideIfGreater);
         }
         if (((_a = services_1.SettingsService.settings.ioBroker) === null || _a === void 0 ? void 0 : _a.useZigbee2mqtt) && !c.on) {
             // With zigbee2mqtt to turn on only setting brighness>0 is needed, so we need state only for turning off
-            this.writeActuatorStateToDevice(new models_1.ActuatorWriteStateToDeviceCommand(c, c.on, 'Set dimmer due to set ActuactorCommand'));
+            this.writeActuatorStateToDevice(new models_1.ActuatorWriteStateToDeviceCommand(c, c.on));
             this.queuedValue = c.on;
             return;
         }
+        this.log(models_1.LogLevel.Debug, c.logMessage, services_1.LogDebugType.SetActuator);
         if (c.brightness >= this.settings.turnOnThreshhold) {
             this.setBrightnessState(c.brightness);
             return;

package/lib/server/devices/zigbee/BaseDevices/zigbeeLedRGBCCT.d.ts

@@ -1,5 +1,5 @@
 import { DeviceType } from '../../deviceType';
-import { LampSetTimeBasedCommand, LedSetLightCommand, LedSettings } from '../../../../models';
+import { ActuatorSetStateCommand, LampSetTimeBasedCommand, LedSetLightCommand, LedSettings } from '../../../../models';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { iLedRgbCct } from '../../baseDeviceInterfaces/iLedRgbCct';
 import { ZigbeeDimmer } from './zigbeeDimmer';
@@ -20,6 +20,7 @@ export declare abstract class ZigbeeLedRGBCCT extends ZigbeeDimmer implements iL
      * @inheritDoc
      */
     setTimeBased(c: LampSetTimeBasedCommand): void;
+    setActuator(c: ActuatorSetStateCommand): void;
     /**
      * @inheritDoc
      */

package/lib/server/devices/zigbee/BaseDevices/zigbeeLedRGBCCT.js

@@ -41,6 +41,9 @@ class ZigbeeLedRGBCCT extends zigbeeDimmer_1.ZigbeeDimmer {
     setTimeBased(c) {
         this.setLight(models_1.LedSetLightCommand.byTimeBased(this.settings, c));
     }
+    setActuator(c) {
+        this.setLight(new models_1.LedSetLightCommand(c, c.on, '', c.timeout));
+    }
     /**
      * @inheritDoc
      */