@switchbot/homebridge-switchbot 1.2.5 → 1.2.6-beta.3

package/src/devices/colorbulb.ts

@@ -46,7 +46,10 @@ export class ColorBulb {
 
     // default placeholders
     this.On = false;
+    this.ColorTemperature = 140;
     this.Brightness = 0;
+    this.Saturation = 0;
+    this.Hue = 0;
 
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doColorBulbUpdate = new Subject();
@@ -185,39 +188,41 @@ export class ColorBulb {
       default:
         this.On = false;
     }
-    this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} On: ${this.On}`);
+    this.platform.device(`Color Bulb: ${this.accessory.displayName} On: ${this.On}`);
 
     // Brightness
     this.Brightness = Number(this.deviceStatus.body.brightness);
-    this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
+    this.platform.device(`Color Bulb: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
 
     // Color, Hue & Brightness
     if (this.deviceStatus.body.color) {
-      this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} color: ${JSON.stringify(this.deviceStatus.body.color)}`);
+      this.platform.device(`Color Bulb: ${this.accessory.displayName} color: ${JSON.stringify(this.deviceStatus.body.color)}`);
       const [red, green, blue] = this.deviceStatus.body.color!.split(':');
-      this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} red: ${JSON.stringify(red)}`);
-      this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} green: ${JSON.stringify(green)}`);
-      this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} blue: ${JSON.stringify(blue)}`);
+      this.platform.device(`Color Bulb: ${this.accessory.displayName} red: ${JSON.stringify(red)}`);
+      this.platform.device(`Color Bulb: ${this.accessory.displayName} green: ${JSON.stringify(green)}`);
+      this.platform.device(`Color Bulb: ${this.accessory.displayName} blue: ${JSON.stringify(blue)}`);
 
       const [hue, saturation] = rgb2hs(Number(red), Number(green), Number(blue));
-      this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} hs: ${JSON.stringify(rgb2hs(Number(red), Number(green), Number(blue)))}`);
+      this.platform.device(`Color Bulb: ${this.accessory.displayName} hs: ${JSON.stringify(rgb2hs(Number(red), Number(green), Number(blue)))}`);
 
       // Hue
       this.Hue = hue;
-      this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} Hue: ${this.Hue}`);
+      this.platform.device(`Color Bulb: ${this.accessory.displayName} Hue: ${this.Hue}`);
 
       // Saturation
       this.Saturation = saturation;
