Add SwitchBot Meter Plus

mrbungle64 · Jul 15, 2022 · e67276c · e67276c
1 parent c1b44b3
commit e67276c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/lib/adapterHelper.js b/lib/adapterHelper.js
@@ -32,6 +32,8 @@ function getProductName(model) {
         return 'SwitchBot Smart Humidifier';
     } else if (model === 'T') { // WoSensorTH
         return 'SwitchBot Meter';
+    } else if (model === 'i') { // WoMeterPlus
+        return 'SwitchBot Meter Plus';
     } else if (model === 'c') { // WoCurtain
         return 'SwitchBot Curtain';
     } else if (model === 's') { // WoMotion

diff --git a/lib/adapterObjects.js b/lib/adapterObjects.js
@@ -6,7 +6,7 @@ const helper = require('./adapterHelper');
  *
  * @param {Object} adapter
  * @param {{address: String, rssi: Number, id: String,
- *          serviceData: {model: 'H'|'T'|'c'|'s'|'d', modelName: String, battery: Number, state: Boolean, mode: Boolean,
+ *          serviceData: {model: 'H'|'T'|'c'|'s'|'d'|'i', modelName: String, battery: Number, state: Boolean, mode: Boolean,
  *                        temperature: {c: Number, f: Number}, humidity: Number,
  *                        position: Number, calibration: Number, lightLevel: String, movement: Boolean, doorState: String}}} data
  */
@@ -63,8 +63,8 @@ async function createBotObjects(adapter, data) {
                 data.address + '.control.turnOff', 'Turn off the Bot',
                 'boolean', 'button', true, false, '');
         }
-    } else if (data.serviceData.model === 'T') {
-        // SwitchBot Meter
+    } else if ((data.serviceData.model === 'T') || (data.serviceData.model === 'i')) {
+        // SwitchBot Meter (Plus)
         await adapter.createObjectNotExists(
             data.address + '.temperature', 'Temperature value',
             'number', 'value.temperature', false, data.serviceData.temperature.c, '°C');
@@ -138,7 +138,7 @@ async function createBotObjects(adapter, data) {
  *
  * @param {Object} adapter
  * @param {{address: String, rssi: Number, id: String,
- *          serviceData: {model: 'H'|'T'|'c'|'s'|'d', modelName: String, battery: Number, state: Boolean, mode: Boolean,
+ *          serviceData: {model: 'H'|'T'|'c'|'s'|'d'|'i', modelName: String, battery: Number, state: Boolean, mode: Boolean,
  *                        temperature: {c: Number, f: Number}, humidity: Number,
  *                        position: Number, calibration: Number, lightLevel: String, movement: Boolean, doorState: String}}} data
  */
@@ -163,7 +163,7 @@ async function setAdvertisementData(adapter, data) {
                 adapter.switchbotDevice[data.address].on = adapter.getOnStateValue(data);
                 adapter.setStateConditional(data.address + '.on', adapter.switchbotDevice[data.address].on, true);
             }
-        } else if (data.serviceData.model === 'T') {
+        } else if ((data.serviceData.model === 'T') || (data.serviceData.model === 'i')) {
             // SwitchBot Meter (WoSensorTH)
             adapter.setStateConditional(data.address + '.temperature', data.serviceData.temperature.c, true);
             adapter.setStateConditional(data.address + '.temperatureF', data.serviceData.temperature.f, true);

diff --git a/main.js b/main.js
@@ -27,7 +27,7 @@ class SwitchbotBle extends utils.Adapter {
 
         /**
          * @type {{[mac: String]: {address: String, rssi: Number, id: String,
-         *                         serviceData: {model: 'H'|'T'|'c'|'s'|'d', modelName: String, battery: Number, state: Boolean, mode: Boolean,
+         *                         serviceData: {model: 'H'|'T'|'c'|'s'|'d'|'i', modelName: String, battery: Number, state: Boolean, mode: Boolean,
          *                                       temperature: {c: Number, f: Number}, humidity: Number,
          *                                       position: Number, calibration: Number, lightLevel: Number, movement: Boolean, doorState: String},
          *                         on: Boolean}}}