@switchbot/homebridge-switchbot 1.5.1-beta.2 → 1.6.0

package/src/devices/bots.ts

@@ -36,6 +36,8 @@ export class Bot {
   battery!: serviceData['battery'];
 
   // Config
+  botMode!: string;
+  scanDuration!: number;
   deviceLogging!: string;
   deviceRefreshRate!: number;
 
@@ -52,8 +54,11 @@ export class Bot {
     public device: device & devicesConfig,
   ) {
     // default placeholders
-    this.refreshRate();
     this.logs();
+    this.scan();
+    this.refreshRate();
+    this.PressOrSwitch();
+
     if (this.On === undefined) {
       this.On = false;
       this.accessory.context.On = this.On;
@@ -67,7 +72,7 @@ export class Bot {
       this.doublePress = 1;
     }
     this.BatteryLevel = 100;
-    this.StatusLowBattery = 1;
+    this.StatusLowBattery = 0;
 
     // Bot Config
     this.debugLog(`Bot: ${this.accessory.displayName} Config: (ble: ${device.ble}, offline: ${device.offline}, mode: ${device.bot?.mode},`
@@ -195,27 +200,54 @@ export class Bot {
     }
   }
 
+  scan() {
+    if (this.device.scanDuration) {
+      this.scanDuration = this.accessory.context.scanDuration = this.device.scanDuration;
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Bot: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
+      }
+    } else {
+      this.scanDuration = this.accessory.context.scanDuration = 1;
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Bot: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
+      }
+    }
+  }
+
+
+
   logs() {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debug';
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
-        this.warnLog(`Water Heater: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
-      }
+      this.warnLog(`Bot: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
     } else if (this.device.logging) {
       this.deviceLogging = this.accessory.context.logging = this.device.logging;
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+      if (this.deviceLogging === 'debug' || this.deviceLogging === 'standard') {
         this.warnLog(`Bot: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
       }
     } else if (this.platform.config.options?.logging) {
       this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+      if (this.deviceLogging === 'debug' || this.deviceLogging === 'standard') {
         this.warnLog(`Bot: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
       }
     } else {
       this.deviceLogging = this.accessory.context.logging = 'standard';
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
-        this.warnLog(`Bot: ${this.accessory.displayName} Using Device Standard Logging`);
-      }
+    }
+  }
+
+  PressOrSwitch() {
+    if (!this.device.bot?.mode) {
+      this.botMode = 'switch';
+      this.warnLog(`Bot: ${this.accessory.displayName} does not have bot mode set in the Plugin's SwitchBot Device Settings,`);
+      this.warnLog(`Bot: ${this.accessory.displayName} is defaulting to "${this.botMode}" mode, you may experience issues.`);
+    } else if (this.device.bot?.mode === 'switch') {
+      this.botMode = 'switch';
+      this.infoLog(`Bot: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`);
+    } else if (this.device.bot?.mode === 'press') {
+      this.botMode = 'press';
+      this.infoLog(`Bot: ${this.accessory.displayName} Using Bot Mode: ${this.botMode}`);
+    } else {
+      throw new Error(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
     }
   }
 
@@ -234,10 +266,17 @@ export class Bot {
     this.debugLog(`Bot: ${this.accessory.displayName} BLE parseStatus`);
     // BLEmode (true if Switch Mode) | (false if Press Mode)
     if (this.mode) {
-      this.On = Boolean(this.state);
-      this.debugLog(`Bot: ${this.accessory.displayName} Switch Mode, mode: ${JSON.stringify(this.mode)}, On: ${JSON.stringify(this.On)}`);
+      this.OnCached = this.On;
+      this.accessory.context.On = this.OnCached;
+      if (this.On === undefined) {
+        this.On = Boolean(this.state);
+      }
+      this.debugLog(`Bot: ${this.accessory.displayName} Switch Mode, mode: ${this.mode}, On: ${this.On}`);
     } else {
-      this.debugLog(`Bot: ${this.accessory.displayName} Press Mode, mode: ${JSON.stringify(this.mode)}, On: ${JSON.stringify(this.On)}`);
+      this.On = false;
+      this.OnCached = this.On;
+      this.accessory.context.On = this.OnCached;
+      this.debugLog(`Bot: ${this.accessory.displayName} Press Mode, mode: ${this.mode}, On: ${this.On}`);
     }
 
     this.BatteryLevel = Number(this.battery);
@@ -255,13 +294,19 @@ export class Bot {
   private async openAPIparseStatus() {
     if (this.platform.config.credentials?.openToken) {
       this.debugLog(`Bot: ${this.accessory.displayName} OpenAPI parseStatus`);
-      if (this.device.bot?.mode === 'press') {
+      if (this.botMode === 'press') {
         this.On = false;
+        this.OnCached = this.On;
+        this.accessory.context.On = this.OnCached;
       } else {
         if (this.deviceStatus.body.power === 'on') {
           this.On = true;
+          this.OnCached = this.On;
+          this.accessory.context.On = this.OnCached;
         } else {
           this.On = false;
+          this.OnCached = this.On;
+          this.accessory.context.On = this.OnCached;
         }
       }
       this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
@@ -313,8 +358,8 @@ export class Bot {
           this.debugLog(`Bot: ${this.accessory.displayName} connected: ${this.connected}`);
         }
       };
-      // Wait 10 seconds
-      return switchbot.wait(10000);
+      // Wait 2 seconds
+      return switchbot.wait(this.scanDuration * 1000);
     }).then(async () => {
       // Stop to monitor
       switchbot.stopScan();
@@ -394,14 +439,25 @@ export class Bot {
     if (this.On !== this.OnCached) {
       this.debugLog(`Bot: ${this.accessory.displayName} BLE pushChanges`);
       const switchbot = this.connectBLE();
-      if (this.device.bot?.mode === 'press') {
-        this.debugLog(`Bot: ${this.accessory.displayName} Press Mode: ${this.device.bot?.mode}`);
+      if (this.botMode === 'press') {
+        this.debugLog(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
         switchbot.discover({ model: 'H', quick: true, id: this.device.bleMac })
           .then((device_list: { press: (arg0: { id: string | undefined; }) => any; }[]) => {
-            this.infoLog(`Bot: ${this.accessory.displayName}, On: ${this.On}`);
+            this.infoLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
             return device_list[0].press({ id: this.device.bleMac });
           }).then(() => {
             this.debugLog(`Bot: ${this.accessory.displayName} Done.`);
+            this.On = false;
+            this.OnCached = this.On;
+            this.accessory.context.On = this.OnCached;
+            setTimeout(() => {
+              if (this.device.bot?.deviceType === 'switch') {
+                this.switchService?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
+              } else {
+                this.outletService?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.On);
+              }
+              this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}, Switch Timeout`);
+            }, 500);
           }).catch(async (e: any) => {
             this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
             if (this.deviceLogging === 'debug') {
@@ -418,13 +474,15 @@ export class Bot {
             }
             this.apiError(e);
           });
-      } else if (this.device.bot?.mode === 'switch') {
-        this.debugLog(`Bot: ${this.accessory.displayName} Press Mode: ${this.device.bot?.mode}`);
+      } else if (this.botMode === 'switch') {
+        this.debugLog(`Bot: ${this.accessory.displayName} Press Mode: ${this.botMode}`);
         switchbot.discover({ model: 'H', quick: true, id: this.device.bleMac }).then((device_list: any) => {
           this.infoLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
           return this.turnOnOff(device_list);
         }).then(() => {
           this.debugLog(`Bot: ${this.accessory.displayName} Done.`);
+          this.OnCached = this.On;
+          this.accessory.context.On = this.OnCached;
         }).catch(async (e: any) => {
           this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
           if (this.deviceLogging === 'debug') {
@@ -442,7 +500,7 @@ export class Bot {
           this.apiError(e);
         });
       } else {
-        this.errorLog(`Bot: ${this.accessory.displayName} Mode Not Set, mode: ${this.device.bot?.mode}`);
+        throw new Error(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);
       }
     }
     this.OnCached = this.On;
@@ -467,15 +525,15 @@ export class Bot {
             parameter: 'default',
           } as payload;
 
-          if (this.device.bot?.mode === 'switch' && this.On) {
+          if (this.botMode === 'switch' && this.On) {
             payload.command = 'turnOn';
             this.On = true;
             this.debugLog(`Bot: ${this.accessory.displayName} Switch Mode, Turning ${this.On}`);
-          } else if (this.device.bot?.mode === 'switch' && !this.On) {
+          } else if (this.botMode === 'switch' && !this.On) {
             payload.command = 'turnOff';
             this.On = false;
             this.debugLog(`Bot: ${this.accessory.displayName} Switch Mode, Turning ${this.On}`);
-          } else if (this.device.bot?.mode === 'press') {
+          } else if (this.botMode === 'press') {
             payload.command = 'press';
             this.debugLog(`Bot: ${this.accessory.displayName} Press Mode`);
             this.On = false;

package/src/devices/colorbulb.ts

@@ -53,8 +53,8 @@ export class ColorBulb {
     public device: device & devicesConfig,
   ) {
     // default placeholders
-    this.refreshRate();
     this.logs();
+    this.refreshRate();
     if (this.On === undefined) {
       this.On = false;
     } else {
@@ -214,24 +214,19 @@ export class ColorBulb {
   logs() {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debug';
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
-        this.warnLog(`Water Heater: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
-      }
+      this.warnLog(`Color Bulb: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
     } else if (this.device.logging) {
       this.deviceLogging = this.accessory.context.logging = this.device.logging;
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+      if (this.deviceLogging === 'debug' || this.deviceLogging === 'standard') {
         this.warnLog(`Color Bulb: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
       }
     } else if (this.platform.config.options?.logging) {
       this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+      if (this.deviceLogging === 'debug' || this.deviceLogging === 'standard') {
         this.warnLog(`Color Bulb: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
       }
     } else {
       this.deviceLogging = this.accessory.context.logging = 'standard';
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
-        this.warnLog(`Color Bulb: ${this.accessory.displayName} Using Device Standard Logging`);
-      }
     }
   }
 

package/src/devices/contact.ts

@@ -37,6 +37,7 @@ export class Contact {
   lightLevel!: serviceData['lightLevel'];
 
   // Config
+  scanDuration!: number;
   deviceLogging!: string;
   deviceRefreshRate!: number;
 
@@ -50,8 +51,9 @@ export class Contact {
     public device: device & devicesConfig,
   ) {
     // default placeholders
-    this.refreshRate();
     this.logs();
+    this.scan();
+    this.refreshRate();
     this.ContactSensorState = this.platform.Characteristic.ContactSensorState.CONTACT_DETECTED;
 
     // Contact Config
@@ -157,27 +159,36 @@ export class Contact {
     }
   }
 
+  scan() {
+    if (this.device.scanDuration) {
+      this.scanDuration = this.accessory.context.scanDuration = this.device.scanDuration;
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Bot: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
+      }
+    } else {
+      this.scanDuration = this.accessory.context.scanDuration = 1;
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Bot: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
+      }
+    }
+  }
+
   logs() {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debug';
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
-        this.warnLog(`Water Heater: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
-      }
+      this.warnLog(`Contact Sensor: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
     } else if (this.device.logging) {
       this.deviceLogging = this.accessory.context.logging = this.device.logging;
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+      if (this.deviceLogging === 'debug' || this.deviceLogging === 'standard') {
         this.warnLog(`Contact Sensor: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
       }
     } else if (this.platform.config.options?.logging) {
       this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+      if (this.deviceLogging === 'debug' || this.deviceLogging === 'standard') {
         this.warnLog(`Contact Sensor: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
       }
     } else {
       this.deviceLogging = this.accessory.context.logging = 'standard';
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
-        this.warnLog(`Contact Sensor: ${this.accessory.displayName} Using Device Standard Logging`);
-      }
     }
   }
 
@@ -298,8 +309,8 @@ export class Contact {
           this.debugLog(`Contact Sensor: ${this.accessory.displayName} connected: ${this.connected}`);
         }
       };
-      // Wait 10 seconds
-      return switchbot.wait(10000);
+      // Wait 2 seconds
+      return switchbot.wait(this.scanDuration * 1000);
     }).then(async () => {
       // Stop to monitor
       switchbot.stopScan();

package/src/devices/curtains.ts

@@ -42,6 +42,7 @@ export class Curtain {
   curtainRefreshRate!: number;
   set_minLux!: number;
   set_maxLux!: number;
+  scanDuration!: number;
   deviceLogging!: string;
   deviceRefreshRate!: number;
   spaceBetweenLevels!: number;
@@ -56,9 +57,10 @@ export class Curtain {
     public device: device & devicesConfig,
   ) {
     // default placeholders
-    this.refreshRate();
     this.logs();
+    this.scan();
     this.setMinMax();
+    this.refreshRate();
     this.CurrentPosition = 0;
     this.TargetPosition = 0;
     this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
@@ -219,27 +221,36 @@ export class Curtain {
     }
   }
 
+  scan() {
+    if (this.device.scanDuration) {
+      this.scanDuration = this.accessory.context.scanDuration = this.device.scanDuration;
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Bot: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
+      }
+    } else {
+      this.scanDuration = this.accessory.context.scanDuration = 1;
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Bot: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
+      }
+    }
+  }
+
   logs() {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debug';
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
-        this.warnLog(`Water Heater: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
-      }
+      this.warnLog(`Curtain: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
     } else if (this.device.logging) {
       this.deviceLogging = this.accessory.context.logging = this.device.logging;
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
-        this.warnLog(`Using Device Config Logging: ${this.deviceLogging}`);
+      if (this.deviceLogging === 'debug' || this.deviceLogging === 'standard') {
+        this.warnLog(`Curtain: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
       }
     } else if (this.platform.config.options?.logging) {
       this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
-        this.warnLog(`Using Platform Config Logging: ${this.deviceLogging}`);
+      if (this.deviceLogging === 'debug' || this.deviceLogging === 'standard') {
+        this.warnLog(`Curtain: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
       }
     } else {
       this.deviceLogging = this.accessory.context.logging = 'standard';
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
-        this.warnLog('Using Device Standard Logging');
-      }
     }
   }
 
@@ -466,8 +477,8 @@ export class Curtain {
           this.debugLog(`Curtain: ${this.accessory.displayName} connected: ${this.connected}`);
         }
       };
-      // Wait 10 seconds
-      return switchbot.wait(10000);
+      // Wait 2 seconds
+      return switchbot.wait(this.scanDuration * 1000);
     }).then(async () => {
       // Stop to monitor
       switchbot.stopScan();

package/src/devices/humidifiers.ts

@@ -37,6 +37,7 @@ export class Humidifier {
 
   // Config
   set_minStep?: number;
+  scanDuration!: number;
   deviceLogging!: string;
   deviceRefreshRate!: number;
 
@@ -50,8 +51,9 @@ export class Humidifier {
     public device: device & devicesConfig,
   ) {
     // default placeholders
-    this.refreshRate();
     this.logs();
+    this.scan();
+    this.refreshRate();
     this.CurrentRelativeHumidity = 0;
     this.TargetHumidifierDehumidifierState = this.platform.Characteristic.TargetHumidifierDehumidifierState.HUMIDIFIER;
     this.CurrentHumidifierDehumidifierState = this.platform.Characteristic.CurrentHumidifierDehumidifierState.INACTIVE;
@@ -204,27 +206,36 @@ export class Humidifier {
     }
   }
 
+  scan() {
+    if (this.device.scanDuration) {
+      this.scanDuration = this.accessory.context.scanDuration = this.device.scanDuration;
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Bot: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
+      }
+    } else {
+      this.scanDuration = this.accessory.context.scanDuration = 1;
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Bot: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
+      }
+    }
+  }
+
   logs() {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debug';
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
-        this.warnLog(`Water Heater: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
-      }
+      this.warnLog(`Humidifier: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
     } else if (this.device.logging) {
       this.deviceLogging = this.accessory.context.logging = this.device.logging;
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+      if (this.deviceLogging === 'debug' || this.deviceLogging === 'standard') {
         this.warnLog(`Humidifier: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
       }
     } else if (this.platform.config.options?.logging) {
       this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+      if (this.deviceLogging === 'debug' || this.deviceLogging === 'standard') {
         this.warnLog(`Humidifier: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
       }
     } else {
       this.deviceLogging = this.accessory.context.logging = 'standard';
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
-        this.warnLog(`Humidifier: ${this.accessory.displayName} Using Device Standard Logging`);
-      }
     }
   }
 
@@ -363,8 +374,8 @@ export class Humidifier {
           this.debugLog(`Humidifier: ${this.accessory.displayName} connected: ${this.connected}`);
         }
       };
-      // Wait 10 seconds
-      return switchbot.wait(10000);
+      // Wait 2 seconds
+      return switchbot.wait(this.scanDuration * 1000);
     }).then(async () => {
       // Stop to monitor
       switchbot.stopScan();

package/src/devices/meters.ts

@@ -40,6 +40,7 @@ export class Meter {
   humidity!: serviceData['humidity'];
 
   // Config
+  scanDuration!: number;
   deviceLogging!: string;
   deviceRefreshRate!: number;
 
@@ -53,8 +54,9 @@ export class Meter {
     public device: device & devicesConfig,
   ) {
     // default placeholders
-    this.refreshRate();
     this.logs();
+    this.scan();
+    this.refreshRate();
     if (this.BatteryLevel === undefined) {
       this.BatteryLevel = 100;
     } else {
@@ -194,27 +196,36 @@ export class Meter {
     }
   }
 
+  scan() {
+    if (this.device.scanDuration) {
+      this.scanDuration = this.accessory.context.scanDuration = this.device.scanDuration;
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Bot: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
+      }
+    } else {
+      this.scanDuration = this.accessory.context.scanDuration = 1;
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Bot: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
+      }
+    }
+  }
+
   logs() {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debug';
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
-        this.warnLog(`Water Heater: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
-      }
+      this.warnLog(`Meter: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
     } else if (this.device.logging) {
       this.deviceLogging = this.accessory.context.logging = this.device.logging;
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+      if (this.deviceLogging === 'debug' || this.deviceLogging === 'standard') {
         this.warnLog(`Meter: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
       }
     } else if (this.platform.config.options?.logging) {
       this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+      if (this.deviceLogging === 'debug' || this.deviceLogging === 'standard') {
         this.warnLog(`Meter: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
       }
     } else {
       this.deviceLogging = this.accessory.context.logging = 'standard';
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
-        this.warnLog(`Meter: ${this.accessory.displayName} Using Device Standard Logging`);
-      }
     }
   }
 
@@ -329,7 +340,7 @@ export class Meter {
         }
       };
       // Wait 10 seconds
-      return switchbot.wait(10000);
+      return switchbot.wait(this.scanDuration * 1000);
     }).then(async () => {
       // Stop to monitor
       switchbot.stopScan();

package/src/devices/motion.ts

@@ -34,6 +34,7 @@ export class Motion {
   lightLevel!: serviceData['lightLevel'];
 
   // Config
+  scanDuration!: number;
   deviceLogging!: string;
   deviceRefreshRate!: number;
 
@@ -47,8 +48,9 @@ export class Motion {
     public device: device & devicesConfig,
   ) {
     // default placeholders
-    this.refreshRate();
     this.logs();
+    this.scan();
+    this.refreshRate();
     this.MotionDetected = false;
 
     // this is subject we use to track when we need to POST changes to the SwitchBot API
@@ -125,27 +127,36 @@ export class Motion {
     }
   }
 
+  scan() {
+    if (this.device.scanDuration) {
+      this.scanDuration = this.accessory.context.scanDuration = this.device.scanDuration;
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Bot: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
+      }
+    } else {
+      this.scanDuration = this.accessory.context.scanDuration = 1;
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Bot: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
+      }
+    }
+  }
+
   logs() {
     if (this.platform.debugMode) {
       this.deviceLogging = this.accessory.context.logging = 'debug';
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
-        this.warnLog(`Water Heater: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
-      }
+      this.warnLog(`Motion Sensor: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
     } else if (this.device.logging) {
       this.deviceLogging = this.accessory.context.logging = this.device.logging;
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+      if (this.deviceLogging === 'debug' || this.deviceLogging === 'standard') {
         this.warnLog(`Motion Sensor: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
       }
     } else if (this.platform.config.options?.logging) {
       this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+      if (this.deviceLogging === 'debug' || this.deviceLogging === 'standard') {
         this.warnLog(`Motion Sensor: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
       }
     } else {
       this.deviceLogging = this.accessory.context.logging = 'standard';
-      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
-        this.warnLog(`Motion Sensor: ${this.accessory.displayName} Using Device Standard Logging`);
-      }
     }
   }
 
@@ -236,7 +247,7 @@ export class Motion {
         }
       };
       // Wait 10 seconds
-      return switchbot.wait(10000);
+      return switchbot.wait(this.scanDuration * 1000);
     }).then(async () => {
       // Stop to monitor
       switchbot.stopScan();