@switchbot/homebridge-switchbot 2.1.4-beta.0 → 2.2.0-beta.0

package/src/irdevice/tv.ts

@@ -24,14 +24,17 @@ export class TV {
   deviceStatus!: any;
 
   // Config
+  allowPushOn?: boolean;
+  allowPushOff?: boolean;
   deviceLogging!: string;
-  allowPush?: boolean;
 
   constructor(private readonly platform: SwitchBotPlatform, private accessory: PlatformAccessory, public device: irdevice & irDevicesConfig) {
     // default placeholders
     this.logs(device);
     this.config(device);
     this.context();
+    this.allowPushOnChanges({ device });
+    this.allowPushOffChanges({ device });
 
     // set accessory information
     accessory
@@ -227,7 +230,7 @@ export class TV {
    * TV           "command"       "channelSub"      "default"	        previous channel
    */
   async pushTvOnChanges(): Promise<void> {
-    if (this.Active !== 1 || this.allowPush) {
+    if (this.Active !== 1) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const body = superStringify({
@@ -240,16 +243,14 @@ export class TV {
   }
 
   async pushTvOffChanges(): Promise<void> {
-    if (this.Active === 1 || this.allowPush) {
-      const commandType: string = await this.commandType();
-      const command: string = await this.commandOff();
-      const body = superStringify({
-        'command': command,
-        'parameter': 'default',
-        'commandType': commandType,
-      });
-      await this.pushTVChanges(body);
-    }
+    const commandType: string = await this.commandType();
+    const command: string = await this.commandOff();
+    const body = superStringify({
+      'command': command,
+      'parameter': 'default',
+      'commandType': commandType,
+    });
+    await this.pushTVChanges(body);
   }
 
   async pushOkChanges(): Promise<void> {
@@ -405,6 +406,22 @@ export class TV {
     }
   }
 
+  async allowPushOnChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+    if (device.allowPushOn) {
+      this.allowPushOn = true;
+    } else {
+      this.allowPushOn = false;
+    }
+  }
+
+  async allowPushOffChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+    if (device.allowPushOff) {
+      this.allowPushOn = true;
+    } else {
+      this.allowPushOn = false;
+    }
+  }
+
   async commandType(): Promise<string> {
     let commandType: string;
     if (this.device.customize) {
@@ -510,6 +527,21 @@ export class TV {
     if (device.external !== undefined) {
       config['external'] = device.external;
     }
+    if (device.customOn !== undefined) {
+      config['customOn'] = device.customOn;
+    }
+    if (device.customOff !== undefined) {
+      config['customOff'] = device.customOff;
+    }
+    if (device.customize !== undefined) {
+      config['customize'] = device.customize;
+    }
+    if (device.allowPushOn !== undefined) {
+      config['allowPushOn'] = device.allowPushOn;
+    }
+    if (device.allowPushOff !== undefined) {
+      config['allowPushOff'] = device.allowPushOff;
+    }
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }

package/src/irdevice/vacuumcleaner.ts

@@ -19,14 +19,17 @@ export class VacuumCleaner {
   On!: CharacteristicValue;
 
   // Config
+  allowPushOn?: boolean;
+  allowPushOff?: boolean;
   deviceLogging!: string;
-  allowPush?: boolean;
 
   constructor(private readonly platform: SwitchBotPlatform, private accessory: PlatformAccessory, public device: irdevice & irDevicesConfig) {
     // default placeholders
     this.logs(device);
     this.config(device);
     this.context();
+    this.allowPushOnChanges({ device });
+    this.allowPushOffChanges({ device });
 
     // set accessory information
     accessory
@@ -77,7 +80,7 @@ export class VacuumCleaner {
    * Vacuum Cleaner    "command"       "turnOn"       "default"	      set to ON state
    */
   async pushOnChanges(): Promise<void> {
-    if (this.On || this.allowPush) {
+    if (this.On) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const body = superStringify({
@@ -90,7 +93,7 @@ export class VacuumCleaner {
   }
 
   async pushOffChanges(): Promise<void> {
-    if (!this.On || this.allowPush) {
+    if (!this.On) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOff();
       const body = superStringify({
@@ -166,6 +169,22 @@ export class VacuumCleaner {
     }
   }
 
+  async allowPushOnChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+    if (device.allowPushOn) {
+      this.allowPushOn = true;
+    } else {
+      this.allowPushOn = false;
+    }
+  }
+
+  async allowPushOffChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+    if (device.allowPushOff) {
+      this.allowPushOn = true;
+    } else {
+      this.allowPushOn = false;
+    }
+  }
+
   async commandType(): Promise<string> {
     let commandType: string;
     if (this.device.customize) {
@@ -269,6 +288,21 @@ export class VacuumCleaner {
     if (device.external !== undefined) {
       config['external'] = device.external;
     }
+    if (device.customOn !== undefined) {
+      config['customOn'] = device.customOn;
+    }
+    if (device.customOff !== undefined) {
+      config['customOff'] = device.customOff;
+    }
+    if (device.customize !== undefined) {
+      config['customize'] = device.customize;
+    }
+    if (device.allowPushOn !== undefined) {
+      config['allowPushOn'] = device.allowPushOn;
+    }
+    if (device.allowPushOff !== undefined) {
+      config['allowPushOff'] = device.allowPushOff;
+    }
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }

package/src/irdevice/waterheater.ts

@@ -20,14 +20,17 @@ export class WaterHeater {
   Active!: CharacteristicValue;
 
   // Config
+  allowPushOn?: boolean;
+  allowPushOff?: boolean;
   deviceLogging!: string;
-  allowPush?: boolean;
 
   constructor(private readonly platform: SwitchBotPlatform, private accessory: PlatformAccessory, public device: irdevice & irDevicesConfig) {
     // default placeholders
     this.logs({ device });
     this.config({ device });
     this.context();
+    this.allowPushOnChanges({ device });
+    this.allowPushOffChanges({ device });
 
     // set accessory information
     accessory
@@ -83,7 +86,7 @@ export class WaterHeater {
    * WaterHeater     "command"       "turnOn"          "default"	       set to ON state
    */
   async pushWaterHeaterOnChanges(): Promise<void> {
-    if (this.Active !== 1 || this.allowPush) {
+    if (this.Active !== 1) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOn();
       const body = superStringify({
@@ -96,7 +99,7 @@ export class WaterHeater {
   }
 
   async pushWaterHeaterOffChanges(): Promise<void> {
-    if (this.Active !== 0 || this.allowPush) {
+    if (this.Active !== 0) {
       const commandType: string = await this.commandType();
       const command: string = await this.commandOff();
       const body = superStringify({
@@ -174,6 +177,22 @@ export class WaterHeater {
     }
   }
 
+  async allowPushOnChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+    if (device.allowPushOn) {
+      this.allowPushOn = true;
+    } else {
+      this.allowPushOn = false;
+    }
+  }
+
+  async allowPushOffChanges({ device }: { device: irdevice & irDevicesConfig; }): Promise<void> {
+    if (device.allowPushOff) {
+      this.allowPushOn = true;
+    } else {
+      this.allowPushOn = false;
+    }
+  }
+
   async commandType(): Promise<string> {
     let commandType: string;
     if (this.device.customize) {
@@ -279,6 +298,21 @@ export class WaterHeater {
     if (device.external !== undefined) {
       config['external'] = device.external;
     }
+    if (device.customOn !== undefined) {
+      config['customOn'] = device.customOn;
+    }
+    if (device.customOff !== undefined) {
+      config['customOff'] = device.customOff;
+    }
+    if (device.customize !== undefined) {
+      config['customize'] = device.customize;
+    }
+    if (device.allowPushOn !== undefined) {
+      config['allowPushOn'] = device.allowPushOn;
+    }
+    if (device.allowPushOff !== undefined) {
+      config['allowPushOff'] = device.allowPushOff;
+    }
     if (Object.entries(config).length !== 0) {
       this.infoLog({ log: [`${this.device.remoteType}: ${this.accessory.displayName} Config: ${superStringify(config)}`] });
     }

package/src/settings.ts

@@ -131,16 +131,17 @@ export type lock = {
 
 export interface irDevicesConfig extends irdevice {
   configRemoteType?: string;
-  deviceId: string;
+  connectionType?: string;
+  hide_device?: boolean;
   external?: boolean;
   firmware?: string;
+  deviceId: string;
   logging?: string;
-  connectionType?: string;
-  hide_device?: boolean;
-  customize?: boolean;
   customOn?: string;
   customOff?: string;
-  allowPush?: boolean;
+  customize?: boolean;
+  allowPushOn?: boolean;
+  allowPushOff?: boolean;
   irfan?: irfan;
   irair?: irair;
   irpur?: Record<any, any>;
@@ -180,7 +181,6 @@ export type set_min = {
 
 export type irair = {
   hide_automode?: boolean;
-  pushOn?: boolean;
 };
 
 export type irtv = {
@@ -355,6 +355,8 @@ export type serviceData = {
   overload?: boolean;
   //PlugMini - Plug Mini current power value of the load
   currentPower?: number;
+  //Color Bulb's brightness level
+  brightness?: boolean | string;
 };
 
 export type temperature = {