@switchbot/homebridge-switchbot 1.5.0 → 1.5.1-beta.3

package/package.json

@@ -1,72 +1,72 @@
 {
-  "displayName": "Homebridge SwitchBot",
-  "name": "@switchbot/homebridge-switchbot",
-  "version": "1.5.0",
-  "description": "The [Homebridge](https://homebridge.io) SwitchBot plugin allows you to access your [SwitchBot](https://www.switch-bot.com) device(s) from HomeKit.",
-  "author": "SwitchBot <support@wondertechlabs.com> (https://github.com/SwitchBot)",
-  "license": "ISC",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/OpenWonderLabs/homebridge-switchbot.git"
-  },
-  "bugs": {
-    "url": "https://github.com/OpenWonderLabs/homebridge-switchbot/issues"
-  },
-  "engines": {
-    "homebridge": "^1.3.8",
-    "node": "^14.18.2 || ^16.13.1"
-  },
-  "main": "dist/index.js",
-  "scripts": {
-    "check": "npm install && npm outdated",
-    "update": "ncu -u && npm update && npm install",
-    "lint": "eslint src/**.ts",
-    "watch": "npm run build && npm link && nodemon",
-    "build": "rimraf ./dist && tsc",
-    "prepublishOnly": "npm run lint && npm run build"
-  },
-  "funding": [
-    {
-      "type": "Paypal",
-      "url": "https://paypal.me/donavanbecker"
+    "displayName": "Homebridge SwitchBot",
+    "name": "@switchbot/homebridge-switchbot",
+    "version": "1.5.1-beta.3",
+    "description": "The [Homebridge](https://homebridge.io) SwitchBot plugin allows you to access your [SwitchBot](https://www.switch-bot.com) device(s) from HomeKit.",
+    "author": "SwitchBot <support@wondertechlabs.com> (https://github.com/SwitchBot)",
+    "license": "ISC",
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/OpenWonderLabs/homebridge-switchbot.git"
     },
-    {
-      "type": "GitHub",
-      "url": "https://github.com/sponsors/donavanbecker"
+    "bugs": {
+        "url": "https://github.com/OpenWonderLabs/homebridge-switchbot/issues"
+    },
+    "engines": {
+        "homebridge": "^1.3.9",
+        "node": "^14.18.2 || ^16.13.1"
+    },
+    "main": "dist/index.js",
+    "scripts": {
+        "check": "npm install && npm outdated",
+        "update": "ncu -u && npm update && npm install",
+        "lint": "eslint src/**.ts",
+        "watch": "npm run build && npm link && nodemon",
+        "build": "rimraf ./dist && tsc",
+        "prepublishOnly": "npm run lint && npm run build"
+    },
+    "funding": [
+        {
+            "type": "Paypal",
+            "url": "https://paypal.me/donavanbecker"
+        },
+        {
+            "type": "GitHub",
+            "url": "https://github.com/sponsors/donavanbecker"
+        }
+    ],
+    "publishConfig": {
+        "access": "public"
+    },
+    "keywords": [
+        "homebridge-plugin",
+        "switchbot",
+        "humidifier",
+        "humidity",
+        "temperature",
+        "bot",
+        "curtains",
+        "windows",
+        "ble",
+        "ir"
+    ],
+    "dependencies": {
+        "@homebridge/plugin-ui-utils": "^0.0.19",
+        "axios": "^0.24.0",
+        "node-switchbot": "^1.1.2",
+        "rxjs": "^7.5.1"
+    },
+    "devDependencies": {
+        "@types/node": "^17.0.5",
+        "@typescript-eslint/eslint-plugin": "^5.8.1",
+        "@typescript-eslint/parser": "^5.8.1",
+        "eslint": "^8.5.0",
+        "homebridge": "^1.3.9",
+        "nodemon": "^2.0.15",
+        "npm-check-updates": "^12.0.5",
+        "rimraf": "^3.0.2",
+        "ts-node": "^10.4.0",
+        "typescript": "^4.5.4",
+        "typescript-axios-wb": "^1.0.3"
     }
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "keywords": [
-    "homebridge-plugin",
-    "switchbot",
-    "humidifier",
-    "humidity",
-    "temperature",
-    "bot",
-    "curtains",
-    "windows",
-    "ble",
-    "ir"
-  ],
-  "dependencies": {
-    "@homebridge/plugin-ui-utils": "^0.0.19",
-    "axios": "^0.24.0",
-    "node-switchbot": "^1.1.2",
-    "rxjs": "^7.4.0"
-  },
-  "devDependencies": {
-    "@types/node": "^17.0.5",
-    "@typescript-eslint/eslint-plugin": "^5.8.0",
-    "@typescript-eslint/parser": "^5.8.0",
-    "eslint": "^8.5.0",
-    "homebridge": "^1.3.8",
-    "nodemon": "^2.0.15",
-    "npm-check-updates": "^12.0.5",
-    "rimraf": "^3.0.2",
-    "ts-node": "^10.4.0",
-    "typescript": "^4.5.4",
-    "typescript-axios-wb": "^1.0.3"
-  }
 }

package/src/devices/bots.ts

@@ -39,6 +39,9 @@ export class Bot {
   deviceLogging!: string;
   deviceRefreshRate!: number;
 
+  // Others
+  doublePress!: number;
+
   // Updates
   botUpdateInProgress!: boolean;
   doBotUpdate!: Subject<void>;
@@ -49,19 +52,26 @@ export class Bot {
     public device: device & devicesConfig,
   ) {
     // default placeholders
+    this.refreshRate();
+    this.logs();
     if (this.On === undefined) {
       this.On = false;
+      this.accessory.context.On = this.On;
     } else {
       this.On = this.accessory.context.On;
     }
-    this.refreshRate();
-    this.logs();
+    if (device.bot?.doublePress) {
+      this.doublePress = device.bot?.doublePress;
+      this.accessory.context.doublePress = this.doublePress;
+    } else {
+      this.doublePress = 1;
+    }
     this.BatteryLevel = 100;
     this.StatusLowBattery = 1;
 
     // Bot Config
     this.debugLog(`Bot: ${this.accessory.displayName} Config: (ble: ${device.ble}, offline: ${device.offline}, mode: ${device.bot?.mode},`
-      + ` deviceType: ${device.bot?.deviceType})`);
+      + ` deviceType: ${device.bot?.deviceType}, doublePress: ${this.doublePress})`);
 
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doBotUpdate = new Subject();
@@ -151,7 +161,11 @@ export class Bot {
       )
       .subscribe(async () => {
         try {
-          await this.pushChanges();
+          interval(100)
+            .pipe(take(this.doublePress!))
+            .subscribe(async () => {
+              await this.pushChanges();
+            });
         } catch (e: any) {
           this.errorLog(`Bot: ${this.accessory.displayName} failed pushChanges`);
           if (this.deviceLogging === 'debug') {
@@ -170,33 +184,33 @@ export class Bot {
   refreshRate() {
     if (this.device.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.device.refreshRate;
-      if (this.platform.debugMode) {
-        this.warnLog(`Using Device Config refreshRate: ${this.deviceRefreshRate}`);
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Bot: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
       }
     } else if (this.platform.config.options!.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options!.refreshRate;
-      if (this.platform.debugMode) {
-        this.warnLog(`Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Bot: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
       }
     }
   }
 
   logs() {
-    if (this.device.logging) {
+    if (this.platform.debugMode) {
+      this.deviceLogging = this.accessory.context.logging = 'debug';
+      this.warnLog(`Water Heater: ${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.warnLog(`Using Device Config Logging: ${this.deviceLogging}`);
+      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.warnLog(`Using Platform Config Logging: ${this.deviceLogging}`);
+      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.warnLog('Using Device Standard Logging');
-      }
     }
   }
 
@@ -245,7 +259,7 @@ export class Bot {
           this.On = false;
         }
       }
-      this.debugLog(`Bot ${this.accessory.displayName} On: ${this.On}`);
+      this.debugLog(`Bot: ${this.accessory.displayName} On: ${this.On}`);
     }
   }
 
@@ -469,7 +483,7 @@ export class Bot {
 
           // Make the API request
           const push: any = (await this.platform.axios.post(`${DeviceURL}/${this.device.deviceId}/commands`, payload));
-          this.debugLog(`Bot ${this.accessory.displayName} pushchanges: ${JSON.stringify(push.data)}`);
+          this.debugLog(`Bot: ${this.accessory.displayName} pushchanges: ${JSON.stringify(push.data)}`);
           this.statusCode(push);
           this.OnCached = this.On;
           this.accessory.context.On = this.OnCached;

package/src/devices/colorbulb.ts

@@ -200,33 +200,33 @@ export class ColorBulb {
   refreshRate() {
     if (this.device.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.device.refreshRate;
-      if (this.platform.debugMode) {
-        this.warnLog(`Using Device Config refreshRate: ${this.deviceRefreshRate}`);
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Color Bulb: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
       }
     } else if (this.platform.config.options!.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options!.refreshRate;
-      if (this.platform.debugMode) {
-        this.warnLog(`Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Color Bulb: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
       }
     }
   }
 
   logs() {
-    if (this.device.logging) {
+    if (this.platform.debugMode) {
+      this.deviceLogging = this.accessory.context.logging = 'debug';
+      this.warnLog(`Water Heater: ${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.warnLog(`Using Device Config Logging: ${this.deviceLogging}`);
+      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.warnLog(`Using Platform Config Logging: ${this.deviceLogging}`);
+      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.warnLog('Using Device Standard Logging');
-      }
     }
   }
 

package/src/devices/contact.ts

@@ -146,33 +146,33 @@ export class Contact {
   refreshRate() {
     if (this.device.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.device.refreshRate;
-      if (this.platform.debugMode) {
-        this.warnLog(`Using Device Config refreshRate: ${this.deviceRefreshRate}`);
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Contact Sensor: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
       }
     } else if (this.platform.config.options!.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options!.refreshRate;
-      if (this.platform.debugMode) {
-        this.warnLog(`Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Contact Sensor: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
       }
     }
   }
 
   logs() {
-    if (this.device.logging) {
+    if (this.platform.debugMode) {
+      this.deviceLogging = this.accessory.context.logging = 'debug';
+      this.warnLog(`Water Heater: ${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.warnLog(`Using Device Config Logging: ${this.deviceLogging}`);
+      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.warnLog(`Using Platform Config Logging: ${this.deviceLogging}`);
+      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.warnLog('Using Device Standard Logging');
-      }
     }
   }
 

package/src/devices/curtains.ts

@@ -4,7 +4,7 @@ import Switchbot from 'node-switchbot';
 import { interval, Subject } from 'rxjs';
 import { SwitchBotPlatform } from '../platform';
 import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
-import { Service, PlatformAccessory, CharacteristicValue, HAPStatus } from 'homebridge';
+import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
 import { DeviceURL, device, devicesConfig, serviceData, switchbot, deviceStatusResponse, payload } from '../settings';
 
 export class Curtain {
@@ -196,45 +196,45 @@ export class Curtain {
     // refreshRate
     if (this.device.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.device.refreshRate;
-      if (this.platform.debugMode) {
-        this.warnLog(`Using Device Config refreshRate: ${this.deviceRefreshRate}`);
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Curtain: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
       }
     } else if (this.platform.config.options!.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options!.refreshRate;
-      if (this.platform.debugMode) {
-        this.warnLog(`Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Curtain: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
       }
     }
     // curtainRefreshRate
     if (this.device?.curtain?.refreshRate) {
       this.curtainRefreshRate = this.device?.curtain?.refreshRate;
-      if (this.platform.debugMode) {
-        this.warnLog(`Using Device Config Curtain refreshRate: ${this.deviceRefreshRate}`);
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Curtain: ${this.accessory.displayName} Using Device Config Curtain refreshRate: ${this.deviceRefreshRate}`);
       }
     } else {
       this.curtainRefreshRate = 5;
-      if (this.deviceLogging === 'debug') {
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
         this.warnLog(`Curtain: ${this.accessory.displayName} Using Default Curtain Refresh Rate.`);
       }
     }
   }
 
   logs() {
-    if (this.device.logging) {
+    if (this.platform.debugMode) {
+      this.deviceLogging = this.accessory.context.logging = 'debug';
+      this.warnLog(`Water Heater: ${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.warnLog(`Using Device Config Logging: ${this.deviceLogging}`);
+      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.warnLog(`Using Platform Config Logging: ${this.deviceLogging}`);
+      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.warnLog('Using Device Standard Logging');
-      }
     }
   }
 

package/src/devices/humidifiers.ts

@@ -193,33 +193,33 @@ export class Humidifier {
   refreshRate() {
     if (this.device.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.device.refreshRate;
-      if (this.platform.debugMode) {
-        this.warnLog(`Using Device Config refreshRate: ${this.deviceRefreshRate}`);
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Humidifier: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
       }
     } else if (this.platform.config.options!.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options!.refreshRate;
-      if (this.platform.debugMode) {
-        this.warnLog(`Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Humidifier: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
       }
     }
   }
 
   logs() {
-    if (this.device.logging) {
+    if (this.platform.debugMode) {
+      this.deviceLogging = this.accessory.context.logging = 'debug';
+      this.warnLog(`Water Heater: ${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.warnLog(`Using Device Config Logging: ${this.deviceLogging}`);
+      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.warnLog(`Using Platform Config Logging: ${this.deviceLogging}`);
+      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.warnLog('Using Device Standard Logging');
-      }
     }
   }
 

package/src/devices/meters.ts

@@ -183,33 +183,33 @@ export class Meter {
   refreshRate() {
     if (this.device.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.device.refreshRate;
-      if (this.platform.debugMode) {
-        this.warnLog(`Using Device Config refreshRate: ${this.deviceRefreshRate}`);
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Meter: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
       }
     } else if (this.platform.config.options!.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options!.refreshRate;
-      if (this.platform.debugMode) {
-        this.warnLog(`Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Meter: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
       }
     }
   }
 
   logs() {
-    if (this.device.logging) {
+    if (this.platform.debugMode) {
+      this.deviceLogging = this.accessory.context.logging = 'debug';
+      this.warnLog(`Water Heater: ${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.warnLog(`Using Device Config Logging: ${this.deviceLogging}`);
+      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.warnLog(`Using Platform Config Logging: ${this.deviceLogging}`);
+      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.warnLog('Using Device Standard Logging');
-      }
     }
   }
 

package/src/devices/motion.ts

@@ -114,33 +114,33 @@ export class Motion {
   refreshRate() {
     if (this.device.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.device.refreshRate;
-      if (this.platform.debugMode) {
-        this.warnLog(`Using Device Config refreshRate: ${this.deviceRefreshRate}`);
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Motion Sensor: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
       }
     } else if (this.platform.config.options!.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options!.refreshRate;
-      if (this.platform.debugMode) {
-        this.warnLog(`Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Motion Sensor: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
       }
     }
   }
 
   logs() {
-    if (this.device.logging) {
+    if (this.platform.debugMode) {
+      this.deviceLogging = this.accessory.context.logging = 'debug';
+      this.warnLog(`Water Heater: ${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.warnLog(`Using Device Config Logging: ${this.deviceLogging}`);
+      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.warnLog(`Using Platform Config Logging: ${this.deviceLogging}`);
+      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.warnLog('Using Device Standard Logging');
-      }
     }
   }
 

package/src/devices/plugs.ts

@@ -117,33 +117,33 @@ export class Plug {
   refreshRate() {
     if (this.device.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.device.refreshRate;
-      if (this.platform.debugMode) {
-        this.warnLog(`Using Device Config refreshRate: ${this.deviceRefreshRate}`);
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Plug: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
       }
     } else if (this.platform.config.options!.refreshRate) {
       this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options!.refreshRate;
-      if (this.platform.debugMode) {
-        this.warnLog(`Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
+      if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+        this.warnLog(`Plug: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
       }
     }
   }
 
   logs() {
-    if (this.device.logging) {
+    if (this.platform.debugMode) {
+      this.deviceLogging = this.accessory.context.logging = 'debug';
+      this.warnLog(`Water Heater: ${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.warnLog(`Using Device Config Logging: ${this.deviceLogging}`);
+      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.warnLog(`Using Platform Config Logging: ${this.deviceLogging}`);
+      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.warnLog('Using Device Standard Logging');
-      }
     }
   }
 

package/src/irdevices/airconditioners.ts

@@ -167,10 +167,19 @@ export class AirConditioner {
   }
 
   logs() {
-    if (this.device.logging) {
+    if (this.platform.debugMode) {
+      this.deviceLogging = this.accessory.context.logging = 'debug';
+      this.warnLog(`Water Heater: ${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.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.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';
     }

package/src/irdevices/airpurifiers.ts

@@ -88,10 +88,19 @@ export class AirPurifier {
   }
 
   logs() {
-    if (this.device.logging) {
+    if (this.platform.debugMode) {
+      this.deviceLogging = this.accessory.context.logging = 'debug';
+      this.warnLog(`Water Heater: ${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.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.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';
     }