start of H5198

homebridge-plugins · Dec 30, 2023 · b9cdd8f · b9cdd8f
1 parent 1993917
commit b9cdd8f
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 9 deletions.
diff --git a/config.schema.json b/config.schema.json
@@ -1085,7 +1085,7 @@
             "deviceId": {
               "title": "Device ID",
               "type": "string",
-              "description": "Enter the 23 digit Govee Device ID to begin (e.g. 12:AB:A1:C5:A8:99:D2:17).",
+              "description": "Enter the 23/26 digit Govee Device ID to begin (e.g. 12:AB:A1:C5:A8:99:D2:17).",
               "minLength": 23,
               "maxLength": 23
             },
@@ -1094,7 +1094,7 @@
               "title": "Hide From HomeKit",
               "description": "If true, this accessory will be removed and ignored from HomeKit.",
               "condition": {
-                "functionBody": "return (model.thermoDevices && model.thermoDevices[arrayIndices] && model.thermoDevices[arrayIndices].deviceId && model.thermoDevices[arrayIndices].deviceId.length === 23);"
+                "functionBody": "return (model.thermoDevices && model.thermoDevices[arrayIndices] && model.thermoDevices[arrayIndices].deviceId && [23,26].includes(model.thermoDevices[arrayIndices].deviceId.length));"
               }
             },
             "lowBattThreshold": {
@@ -1104,7 +1104,7 @@
               "placeholder": 20,
               "minimum": 1,
               "condition": {
-                "functionBody": "return (model.thermoDevices && model.thermoDevices[arrayIndices] && model.thermoDevices[arrayIndices].deviceId && model.thermoDevices[arrayIndices].deviceId.length === 23 && !model.thermoDevices[arrayIndices].ignoreDevice);"
+                "functionBody": "return (model.thermoDevices && model.thermoDevices[arrayIndices] && model.thermoDevices[arrayIndices].deviceId && [23,26].includes(model.thermoDevices[arrayIndices].deviceId.length) && !model.thermoDevices[arrayIndices].ignoreDevice);"
               }
             }
           }

diff --git a/lib/device/index.js b/lib/device/index.js
@@ -26,6 +26,7 @@ import deviceSensorContact from './sensor-contact.js';
 import deviceSensorLeak from './sensor-leak.js';
 import deviceSensorMonitor from './sensor-monitor.js';
 import deviceSensorThermo from './sensor-thermo.js';
+import deviceSensorThermo4 from './sensor-thermo4.js';
 import deviceSwitchDouble from './switch-double.js';
 import deviceSwitchSingle from './switch-single.js';
 import deviceSwitchTriple from './switch-triple.js';
@@ -63,6 +64,7 @@ export default {
   deviceSensorLeak,
   deviceSensorMonitor,
   deviceSensorThermo,
+  deviceSensorThermo4,
   deviceSwitchDouble,
   deviceSwitchSingle,
   deviceSwitchTriple,

diff --git a/lib/device/sensor-thermo4.js b/lib/device/sensor-thermo4.js
@@ -0,0 +1,55 @@
+import { base64ToHex, getTwoItemPosition, hexToTwoItems } from '../utils/functions.js';
+import platformLang from '../utils/lang-en.js';
+
+export default class {
+  constructor(platform, accessory) {
+    // Set up variables from the platform
+    this.hapChar = platform.api.hap.Characteristic;
+    this.hapErr = platform.api.hap.HapStatusError;
+    this.hapServ = platform.api.hap.Service;
+    this.platform = platform;
+
+    // Set up variables from the accessory
+    this.accessory = accessory;
+
+    // remove temperature sensor, humidity sensor, battery service
+    if (this.accessory.getService(this.hapServ.TemperatureSensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.TemperatureSensor));
+    }
+    if (this.accessory.getService(this.hapServ.HumiditySensor)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.HumiditySensor));
+    }
+    if (this.accessory.getService(this.hapServ.Battery)) {
+      this.accessory.removeService(this.accessory.getService(this.hapServ.Battery));
+    }
+
+    // Output the customised options to the log
+    const opts = JSON.stringify({});
+    platform.log('[%s] %s %s.', accessory.displayName, platformLang.devInitOpts, opts);
+  }
+
+  externalUpdate(params) {
+    this.accessory.logWarn(JSON.stringify(params, null, 2));
+
+    // Check for some other scene/mode change
+    (params.commands || []).forEach((command) => {
+      const hexString = base64ToHex(command);
+      const hexParts = hexToTwoItems(hexString);
+
+      this.accessory.logWarn(`${platformLang.newScene}: [${command}] [${hexString}]`);
+
+      // Return now if not a device query update code
+      if (getTwoItemPosition(hexParts, 1) !== 'aa') {
+        return;
+      }
+
+      const deviceFunction = `${getTwoItemPosition(hexParts, 2)}${getTwoItemPosition(hexParts, 3)}`;
+
+      switch (deviceFunction) {
+        default:
+          this.accessory.logWarn(`${platformLang.newScene}: [${command}] [${hexString}]`);
+          break;
+      }
+    });
+  }
+}
diff --git a/lib/platform.js b/lib/platform.js
@@ -573,8 +573,8 @@ export default class {
       if (httpDevices && httpDevices.length > 0) {
         // We have some devices from HTTP client
         httpDevices.forEach((httpDevice) => {
-          // It appears sometimes the device id isn't quite in the form I first expected
-          if (httpDevice.device.length === 16) {
+          // Format device id
+          if (!httpDevice.device.includes(':')) {
             // Eg converts abcd1234abcd1234 to AB:CD:12:34:AB:CD:12:34
             httpDevice.device = httpDevice.device.replace(/..\B/g, '$&:').toUpperCase();
           }
@@ -957,6 +957,10 @@ export default class {
         // Device is a thermo-hygrometer sensor
         devInstance = deviceTypes.deviceSensorThermo;
         accessory = devicesInHB.get(uuid) || this.addAccessory(device);
+      } else if (platformConsts.models.sensorThermo4.includes(device.model)) {
+        // Device is a thermo-hygrometer sensor with 4 prongs and AWS support
+        devInstance = deviceTypes.deviceSensorThermo4;
+        accessory = devicesInHB.get(uuid) || this.addAccessory(device);
       } else if (platformConsts.models.sensorMonitor.includes(device.model)) {
         devInstance = deviceTypes.deviceSensorMonitor;
         doAWSPolling = true;

diff --git a/lib/utils/constants.js b/lib/utils/constants.js
@@ -354,8 +354,8 @@ export default {
       'H5177',
       'H5179',
       'H5183',
-      'H5198',
     ],
+    sensorThermo4: ['H5198'],
     sensorMonitor: ['H5106'],
     fan: ['H7100', 'H7101', 'H7102', 'H7111'],
     heater1: ['H7130', 'H713A', 'H713B', 'H713C'],

diff --git a/package-lock.json b/package-lock.json