-      this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
+      this.platform.device(`Color Bulb: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
     }
 
     // ColorTemperature
-    if (this.deviceStatus.body.colorTemperature) {
-      // Convert mired to kelvin to nearest 100 (Govee seems to need this)
-      const mired = Math.round(1000000 / this.deviceStatus.body.colorTemperature);
+    if (!Number.isNaN(this.deviceStatus.body.colorTemperature)) {
+      this.platform.device(`Color Bulb: ${this.accessory.displayName} OpenAPI ColorTemperature: ${this.deviceStatus.body.colorTemperature}`);
+      const mired = Math.round(1000000 / this.deviceStatus.body.colorTemperature!);
 
       this.ColorTemperature = Number(mired);
-      this.platform.log.warn(`Color Bulb: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
+
+      this.ColorTemperature = Math.max(Math.min(this.ColorTemperature, 500), 140);
+      this.platform.device(`Color Bulb: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
     }
   }
 
@@ -254,33 +259,31 @@ export class ColorBulb {
   async pushChanges() {
     try {
       // Push On Update
+      const payload = {
+        commandType: 'command',
+        parameter: 'default',
+      } as payload;
+
       if (this.On) {
-        const payload = {
-          commandType: 'command',
-          parameter: 'default',
-        } as payload;
+        payload.command = 'turnOn';
+      } else {
+        payload.command = 'turnOff';
+      }
 
-        if (this.On) {
-          payload.command = 'turnOn';
-        } else {
-          payload.command = 'turnOff';
-        }
+      this.platform.log.info(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
+        + ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
 
-        this.platform.log.info(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
-          + ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
-
-        // Make the API request
-        const push: any = (await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload));
-        this.platform.debug(`Color Bulb: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
-        this.statusCode(push);
-      }
+      // Make the API request
+      const push: any = (await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload));
+      this.platform.debug(`Color Bulb: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
+      this.statusCode(push);
 
       // Push Brightness Update
       if (this.On) {
         const payload = {
           commandType: 'command',
           command: 'setBrightness',
-          parameter: `{${this.Brightness}}`,
+          parameter: `${this.Brightness}`,
         } as payload;
 
         this.platform.log.info(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
@@ -299,7 +302,7 @@ export class ColorBulb {
         const payload = {
           commandType: 'command',
           command: 'setColorTemperature',
-          parameter: `{${kelvin}}`,
+          parameter: `${kelvin}`,
         } as payload;
 
         this.platform.log.info(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
@@ -313,16 +316,16 @@ export class ColorBulb {
 
       // Push Hue & Saturation Update
       if (this.On) {
-        this.platform.log.warn(JSON.stringify(this.Hue));
-        this.platform.log.warn(JSON.stringify(this.Saturation));
+        this.platform.device(`Color Bulb: ${this.accessory.displayName} Hue: ${JSON.stringify(this.Hue)}`);
+        this.platform.device(`Color Bulb: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.Saturation)}`);
 
         const [red, green, blue] = hs2rgb(Number(this.Hue), Number(this.Saturation));
-        this.platform.log.error(`Color Bulb: ${this.accessory.displayName} rgb: ${JSON.stringify([red, green, blue])}`);
+        this.platform.device(`Color Bulb: ${this.accessory.displayName} rgb: ${JSON.stringify([red, green, blue])}`);
 
         const payload = {
           commandType: 'command',
           command: 'setColor',
-          parameter: `{${red}}:{${green}}:{${blue}}`,
+          parameter: `${red}:${green}:${blue}`,
         } as payload;
 
         this.platform.log.info(`Color Bulb: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
