@switchbot/homebridge-switchbot 2.5.2-beta.3 → 2.5.2-beta.5

package/src/device/blindtilt.ts

@@ -302,7 +302,7 @@ export class BlindTilt {
         ` TargetPosition: ${this.TargetPosition}, PositionState: ${this.PositionState},`,
     );
 
-    if (!this.device.curtain?.hide_lightsensor) {
+    if (!this.device.blindTilt?.hide_lightsensor) {
       this.set_minLux = this.minLux();
       this.set_maxLux = this.maxLux();
       this.spaceBetweenLevels = 9;
@@ -423,7 +423,7 @@ export class BlindTilt {
           ` TargetPosition: ${this.TargetPosition}, PositionState: ${this.PositionState},`,
     );
 
-    if (!this.device.curtain?.hide_lightsensor) {
+    if (!this.device.blindTilt?.hide_lightsensor) {
       this.set_minLux = this.minLux();
       this.set_maxLux = this.maxLux();
       // Brightness
@@ -867,7 +867,7 @@ export class BlindTilt {
       this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.TargetPosition, Number(this.TargetPosition));
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: ${this.TargetPosition}`);
     }
-    if (!this.device.curtain?.hide_lightsensor) {
+    if (!this.device.blindTilt?.hide_lightsensor) {
       if (this.CurrentAmbientLightLevel === undefined || Number.isNaN(this.CurrentAmbientLightLevel)) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
       } else {
@@ -937,7 +937,7 @@ export class BlindTilt {
   }
 
   async stopScanning(switchbot: any) {
-    await switchbot.stopScan();
+    switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();
       await this.updateHomeKitCharacteristics();
@@ -981,7 +981,7 @@ export class BlindTilt {
 
   async SilentPerformance() {
     if (this.TargetPosition > 50) {
-      if (this.device.curtain?.setOpenMode === '1') {
+      if (this.device.blindTilt?.setOpenMode === '1') {
         this.setPositionMode = 1;
         this.Mode = 'Silent Mode';
       } else {
@@ -989,7 +989,7 @@ export class BlindTilt {
         this.Mode = 'Performance Mode';
       }
     } else {
-      if (this.device.curtain?.setCloseMode === '1') {
+      if (this.device.blindTilt?.setCloseMode === '1') {
         this.setPositionMode = 1;
         this.Mode = 'Silent Mode';
       } else {
@@ -1017,8 +1017,8 @@ export class BlindTilt {
   }
 
   minStep(device: device & devicesConfig): number {
-    if (device.curtain?.set_minStep) {
-      this.set_minStep = device.curtain?.set_minStep;
+    if (device.blindTilt?.set_minStep) {
+      this.set_minStep = device.blindTilt?.set_minStep;
     } else {
       this.set_minStep = 1;
     }
@@ -1026,8 +1026,8 @@ export class BlindTilt {
   }
 
   minLux(): number {
-    if (this.device.curtain?.set_minLux) {
-      this.set_minLux = this.device.curtain?.set_minLux;
+    if (this.device.blindTilt?.set_minLux) {
+      this.set_minLux = this.device.blindTilt?.set_minLux;
     } else {
       this.set_minLux = 1;
     }
@@ -1035,8 +1035,8 @@ export class BlindTilt {
   }
 
   maxLux(): number {
-    if (this.device.curtain?.set_maxLux) {
-      this.set_maxLux = this.device.curtain?.set_maxLux;
+    if (this.device.blindTilt?.set_maxLux) {
+      this.set_maxLux = this.device.blindTilt?.set_maxLux;
     } else {
       this.set_maxLux = 6001;
     }

package/src/device/bot.ts

@@ -1130,7 +1130,7 @@ export class Bot {
   }
 
   async stopScanning(switchbot: any) {
-    await switchbot.stopScan();
+    switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();
       await this.updateHomeKitCharacteristics();

package/src/device/ceilinglight.ts

@@ -922,7 +922,7 @@ export class CeilingLight {
   }
 
   async stopScanning(switchbot: any) {
-    await switchbot.stopScan();
+    switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();
       await this.updateHomeKitCharacteristics();

package/src/device/colorbulb.ts

@@ -1079,7 +1079,7 @@ export class ColorBulb {
   }
 
   async stopScanning(switchbot: any) {
-    await switchbot.stopScan();
+    switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();
       await this.updateHomeKitCharacteristics();

package/src/device/contact.ts

@@ -470,7 +470,7 @@ export class Contact {
   }
 
   async stopScanning(switchbot: any) {
-    await switchbot.stopScan();
+    switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();
       await this.updateHomeKitCharacteristics();

package/src/device/curtain.ts

@@ -846,7 +846,7 @@ export class Curtain {
   }
 
   async stopScanning(switchbot: any) {
-    await switchbot.stopScan();
+    switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();
       await this.updateHomeKitCharacteristics();

package/src/device/humidifier.ts

@@ -771,7 +771,7 @@ export class Humidifier {
   }
 
   async stopScanning(switchbot: any) {
-    await switchbot.stopScan();
+    switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();
       await this.updateHomeKitCharacteristics();

package/src/device/lock.ts

@@ -513,7 +513,7 @@ export class Lock {
   }
 
   async stopScanning(switchbot: any) {
-    await switchbot.stopScan();
+    switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();
       await this.updateHomeKitCharacteristics();

package/src/device/meter.ts

@@ -495,7 +495,7 @@ export class Meter {
   }
 
   async stopScanning(switchbot: any) {
-    await switchbot.stopScan();
+    switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();
       await this.updateHomeKitCharacteristics();

package/src/device/meterplus.ts

@@ -495,7 +495,7 @@ export class MeterPlus {
   }
 
   async stopScanning(switchbot: any) {
-    await switchbot.stopScan();
+    switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();
       await this.updateHomeKitCharacteristics();

package/src/device/motion.ts

@@ -420,7 +420,7 @@ export class Motion {
   }
 
   async stopScanning(switchbot: any) {
-    await switchbot.stopScan();
+    switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();
       await this.updateHomeKitCharacteristics();

package/src/device/plug.ts

@@ -471,7 +471,7 @@ export class Plug {
   }
 
   async stopScanning(switchbot: any) {
-    await switchbot.stopScan();
+    switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();
       await this.updateHomeKitCharacteristics();

package/src/device/robotvacuumcleaner.ts

@@ -595,7 +595,7 @@ export class RobotVacuumCleaner {
   }
 
   async stopScanning(switchbot: any) {
-    await switchbot.stopScan();
+    switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();
       await this.updateHomeKitCharacteristics();

package/src/device/striplight.ts

@@ -843,7 +843,7 @@ export class StripLight {
   }
 
   async stopScanning(switchbot: any) {
-    await switchbot.stopScan();
+    switchbot.stopScan();
     if (this.connected) {
       await this.BLEparseStatus();
       await this.updateHomeKitCharacteristics();
@@ -909,8 +909,8 @@ export class StripLight {
   }
 
   minStep(device: device & devicesConfig): number {
-    if (device.colorbulb?.set_minStep) {
-      this.set_minStep = device.colorbulb?.set_minStep;
+    if (device.striplight?.set_minStep) {
+      this.set_minStep = device.striplight?.set_minStep;
     } else {
       this.set_minStep = 1;
     }
@@ -918,8 +918,8 @@ export class StripLight {
   }
 
   async adaptiveLighting(device: device & devicesConfig): Promise<void> {
-    if (device.colorbulb?.adaptiveLightingShift) {
-      this.adaptiveLightingShift = device.colorbulb.adaptiveLightingShift;
+    if (device.striplight?.adaptiveLightingShift) {
+      this.adaptiveLightingShift = device.striplight.adaptiveLightingShift;
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
     } else {
       this.adaptiveLightingShift = 0;
@@ -1050,8 +1050,8 @@ export class StripLight {
 
   async config(device: device & devicesConfig): Promise<void> {
     let config = {};
-    if (device.colorbulb) {
-      config = device.colorbulb;
+    if (device.striplight) {
+      config = device.striplight;
     }
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;

package/src/settings.ts

@@ -69,6 +69,7 @@ export interface devicesConfig extends device {
   contact?: contact;
   motion?: motion;
   colorbulb?: colorbulb;
+  striplight?: striplight;
   ceilinglight?: ceilinglight;
   plug?: Record<any, any>;
   lock?: lock;
@@ -108,9 +109,15 @@ export type curtain = {
 
 export type blindTilt = {
   mode?: string;
+  hide_lightsensor?: boolean;
+  set_minLux?: number;
+  set_maxLux?: number;
   updateRate?: number;
   set_max?: number;
   set_min?: number;
+  set_minStep?: number;
+  setCloseMode?: string;
+  setOpenMode?: string;
 };
 
 export type contact = {
@@ -131,6 +138,11 @@ export type colorbulb = {
   adaptiveLightingShift?: number;
 };
 
+export type striplight = {
+  set_minStep?: number;
+  adaptiveLightingShift?: number;
+};
+
 export type ceilinglight = {
   set_minStep?: number;
   adaptiveLightingShift?: number;