@switchbot/homebridge-switchbot 2.2.2-beta.12 → 2.2.2-beta.14

package/src/device/colorbulb.ts

@@ -392,7 +392,7 @@ export class ColorBulb {
             if (this.serviceData) {
               this.connected = true;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
-              //await this.stopScanning({ switchbot });
+              //await this.stopScanning({ switchbot: { switchbot } });
             } else {
               this.connected = false;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
@@ -403,7 +403,7 @@ export class ColorBulb {
         })
         .then(async () => {
         // Stop to monitor
-          await this.stopScanning({ switchbot });
+          await this.stopScanning({ switchbot: { switchbot } });
         })
         .catch(async (e: any) => {
           this.apiError(e);

package/src/device/contact.ts

@@ -323,7 +323,7 @@ export class Contact {
             if (this.serviceData) {
               this.connected = true;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
-              await this.stopScanning({ switchbot });
+              await this.stopScanning({ switchbot: { switchbot } });
             } else {
               this.connected = false;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
@@ -334,7 +334,7 @@ export class Contact {
         })
         .then(async () => {
           // Stop to monitor
-          await this.stopScanning({ switchbot });
+          await this.stopScanning({ switchbot: { switchbot } });
         })
         .catch(async (e: any) => {
           this.apiError(e);

package/src/device/curtain.ts

@@ -441,7 +441,7 @@ export class Curtain {
             if (this.serviceData) {
               this.connected = true;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
-              await this.stopScanning({ switchbot });
+              await this.stopScanning({ switchbot: { switchbot } });
             } else {
               this.connected = false;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
@@ -452,7 +452,7 @@ export class Curtain {
         })
         .then(async () => {
           // Stop to monitor
-          await this.stopScanning({ switchbot });
+          await this.stopScanning({ switchbot: { switchbot } });
         })
         .catch(async (e: any) => {
           this.apiError(e);

package/src/device/humidifier.ts

@@ -331,7 +331,7 @@ export class Humidifier {
             if (this.serviceData) {
               this.connected = true;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
-              await this.stopScanning({ switchbot });
+              await this.stopScanning({ switchbot: { switchbot } });
             } else {
               this.connected = false;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
@@ -342,7 +342,7 @@ export class Humidifier {
         })
         .then(async () => {
           // Stop to monitor
-          await this.stopScanning({ switchbot });
+          await this.stopScanning({ switchbot: { switchbot } });
         })
         .catch(async (e: any) => {
           this.apiError(e);

package/src/device/meter.ts

@@ -291,7 +291,7 @@ export class Meter {
             if (this.serviceData) {
               this.connected = true;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
-              await this.stopScanning({ switchbot });
+              await this.stopScanning({ switchbot: { switchbot } });
             } else {
               this.connected = false;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
@@ -302,7 +302,7 @@ export class Meter {
         })
         .then(async () => {
           // Stop to monitor
-          await this.stopScanning({ switchbot });
+          await this.stopScanning({ switchbot: { switchbot } });
         })
         .catch(async (e: any) => {
           this.apiError(e);

package/src/device/meterplus.ts

@@ -291,7 +291,7 @@ export class MeterPlus {
             if (this.serviceData) {
               this.connected = true;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
-              await this.stopScanning({ switchbot });
+              await this.stopScanning({ switchbot: { switchbot } });
             } else {
               this.connected = false;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
@@ -302,7 +302,7 @@ export class MeterPlus {
         })
         .then(async () => {
           // Stop to monitor
-          await this.stopScanning({ switchbot });
+          await this.stopScanning({ switchbot: { switchbot } });
         })
         .catch(async (e: any) => {
           this.apiError(e);

package/src/device/motion.ts

@@ -277,7 +277,7 @@ export class Motion {
             if (this.serviceData) {
               this.connected = true;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
-              await this.stopScanning({ switchbot });
+              await this.stopScanning({ switchbot: { switchbot } });
             } else {
               this.connected = false;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
@@ -288,7 +288,7 @@ export class Motion {
         })
         .then(async () => {
           // Stop to monitor
-          await this.stopScanning({ switchbot });
+          await this.stopScanning({ switchbot: { switchbot } });
         })
         .catch(async (e: any) => {
           this.apiError(e);

package/src/device/plug.ts

@@ -221,7 +221,7 @@ export class Plug {
             if (this.serviceData) {
               this.connected = true;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
-              await this.stopScanning({ switchbot });
+              await this.stopScanning({ switchbot: { switchbot } });
             } else {
               this.connected = false;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
@@ -232,7 +232,7 @@ export class Plug {
         })
         .then(async () => {
           // Stop to monitor
-          await this.stopScanning({ switchbot });
+          await this.stopScanning({ switchbot: { switchbot } });
         })
         .catch(async (e: any) => {
           this.apiError(e);

package/src/device/striplight.ts

@@ -335,7 +335,7 @@ export class StripLight {
             if (this.serviceData) {
               this.connected = true;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
-              await this.stopScanning({ switchbot });
+              await this.stopScanning({ switchbot: { switchbot } });
             } else {
               this.connected = false;
               this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
@@ -346,7 +346,7 @@ export class StripLight {
         })
         .then(async () => {
         // Stop to monitor
-          await this.stopScanning({ switchbot });
+          await this.stopScanning({ switchbot: { switchbot } });
         })
         .catch(async (e: any) => {
           this.apiError(e);

package/src/irdevice/tv.ts

@@ -197,23 +197,20 @@ export class TV {
   async ActiveIdentifierSet(value: CharacteristicValue): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} ActiveIdentifier: ${value}`);
     this.ActiveIdentifier = value;
-    this.accessory.context.ActiveIdentifier = this.ActiveIdentifier;
   }
 
   async ActiveSet(value: CharacteristicValue): Promise<void> {
     this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Active: ${value}`);
-    if (!this.device.irtv?.disable_power) {
-      if (value === this.platform.Characteristic.Active.INACTIVE) {
-        await this.pushTvOffChanges();
-      } else {
-        await this.pushTvOnChanges();
-      }
-      /**
+    if (value === this.platform.Characteristic.Active.ACTIVE) {
+      await this.pushTvOnChanges();
+    } else {
+      await this.pushTvOffChanges();
+    }
+    /**
        * pushTvOnChanges and pushTvOffChanges above assume they are measuring the state of the accessory BEFORE
        * they are updated, so we are only updating the accessory state after calling the above.
        */
-      this.Active = value;
-    }
+    this.Active = value;
   }
 
   /**
@@ -514,6 +511,11 @@ export class TV {
     } else {
       this.Active = this.accessory.context.Active;
     }
+    if (this.ActiveIdentifier === undefined) {
+      this.ActiveIdentifier = 1;
+    } else {
+      this.ActiveIdentifier = this.accessory.context.ActiveIdentifier;
+    }
   }
 
   async config(device: irdevice & irDevicesConfig): Promise<void> {

package/src/settings.ts

@@ -149,7 +149,7 @@ export interface irDevicesConfig extends irdevice {
   irlight?: Record<any, any>;
   irvc?: Record<any, any>;
   irwh?: Record<any, any>;
-  irtv?: irtv;
+  irtv?: Record<any, any>;
   other?: other;
 }
 
@@ -161,32 +161,10 @@ export type irfan = {
   set_min?: number; //set_min
 };
 
-//For Potential Future Use
-export type set_minStep = {
-  set_minStep_device?: boolean;
-  set_minStep?: number;
-};
-
-//For Potential Future Use
-export type set_max = {
-  set_max_device?: boolean;
-  set_max?: number;
-};
-
-//For Potential Future Use
-export type set_min = {
-  set_min_device?: boolean;
-  set_min?: number;
-};
-
 export type irair = {
   hide_automode?: boolean;
 };
 
-export type irtv = {
-  disable_power?: boolean;
-};
-
 export type other = {
   deviceType?: string;
 };