node-switchbot 1.6.0-beta.3 → 1.6.0-beta.5

package/lib/switchbot-advertising.js

@@ -267,7 +267,7 @@ class SwitchbotAdvertising {
     let led = (byte5 & 0b00100000) >> 5;
     let iot = (byte5 & 0b00010000) >> 4;
     let sense_distance = (byte5 & 0b00001100) >> 2;
-    let light_intensity = byte5 & 0b00000011;
+    let lightLevel = byte5 & 0b00000011;
     let is_light = byte5 & 0b00000010 ? true : false;
 
     let data = {
@@ -279,7 +279,8 @@ class SwitchbotAdvertising {
       led: led,
       iot: iot,
       sense_distance: sense_distance,
-      light_intensity: light_intensity,
+      lightLevel:
+        lightLevel == 1 ? "dark" : lightLevel == 2 ? "bright" : "unknown",
       is_light: is_light,
     };
 
@@ -307,7 +308,7 @@ class SwitchbotAdvertising {
     let battery = byte2 & 0b01111111; // %
     let contact_open = byte3 & 0b00000010 == 0b00000010;
     let contact_timeout = byte3 & 0b00000100 == 0b00000100;
-    let is_light = byte3 & 0b00000001 ? true : false;
+    let lightLevel = byte3 & 0b00000001;
     let button_count = byte8 & 0b00001111;
 
     let data = {
@@ -318,9 +319,14 @@ class SwitchbotAdvertising {
       battery: battery,
       contact_open: contact_open,
       contact_timeout: contact_timeout,
-      is_light: is_light,
+      lightLevel: lightLevel == 0 ? "dark" : "bright",
       button_count: button_count,
-      hallState: hallState,
+      doorState:
+        hallState == 0
+          ? "close"
+          : hallState == 1
+          ? "open"
+          : "timeout no closed",
     };
 
     return data;
@@ -343,7 +349,8 @@ class SwitchbotAdvertising {
     let calibration = byte1 & 0b01000000 ? true : false; // Whether the calibration is completed
     let battery = byte2 & 0b01111111; // %
     let inMotion = byte3 & 0b10000000 ? true : false;
-    let currPosition = max(min(byte3 & 0b01111111, 100), 0) //byte3 & 0b01111111; // current positon %
+    let currPosition = byte3 & 0b01111111; // current positon %
+    //let currPosition = max(min(byte3 & 0b01111111, 100), 0) //byte3 & 0b01111111; // current positon %
     let lightLevel = (byte4 >> 4) & 0b00001111; // light sensor level (1-10)
     let deviceChain = byte4 & 0b00000111;
 
@@ -371,23 +378,23 @@ class SwitchbotAdvertising {
       return null;
     }
 
-    const byte6 = buf.readUInt8(6);
-    const byte7 = buf.readUInt8(7);
-    const byte8 = buf.readUInt8(8);
-    const byte9 = buf.readUInt8(9);
-    const byte10 = buf.readUInt8(10);
+    let byte6 = buf.readUInt8(6);
+    let byte7 = buf.readUInt8(7);
+    let byte8 = buf.readUInt8(8);
+    let byte9 = buf.readUInt8(9);
+    let byte10 = buf.readUInt8(10);
 
 
-    const sequence_number = byte6;
-    const state = byte7 & 0b01111111 ? true : false;
-    const brightness = byte7 & 0b01111111;
-    const delay = byte8 & 0b10000000;
-    const preset = byte8 & 0b00001000;
-    const color_mode = byte8 & 0b00000111;
-    const speed = byte9 & 0b01111111;
-    const loop_index = byte10 & 0b11111110;
+    let sequence_number = byte6;
+    let state = byte7 & 0b01111111 ? true : false;
+    let brightness = byte7 & 0b01111111;
+    let delay = byte8 & 0b10000000;
+    let preset = byte8 & 0b00001000;
+    let color_mode = byte8 & 0b00000111;
+    let speed = byte9 & 0b01111111;
+    let loop_index = byte10 & 0b11111110;
 
-    const data = {
+    let data = {
       model: "u",
       modelName: "WoBulb",
       sequence_number: sequence_number,
@@ -412,22 +419,22 @@ class SwitchbotAdvertising {
       }
       return null;
     }
-    const byte9 = buf.readUInt8(9); // byte9:  plug mini state; 0x00=off, 0x80=on
-    const byte10 = buf.readUInt8(10); // byte10: bit0: 0=no delay,1=delay, bit1:0=no timer, 1=timer; bit2:0=no sync time, 1=sync'ed time
-    const byte11 = buf.readUInt8(11); // byte11: wifi rssi
-    const byte12 = buf.readUInt8(12); // byte12: bit7: overload?
-    const byte13 = buf.readUInt8(13); // byte12[bit0~6] + byte13: current power value
-
-    const state = byte9 === 0x00 ? "off" : byte9 === 0x80 ? "on" : null;
-    const delay = !!(byte10 & 0b00000001);
-    const timer = !!(byte10 & 0b00000010);
-    const syncUtcTime = !!(byte10 & 0b00000100);
-    const wifiRssi = byte11;
-    const overload = !!(byte12 & 0b10000000);
-    const currentPower = (((byte12 & 0b01111111) << 8) + byte13) / 10; // in watt
+    let byte9 = buf.readUInt8(9); // byte9:  plug mini state; 0x00=off, 0x80=on
+    let byte10 = buf.readUInt8(10); // byte10: bit0: 0=no delay,1=delay, bit1:0=no timer, 1=timer; bit2:0=no sync time, 1=sync'ed time
+    let byte11 = buf.readUInt8(11); // byte11: wifi rssi
+    let byte12 = buf.readUInt8(12); // byte12: bit7: overload?
+    let byte13 = buf.readUInt8(13); // byte12[bit0~6] + byte13: current power value
+
+    let state = byte9 === 0x00 ? "off" : byte9 === 0x80 ? "on" : null;
+    let delay = !!(byte10 & 0b00000001);
+    let timer = !!(byte10 & 0b00000010);
+    let syncUtcTime = !!(byte10 & 0b00000100);
+    let wifiRssi = byte11;
+    let overload = !!(byte12 & 0b10000000);
+    let currentPower = (((byte12 & 0b01111111) << 8) + byte13) / 10; // in watt
     // TODO: voltage ???
 
-    const data = {
+    let data = {
       model: "g",
       modelName: "WoPlugMini",
       state: state,
@@ -451,22 +458,22 @@ class SwitchbotAdvertising {
       }
       return null;
     }
-    const byte9 = buf.readUInt8(9); // byte9:  plug mini state; 0x00=off, 0x80=on
-    const byte10 = buf.readUInt8(10); // byte10: bit0: 0=no delay,1=delay, bit1:0=no timer, 1=timer; bit2:0=no sync time, 1=sync'ed time
-    const byte11 = buf.readUInt8(11); // byte11: wifi rssi
-    const byte12 = buf.readUInt8(12); // byte12: bit7: overload?
-    const byte13 = buf.readUInt8(13); // byte12[bit0~6] + byte13: current power value
-
-    const state = byte9 === 0x00 ? "off" : byte9 === 0x80 ? "on" : null;
-    const delay = !!(byte10 & 0b00000001);
-    const timer = !!(byte10 & 0b00000010);
-    const syncUtcTime = !!(byte10 & 0b00000100);
-    const wifiRssi = byte11;
-    const overload = !!(byte12 & 0b10000000);
-    const currentPower = (((byte12 & 0b01111111) << 8) + byte13) / 10; // in watt
+    let byte9 = buf.readUInt8(9); // byte9:  plug mini state; 0x00=off, 0x80=on
+    let byte10 = buf.readUInt8(10); // byte10: bit0: 0=no delay,1=delay, bit1:0=no timer, 1=timer; bit2:0=no sync time, 1=sync'ed time
+    let byte11 = buf.readUInt8(11); // byte11: wifi rssi
+    let byte12 = buf.readUInt8(12); // byte12: bit7: overload?
+    let byte13 = buf.readUInt8(13); // byte12[bit0~6] + byte13: current power value
+
+    let state = byte9 === 0x00 ? "off" : byte9 === 0x80 ? "on" : null;
+    let delay = !!(byte10 & 0b00000001);
+    let timer = !!(byte10 & 0b00000010);
+    let syncUtcTime = !!(byte10 & 0b00000100);
+    let wifiRssi = byte11;
+    let overload = !!(byte12 & 0b10000000);
+    let currentPower = (((byte12 & 0b01111111) << 8) + byte13) / 10; // in watt
     // TODO: voltage ???
 
-    const data = {
+    let data = {
       model: "j",
       modelName: "WoPlugMini",
       state: state,
@@ -550,24 +557,24 @@ class SwitchbotAdvertising {
       return null;
     }
 
-    const byte7 = buf.readUInt8(7);
-    const byte8 = buf.readUInt8(8);
-    const byte9 = buf.readUInt8(9);
-    const byte10 = buf.readUInt8(10);
+    let byte7 = buf.readUInt8(7);
+    let byte8 = buf.readUInt8(8);
+    let byte9 = buf.readUInt8(9);
+    let byte10 = buf.readUInt8(10);
 
-    const state = byte7 & 0b10000000 ? true : false;
-    const lightLevel = byte7 & 0b01111111;
-    const delay = byte8 & 0b10000000;
-    const preset = byte8 & 0b00001000;
-    const color_mode = byte8 & 0b00000111;
-    const speed = byte9 & 0b01111111;
-    const loop_index = byte10 & 0b11111110;
+    let state = byte7 & 0b10000000 ? true : false;
+    let brightness = byte7 & 0b01111111;
+    let delay = byte8 & 0b10000000;
+    let preset = byte8 & 0b00001000;
+    let color_mode = byte8 & 0b00000111;
+    let speed = byte9 & 0b01111111;
+    let loop_index = byte10 & 0b11111110;
 
-    const data = {
+    let data = {
       model: "r",
       modelName: "WoStrip",
       state: state,
-      lightLevel: lightLevel,
+      brightness: brightness,
       delay: delay,
       preset: preset,
       color_mode: color_mode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-switchbot",
-  "version": "1.6.0-beta.3",
+  "version": "1.6.0-beta.5",
   "description": "The node-switchbot is a Node.js module which allows you to control your Switchbot Devices through Bluetooth (BLE).",
   "main": "./lib/switchbot.js",
   "files": [