@@ -364,7 +367,7 @@ export class ColorBulb {
     if (this.ColorTemperature === undefined) {
       this.platform.debug(`Color Bulb: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
     } else {
-      this.service.updateCharacteristic(this.platform.Characteristic.Brightness, this.ColorTemperature);
+      this.service.updateCharacteristic(this.platform.Characteristic.ColorTemperature, this.ColorTemperature);
       this.platform.debug(`Color Bulb: ${this.accessory.displayName} updateCharacteristic ColorTemperature: ${this.ColorTemperature}`);
     }
     if (this.Hue === undefined) {

package/src/devices/curtains.ts

@@ -491,29 +491,34 @@ export class Curtain {
   }
 
   private async BLEpushChanges() {
-    this.platform.debug(`Curtain: ${this.accessory.displayName} BLE pushChanges`);
-    const switchbot = this.connectBLE();
-    switchbot.discover({ model: 'c', quick: true, id: this.device.bleMac }).then((device_list) => {
-      this.platform.log.info(`${this.accessory.displayName} Target Position: ${this.TargetPosition}`);
-      return device_list[0].runToPos(100 - Number(this.TargetPosition));
-    }).then(() => {
-      this.platform.device(`Curtain: ${this.accessory.displayName} Done.`);
-    }).catch(async (e: any) => {
-      this.platform.log.error(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
-      if (this.deviceDebug) {
-        this.platform.log.error(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
-          + ` Error Message: ${JSON.stringify(e.message)}`);
-      }
-      if (this.debugDebug) {
-        this.platform.log.error(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
-          + ` Error: ${JSON.stringify(e)}`);
-      }
-      if (this.platform.config.credentials?.openToken) {
-        this.platform.log.warn(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
-        await this.OpenAPIpushChanges();
-      }
-      this.apiError(e);
-    });
+    if (this.TargetPosition !== this.CurrentPosition) {
+      this.platform.debug(`Curtain: ${this.accessory.displayName} BLE pushChanges`);
+      const switchbot = this.connectBLE();
+      switchbot.discover({ model: 'c', quick: true, id: this.device.bleMac }).then((device_list) => {
+        this.platform.log.info(`${this.accessory.displayName} Target Position: ${this.TargetPosition}`);
+        return device_list[0].runToPos(100 - Number(this.TargetPosition));
+      }).then(() => {
+        this.platform.device(`Curtain: ${this.accessory.displayName} Done.`);
+      }).catch(async (e: any) => {
+        this.platform.log.error(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
+        if (this.deviceDebug) {
+          this.platform.log.error(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+            + ` Error Message: ${JSON.stringify(e.message)}`);
+        }
+        if (this.debugDebug) {
+          this.platform.log.error(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection,`
+            + ` Error: ${JSON.stringify(e)}`);
+        }
+        if (this.platform.config.credentials?.openToken) {
+          this.platform.log.warn(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
+          await this.OpenAPIpushChanges();
+        }
+        this.apiError(e);
+      });
+    } else {
+      this.platform.debug(`Curtain: ${this.accessory.displayName} No BLE Changes, CurrentPosition & TargetPosition Are the Same.`
+      + `  CurrentPosition: ${this.CurrentPosition}, TargetPosition  ${this.TargetPosition}`);
+    }
   }
 
   private async OpenAPIpushChanges() {
@@ -536,6 +541,9 @@ export class Curtain {
           const push: any = (await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId!}/commands`, payload));
           this.platform.debug(`Curtain: ${this.accessory.displayName} pushchanges: ${JSON.stringify(push.data)}`);
           this.statusCode(push);
+        } else {
+          this.platform.debug(`Curtain: ${this.accessory.displayName} No OpenAPI Changes, CurrentPosition & TargetPosition Are the Same.`
+        + `  CurrentPosition: ${this.CurrentPosition}, TargetPosition  ${this.TargetPosition}`);
         }
       } catch (e: any) {
         this.platform.log.error(`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);

package/src/irdevices/airconditioners.ts

@@ -14,18 +14,15 @@ export class AirConditioner {
 
   // Characteristic Values
   Active!: CharacteristicValue;
-  ARActive!: CharacteristicValue;
   RotationSpeed!: CharacteristicValue;
-  CurrentARTemp!: CharacteristicValue;
-  CurrentARMode!: CharacteristicValue;
   LastTemperature!: CharacteristicValue;
-  CurrentARFanSpeed!: CharacteristicValue;
   CurrentTemperature!: CharacteristicValue;
   TargetHeaterCoolerState?: CharacteristicValue;
   CurrentHeaterCoolerState!: CharacteristicValue;
   HeatingThresholdTemperature?: CharacteristicValue;
 
   // Others
+  state!: string;
   Busy: any;
   Timeout: any = null;
   CurrentMode!: number;
@@ -158,8 +155,10 @@ export class AirConditioner {
 
     if (value === this.platform.Characteristic.Active.INACTIVE) {
       this.pushAirConditionerOffChanges();
+      this.platform.device(`Air Conditioner: ${this.accessory.displayName} pushAirConditionerOffChanges, Active: ${this.Active}`);
     } else {
       this.pushAirConditionerOnChanges();
+      this.platform.device(`Air Conditioner: ${this.accessory.displayName} pushAirConditionerOffChanges, Active: ${this.Active}`);
     }
     this.Active = value;
   }
@@ -180,7 +179,7 @@ export class AirConditioner {
     if (this.CurrentTemperature === undefined) {
       this.platform.debug(`Air Conditioner: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
     } else {
-      this.service?.updateCharacteristic(this.platform.Characteristic.Active, this.CurrentTemperature);
+      this.service?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.CurrentTemperature);
       this.platform.device(`Air Conditioner: ${this.accessory.displayName} updateCharacteristic CurrentTemperature: ${this.CurrentTemperature}`);
     }
     if (this.TargetHeaterCoolerState === undefined) {
@@ -207,9 +206,8 @@ export class AirConditioner {
   }
 
   private CurrentTemperatureGet(value: CharacteristicValue) {
-    this.platform.debug('Trigger Get CurrentTemperture');
-
     value = Number(this.CurrentTemperature) || 24;
+    this.platform.debug(`Air Conditioner: ${this.accessory.displayName} Trigger Get CurrentTemperature: ${value}` );
 
     this.service
       .getCharacteristic(this.platform.Characteristic.CurrentTemperature)
@@ -236,7 +234,7 @@ export class AirConditioner {
   }
 
   private CurrentHeaterCoolerStateGet() {
-    if (this.Active === 1) {
+    if (this.Active === this.platform.Characteristic.Active.ACTIVE) {
       if ((this.CurrentTemperature || 24) < (this.LastTemperature || 30)) {
         this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.COOLING;
       } else {
@@ -273,7 +271,7 @@ export class AirConditioner {
    * AirConditioner:        "command"       "highSpeed"      "default"	        =        fan speed to high
    */
   async pushAirConditionerOnChanges() {
-    if (this.Active !== 1) {
+    if (this.Active !== this.platform.Characteristic.Active.ACTIVE) {
       const payload = {
         commandType: 'command',
         parameter: 'default',
@@ -284,7 +282,7 @@ export class AirConditioner {
   }
 
   async pushAirConditionerOffChanges() {
-    if (this.Active !== 0) {
+    if (this.Active !== this.platform.Characteristic.Active.INACTIVE) {
       const payload = {
         commandType: 'command',
         parameter: 'default',
@@ -311,14 +309,25 @@ export class AirConditioner {
       command: 'setAll',
     } as any;
 
-    this.CurrentARTemp = this.CurrentTemperature || 24;
-    this.CurrentARMode = this.CurrentMode || 1;
-    this.CurrentARFanSpeed = this.CurrentFanSpeed || 1;
-    this.ARActive = this.Active === 1 ? 'on' : 'off';
-    payload.parameter = `${this.CurrentARTemp},${this.CurrentARMode},${this.CurrentARFanSpeed},${this.ARActive}`;
+    if (this.CurrentTemperature === undefined) {
+      this.CurrentTemperature = 24;
+    }
+    if (this.CurrentMode === undefined) {
+      this.CurrentMode = 1;
+    }
+    if (this.CurrentFanSpeed === undefined) {
+      this.CurrentFanSpeed = 1;
+    }
+    this.Active = this.platform.Characteristic.Active.ACTIVE;
+    if (this.Active === this.platform.Characteristic.Active.ACTIVE) {
+      this.state = 'on';
+    } else {
+      this.state = 'off';
+    }
+    payload.parameter = `${this.CurrentTemperature},${this.CurrentMode},${this.CurrentFanSpeed},${this.state}`;
 
 
-    if (this.Active === 1) {
+    if (this.Active === this.platform.Characteristic.Active.ACTIVE) {
       if ((this.CurrentTemperature || 24) < (this.LastTemperature || 30)) {
         this.CurrentHeaterCoolerState = this.platform.Characteristic.CurrentHeaterCoolerState.COOLING;
       } else {
@@ -334,11 +343,11 @@ export class AirConditioner {
   public async pushChanges(payload: payload) {
     try {
       this.platform.log.info(`Air Conditioner: ${this.accessory.displayName} Sending request to SwitchBot API. command: ${payload.command},`
-        + ` parameter: ${payload.parameter}, commandType: ${payload.commandType}`);
+        + ` parameter: [${payload.parameter}], commandType: ${payload.commandType}`);
 
       // Make the API request
-      const push = await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload);
-      this.platform.debug(`Air Conditioner: ${this.accessory.displayName} pushChanges: ${push.data}`);
+      const push: any = await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload);
+      this.platform.log.error(`Air Conditioner: ${this.accessory.displayName} pushChanges: ${JSON.stringify(push.data)}`);
       this.statusCode(push);
       this.updateHomeKitCharacteristics();
     } catch (e: any) {

package/src/platform.ts

@@ -1451,6 +1451,8 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
   device(...log: any[]) {
     if (this.config.options!.debug === 'device') {
       this.log.warn('[DEVICE]', String(...log));
+    } else if (this.config.options!.debug === 'debug') {
+      this.log.info('[DEBUG]', String(...log));
     } else {
       this.log.debug(String(...log));
     }