@switchbot/homebridge-switchbot 1.2.4 → 1.2.6-beta.2

package/src/devices/curtains.ts

@@ -373,14 +373,16 @@ export class Curtain {
         + ` TargetPosition: ${this.TargetPosition}, PositionState: ${this.PositionState},`);
 
       if (!this.device.curtain?.hide_lightsensor) {
+        this.set_minLux = this.minLux();
+        this.set_maxLux = this.maxLux();
         // Brightness
         switch (this.deviceStatus.body.brightness) {
           case 'dim':
-            this.CurrentAmbientLightLevel = 0.0001;
+            this.CurrentAmbientLightLevel = this.set_minLux;
             break;
           case 'bright':
           default:
-            this.CurrentAmbientLightLevel = 100000;
+            this.CurrentAmbientLightLevel = this.set_maxLux;
         }
         this.platform.debug(`Curtain: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
       }
@@ -489,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() {
@@ -534,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));
     }