Add Humidifier advertisement

Author: SwitchBot-Wonderlabs

lib/switchbot-advertising.js

@@ -91,7 +91,7 @@ class SwitchbotAdvertising {
       sd = this._parseServiceDataForWoSensorTH(buf);
     } else if (model === 'c') { // WoCurtain
       sd = this._parseServiceDataForWoCurtain(buf);
-    } else if (model === 's') { // WoPresence
+    } else if (model === 's') { // WoMotion
       sd = this._parseServiceDataForWoPresence(buf);
     } else if (model === 'd') { // WoContact
       sd = this._parseServiceDataForWoContact(buf);
@@ -149,20 +149,25 @@ class SwitchbotAdvertising {
   }
 
   _parseServiceDataForWoHumi(buf) {
-    if (buf.length !== 3) {
+    if (buf.length !== 8) {
       return null;
     }
     let byte1 = buf.readUInt8(1);
-    let byte2 = buf.readUInt8(2);
+    // let byte2 = buf.readUInt8(2);
+    let byte3 = buf.readUInt8(3);
+    let byte4 = buf.readUInt8(4);
+    let byte5 = buf.readUInt8(5);
 
-    let mode = (byte1 & 0b10000000) ? true : false; // Whether the light switch Add-on is used or not
-    let state = (byte1 & 0b01000000) ? true : false; // Whether the switch status is ON or OFF
+    let onState = (byte1 & 0b10000000) ? true : false; // 1 - on
+    let autoMode = (byte4 & 0b10000000) ? true : false; // 1 - auto
+    let percentage = byte4 & 0b01111111; // 0-100%, 101/102/103 - Quick gear 1/2/3
 
     let data = {
-      model: 'h',
+      model: 'e',
       modelName: 'WoHumi',
-      mode: mode,
-      state: state
+      onState: onState,
+      autoMode: autoMode,
+      percentage: autoMode ? 0 : percentage,
     };
 
     return data;
@@ -201,21 +206,20 @@ class SwitchbotAdvertising {
     if (buf.length !== 6) {
       return null;
     }
-
     let byte1 = buf.readUInt8(1);
     let byte2 = buf.readUInt8(2);
     // let byte3 = buf.readUInt8(3);
     // let byte4 = buf.readUInt8(4);
     let byte5 = buf.readUInt8(5);
 
-    let pirState = byte1 & 0b01000000; // 1 - Movement detected
+    let pirState = (byte1 & 0b01000000) ? true : false; // 1 - Movement detected
     let battery = byte2 & 0b01111111; // %
     let lightLevel = byte5 & 0b00000011;
 
     let data = {
       model: 's',
-      modelName: 'WoPresence',
-      movement: pirState ? true : false,
+      modelName: 'WoMotion',
+      movement: pirState,
       battery: battery,
       lightLevel: (lightLevel == 1) ? 'dark' : ((lightLevel == 2) ? 'bright' : 'unknown'),
     };
@@ -237,15 +241,15 @@ class SwitchbotAdvertising {
     // let byte7 = buf.readUInt8(7);
     // let byte8 = buf.readUInt8(8);
 
-    let pirState = byte1 & 0b01000000; // 1 - Movement detected
+    let pirState = (byte1 & 0b01000000) ? true : false; // 1 - Movement detected
     let battery = byte2 & 0b01111111; // %
     let hallState = (byte3 >> 1) & 0b00000011;
     let lightLevel = byte3 & 0b00000001;
 
     let data = {
       model: 'd',
       modelName: 'WoContact',
-      movement: pirState ? true : false,
+      movement: pirState,
       battery: battery,
       doorState: (hallState == 0) ? 'close' : ((hallState == 1) ? 'open' : 'timeout no closed'),
       lightLevel: (lightLevel == 0) ? 'dark' : 'bright',
@@ -263,15 +267,15 @@ class SwitchbotAdvertising {
     let byte3 = buf.readUInt8(3);
     let byte4 = buf.readUInt8(4);
 
-    let calibration = byte1 & 0b01000000; // Whether the calibration is completed
+    let calibration = (byte1 & 0b01000000) ? true : false; // Whether the calibration is completed
     let battery = byte2 & 0b01111111; // %
     let currPosition = byte3 & 0b01111111; // current positon %
     let lightLevel = (byte4 >> 4) & 0b00001111; // light sensor level (1-10)
 
     let data = {
       model: 'c',
       modelName: 'WoCurtain',
-      calibration: calibration ? true : false,
+      calibration: calibration,
       battery: battery,
       position: currPosition,
       lightLevel: lightLevel
@@ -281,4 +285,4 @@ class SwitchbotAdvertising {
   }
 }
 
-module.exports = new SwitchbotAdvertising();
+module.exports = new SwitchbotAdvertising();