hoffmation-base 2.22.10 → 2.22.11

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

@@ -41,4 +41,5 @@ export declare abstract class ZigbeeDimmer extends ZigbeeDevice implements iDimm
     setLight(pValue: boolean, timeout?: number, force?: boolean, brightness?: number, transitionTime?: number): void;
     persist(): void;
     toggleLight(time?: TimeOfDay, force?: boolean, calculateTime?: boolean): boolean;
+    private setBrightnessState;
 }

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

@@ -106,7 +106,7 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
         if (sharedFunctions_1.LampUtils.checkBlockActive(this, force, pValue)) {
             return;
         }
-        if (pValue && brightness === -1 && this.brightness < 10) {
+        if (pValue && brightness <= 0 && this.brightness < 10) {
             brightness = 10;
         }
         this.log(models_1.LogLevel.Debug, `Set Light Acutator to "${pValue}" with brightness ${brightness}`, services_1.LogDebugType.SetActuator);
@@ -120,13 +120,13 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
             return;
         }
         if (brightness >= this.settings.turnOnThreshhold) {
-            this.setState(this._stateIdBrightness, brightness);
+            this.setBrightnessState(brightness);
             return;
         }
-        this.setState(this._stateIdBrightness, this.settings.turnOnThreshhold, () => {
+        this.setBrightnessState(this.settings.turnOnThreshhold, () => {
             services_1.Utils.guardedTimeout(() => {
                 this.log(models_1.LogLevel.Info, `Delayed reduced brightness on ${this.info.customName}`);
-                this.setState(this._stateIdBrightness, brightness);
+                this.setBrightnessState(brightness);
             }, 1000, this);
         });
     }
@@ -142,5 +142,8 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
     toggleLight(time, force = false, calculateTime = false) {
         return sharedFunctions_1.LampUtils.toggleLight(this, time, force, calculateTime);
     }
+    setBrightnessState(brightness, onSuccess) {
+        this.setState(this._stateIdBrightness, Math.max(0, Math.min(brightness, 100)), onSuccess);
+    }
 }
 exports.ZigbeeDimmer = ZigbeeDimmer;

package/lib/server/services/govee/govee-service.js

@@ -15,6 +15,9 @@ class GooveeService {
             discover: true,
             discoverInterval: 300000,
         });
+        this.goveeApi.on(govee_lan_controller_1.GoveeEventTypes.Scan, (data) => {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `GoveeDevice ${data.ip} scanned`);
+        });
         this.goveeApi.on(govee_lan_controller_1.GoveeEventTypes.Ready, () => {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Govee ready`);
         });
@@ -25,6 +28,13 @@ class GooveeService {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `GoveeDevice ${device.id} joined`);
             GooveeService.initializeDevice(device);
         });
+        this.goveeApi.on(govee_lan_controller_1.GoveeEventTypes.UnknownDevice, (_data) => {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `GoveeDevice unknown`);
+        });
+        this.goveeApi.on(govee_lan_controller_1.GoveeEventTypes.UnknownMessage, (data) => {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `GoveeDevice unknown message: ${data}`);
+        });
+        this.goveeApi.discover();
     }
     static initializeDevice(d) {
         this.devicesDict[d.id] = d;