@switchbot/homebridge-switchbot 1.2.0 → 1.2.1-beta.3

package/src/devices/curtains.ts

@@ -21,13 +21,8 @@ export class Curtain {
 
   // OpenAPI Others
   deviceStatus!: deviceStatusResponse;
-  setNewTarget!: boolean;
-  setNewTargetTimer!: NodeJS.Timeout;
 
   // BLE Others
-  set_minLux!: number;
-  set_maxLux!: number;
-  spaceBetweenLevels!: number;
   switchbot!: switchbot;
   serviceData!: serviceData;
   calibration: serviceData['calibration'];
@@ -35,9 +30,16 @@ export class Curtain {
   position: serviceData['position'];
   lightLevel: serviceData['lightLevel'];
 
+  // Target
+  setNewTarget!: boolean;
+  setNewTargetTimer!: NodeJS.Timeout;
+
   // Config
   set_minStep!: number;
   refreshRate!: number;
+  set_minLux!: number;
+  set_maxLux!: number;
+  spaceBetweenLevels!: number;
   private readonly deviceDebug = this.platform.config.options?.debug === 'device' || this.platform.debugMode;
   private readonly debugDebug = this.platform.config.options?.debug === 'debug' || this.platform.debugMode;
 
@@ -245,6 +247,7 @@ export class Curtain {
 
   private async BLEparseStatus() {
     this.platform.debug(`Curtain: ${this.accessory.displayName} BLE parseStatus`);
+    this.setMinMax();
     this.CurrentPosition = 100 - Number(this.position);
     this.platform.debug(`Curtain: ${this.accessory.displayName} CurrentPosition ${this.CurrentPosition}`);
     if (this.setNewTarget) {
@@ -340,6 +343,7 @@ export class Curtain {
     if (this.platform.config.credentials?.openToken) {
       this.platform.debug(`Curtain: ${this.accessory.displayName} OpenAPI parseStatus`);
       // CurrentPosition
+      this.setMinMax();
       this.CurrentPosition = 100 - this.deviceStatus.body.slidePosition!;
       this.platform.debug(`Curtain ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition}`);
       if (this.setNewTarget) {
@@ -433,6 +437,7 @@ export class Curtain {
         this.platform.log.warn(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
         await this.openAPIRefreshStatus();
       }
+      this.apiError(e);
     });
   }
 
@@ -490,6 +495,7 @@ export class Curtain {
         this.platform.log.warn(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
         await this.OpenAPIpushChanges();
       }
+      this.apiError(e);
     });
   }
 
@@ -524,6 +530,7 @@ export class Curtain {
           this.platform.log.error(`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,`
             + ` Error: ${JSON.stringify(e)}`);
         }
+        this.apiError(e);
       }
     }
   }
@@ -626,17 +633,18 @@ export class Curtain {
     if (value > this.CurrentPosition) {
       this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
       this.setNewTarget = true;
-      //this.setMinMax();
+      this.platform.debug(`Curtain: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
     } else if (value < this.CurrentPosition) {
       this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
       this.setNewTarget = true;
-      //this.setMinMax();
+      this.platform.debug(`Curtain: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
     } else {
       this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
       this.setNewTarget = false;
-      //this.setMinMax();
+      this.platform.debug(`Curtain: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
     }
     this.service.setCharacteristic(this.platform.Characteristic.PositionState, this.PositionState);
+    this.service.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
 
     /**
    * If Curtain movement time is short, the moving flag from backend is always false.

package/src/devices/humidifiers.ts

@@ -340,6 +340,7 @@ export class Humidifier {
         this.platform.log.warn(`Humidifier: ${this.accessory.displayName} Using OpenAPI Connection`);
         await this.openAPIRefreshStatus();
       }
+      this.apiError(e);
     });
   }
 
@@ -387,7 +388,7 @@ export class Humidifier {
     const switchbot = this.connectBLE();
     switchbot.discover({ model: 'e', quick: true, id: this.device.bleMac }).then((device_list) => {
       this.platform.log.info(`${this.accessory.displayName} Target Position: ${this.Active}`);
-      return device_list[0].runToPos(100 - Number(this.Active));
+      return device_list[0].percentage(this.RelativeHumidityHumidifierThreshold);
     }).then(() => {
       this.platform.device(`Humidifier: ${this.accessory.displayName} Done.`);
     }).catch(async (e: any) => {
@@ -404,6 +405,7 @@ export class Humidifier {
         this.platform.log.warn(`Humidifier: ${this.accessory.displayName} Using OpenAPI Connection`);
         await this.OpenAPIpushChanges();
       }
+      this.apiError(e);
     });
   }
 

package/src/devices/meters.ts

@@ -291,6 +291,7 @@ export class Meter {
         this.platform.log.warn(`Meter: ${this.accessory.displayName} Using OpenAPI Connection`);
         await this.openAPIRefreshStatus();
       }
+      this.apiError(e);
     });
   }
 

package/src/devices/motion.ts

@@ -210,6 +210,7 @@ export class Motion {
         this.platform.log.warn(`Motion Sensor: ${this.accessory.displayName} Using OpenAPI Connection`);
         await this.openAPIRefreshStatus();
       }
+      this.apiError(e);
     });
   }
 

package/src/irdevices/airconditioners.ts

@@ -373,8 +373,8 @@ export class AirConditioner {
         this.platform.log.error(`Air Conditioner: ${this.accessory.displayName} Hub Device is offline.`);
         break;
       case 190:
-        this.platform.log.error(`Air Conditioner: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,`
-          + ` Or command: ${JSON.stringify(push.data)} format is invalid`);
+        this.platform.log.error(`Air Conditioner: ${this.accessory.displayName} Device internal error due to device states not synchronized`
+          + ` with server, Or command: ${JSON.stringify(push.data)} format is invalid`);
         break;
       case 100:
         this.platform.debug(`Air Conditioner: ${this.accessory.displayName} Command successfully sent.`);

package/src/irdevices/airpurifiers.ts

@@ -242,8 +242,8 @@ export class AirPurifier {
         this.platform.log.error(`Air Purifier: ${this.accessory.displayName} Hub Device is offline.`);
         break;
       case 190:
-        this.platform.log.error(`Air Purifier: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,`
-          + ` Or command: ${JSON.stringify(push.data)} format is invalid`);
+        this.platform.log.error(`Air Purifier: ${this.accessory.displayName} Device internal error due to device states not synchronized`
+          + ` with server, Or command: ${JSON.stringify(push.data)} format is invalid`);
         break;
       case 100:
         this.platform.debug(`Air Purifier: ${this.accessory.displayName} Command successfully sent.`);

package/src/irdevices/cameras.ts

@@ -142,8 +142,8 @@ export class Camera {
         this.platform.log.error(`Camera: ${this.accessory.displayName} Hub Device is offline.`);
         break;
       case 190:
-        this.platform.log.error(`Camera: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,`
-          + ` Or command: ${JSON.stringify(push.data)} format is invalid`);
+        this.platform.log.error(`Camera: ${this.accessory.displayName} Device internal error due to device states not synchronized`
+          + ` with server, Or command: ${JSON.stringify(push.data)} format is invalid`);
         break;
       case 100:
         this.platform.debug(`Camera: ${this.accessory.displayName} Command successfully sent.`);

package/src/irdevices/fans.ts

@@ -264,8 +264,8 @@ export class Fan {
         this.platform.log.error(`Fan: ${this.accessory.displayName} Hub Device is offline.`);
         break;
       case 190:
-        this.platform.log.error(`Fan: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,`
-          + ` Or command: ${JSON.stringify(push.data)} format is invalid`);
+        this.platform.log.error(`Fan: ${this.accessory.displayName} Device internal error due to device states not synchronized`
+          + ` with server, Or command: ${JSON.stringify(push.data)} format is invalid`);
         break;
       case 100:
         this.platform.debug(`Fan: ${this.accessory.displayName} Command successfully sent.`);

package/src/irdevices/lights.ts

@@ -176,8 +176,8 @@ export class Light {
         this.platform.log.error(`Light: ${this.accessory.displayName} Hub Device is offline.`);
         break;
       case 190:
-        this.platform.log.error(`Light: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,`
-          + ` Or command: ${JSON.stringify(push.data)} format is invalid`);
+        this.platform.log.error(`Light: ${this.accessory.displayName} Device internal error due to device states not synchronized`
+          + ` with server, Or command: ${JSON.stringify(push.data)} format is invalid`);
         break;
       case 100:
         this.platform.debug(`Light: ${this.accessory.displayName} Command successfully sent.`);

package/src/irdevices/others.ts

@@ -163,8 +163,8 @@ export class Others {
         this.platform.log.error(`Other: ${this.accessory.displayName} Hub Device is offline.`);
         break;
       case 190:
-        this.platform.log.error(`Other: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,`
-          + ` Or command: ${JSON.stringify(push.data)} format is invalid`);
+        this.platform.log.error(`Other: ${this.accessory.displayName} Device internal error due to device states not synchronized`
+          + ` with server, Or command: ${JSON.stringify(push.data)} format is invalid`);
         break;
       case 100:
         this.platform.debug(`Other: ${this.accessory.displayName} Command successfully sent.`);

package/src/irdevices/waterheaters.ts

@@ -156,8 +156,8 @@ export class WaterHeater {
         this.platform.log.error(`Water Heater: ${this.accessory.displayName} Hub Device is offline.`);
         break;
       case 190:
-        this.platform.log.error(`Water Heater: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,`
-          + ` Or command: ${JSON.stringify(push.data)} format is invalid`);
+        this.platform.log.error(`Water Heater: ${this.accessory.displayName} Device internal error due to device states not synchronized`
+          + ` with server, Or command: ${JSON.stringify(push.data)} format is invalid`);
         break;
       case 100:
         this.platform.debug(`Water Heater: ${this.accessory.displayName} Command successfully sent.`);