BM6 Battery Monitor decoder (#443)

theengs · Nov 6, 2023 · 896ccf9 · 896ccf9
1 parent e5ef1df
commit 896ccf9
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 1 deletion.
diff --git a/docs/devices/BM2.md b/docs/devices/BM2.md
@@ -7,7 +7,7 @@
 |Short Description|Battery capacity|
 |Communication|BLE broadcast|
 |Frequency|2.4Ghz|
-|Power Source|12V|
+|Power Source|8V-16V or 6V-20V (depending on model)|
 |Exchanged Data|battery|
 |Encrypted|No|
 |Presence Tracker|&#9989;|

diff --git a/docs/devices/BM6.md b/docs/devices/BM6.md
@@ -0,0 +1,13 @@
+# BM6 Battery Monitor
+
+|Model Id|[BM6](https://github.com/theengs/decoder/blob/development/src/devices/BM6_json.h)|
+|-|-|
+|Brand|GENERIC|
+|Model|BM6 Battery Monitor|
+|Short Description|Battery capacity|
+|Communication|BLE broadcast|
+|Frequency|2.4Ghz|
+|Power Source|6V-20V|
+|Exchanged Data|battery|
+|Encrypted|No|
+|Presence Tracker|&#9989;|
diff --git a/src/decoder.h b/src/decoder.h
@@ -113,6 +113,7 @@ class TheengsDecoder {
     BPARASITE,
     BWBSDOO,
     BM2,
+    BM6,
     RDL52832,
     ABN03,
     ABN07,

diff --git a/src/devices.h b/src/devices.h
@@ -90,6 +90,7 @@
 #include "devices/BPARASITE_json.h"
 #include "devices/BWBSDOO_json.h"
 #include "devices/BM2_json.h"
+#include "devices/BM6_json.h"
 #include "devices/JHT_F525_json.h"
 #include "devices/iBeacon_json.h"
 #include "devices/APPLE_json.h"
@@ -170,6 +171,7 @@ const char* _devices[][2] = {
     {_BPARASITE_json, _BPARASITE_json_props},
     {_BWBSDOO_json, _BWBSDOO_json_props},
     {_BM2_json, _BM2_json_props},
+    {_BM6_json, _BM6_json_props},
     {_RDL52832_json, _RDL52832_json_props},
     {_ABN03_json, _ABN03_json_props},
     {_ABN07_json, _ABN07_json_props},

diff --git a/src/devices/BM6_json.h b/src/devices/BM6_json.h
@@ -0,0 +1,32 @@
+const char* _BM6_json = "{\"brand\":\"GENERIC\",\"model\":\"BM6 Battery Monitor\",\"model_id\":\"BM6\",\"tag\":\"0808\",\"condition\":[\"manufacturerdata\",\"=\",50,\"index\",0,\"4c0002153ba29cd9a42c894856badaf2606ef777\"],\"properties\":{\"batt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",42,2,false]},\"device\":{\"decoder\":[\"static_value\",\"BM6 Tracker\"]}}}";
+/*R""""(
+{
+   "brand":"GENERIC",
+   "model":"BM6 Battery Monitor",
+   "model_id":"BM6",
+   "tag":"0808",
+   "condition":["manufacturerdata", "=", 50, "index", 0, "4c0002153ba29cd9a42c894856badaf2606ef777"],
+   "properties":{
+      "batt":{
+         "decoder":["value_from_hex_data", "manufacturerdata", 42, 2, false]
+      },
+      "device":{
+         "decoder":["static_value", "BM6 Tracker"]
+      }
+   }
+})"""";*/
+
+const char* _BM6_json_props = "{\"properties\":{\"batt\":{\"unit\":\"%\",\"name\":\"battery\"},\"device\":{\"unit\":\"string\",\"name\":\"tracker device\"}}}";
+/*R""""(
+{
+   "properties":{
+      "batt":{
+         "unit":"%",
+         "name":"battery"
+      },
+      "device":{
+         "unit":"string",
+         "name":"tracker device"
+      }
+   }
+})"""";*/
diff --git a/tests/BLE/test_ble.cpp b/tests/BLE/test_ble.cpp
@@ -131,6 +131,8 @@ const char* expected_mfg[] = {
     "{\"brand\":\"Oral-B\",\"model\":\"BT Toothbrush\",\"model_id\":\"ORALB_BT\",\"type\":\"BODY\",\"state\":\"running\",\"sector\":\"sector 3\",\"pressure\":50,\"time\":74}",
     "{\"brand\":\"Oral-B\",\"model\":\"BT Toothbrush\",\"model_id\":\"ORALB_BT\",\"type\":\"BODY\",\"state\":\"idle\",\"mode\":\"daily clean\",\"sector\":\"sector 1\",\"pressure\":32,\"time\":0}",
     "{\"brand\":\"Oral-B\",\"model\":\"BT Toothbrush\",\"model_id\":\"ORALB_BT\",\"type\":\"BODY\",\"state\":\"sleeping\",\"mode\":\"turbo\",\"sector\":\"sector 8\",\"pressure\":32,\"time\":135}",
+    "{\"brand\":\"GENERIC\",\"model\":\"BM6 Battery Monitor\",\"model_id\":\"BM6\",\"type\":\"BATT\",\"track\":true,\"batt\":77,\"device\":\"BM6 Tracker\"}",
+    "{\"brand\":\"GENERIC\",\"model\":\"BM6 Battery Monitor\",\"model_id\":\"BM6\",\"type\":\"BATT\",\"track\":true,\"batt\":78,\"device\":\"BM6 Tracker\"}",
 };
 
 const char* expected_name_uuid_mfgsvcdata[] = {
@@ -488,6 +490,8 @@ const char* test_mfgdata[][3] = {
     {"Braun", "Oral-B", "dc000471050332010e08032e04"},
     {"Braun", "Oral-B", "dc000202060220000001010004"},
     {"Braun", "Oral-B", "dc000202067320020f07080004"},
+    {"BM6", "Battery Monitor", "4c0002153ba29cd9a42c894856badaf2606ef777114d0000cd"},
+    {"BM6", "Battery Monitor", "4c0002153ba29cd9a42c894856badaf2606ef777114e0000cd"},
 };
 
 TheengsDecoder::BLE_ID_NUM test_mfgdata_id_num[]{
@@ -601,6 +605,8 @@ TheengsDecoder::BLE_ID_NUM test_mfgdata_id_num[]{
     TheengsDecoder::BLE_ID_NUM::ORALB_BT,
     TheengsDecoder::BLE_ID_NUM::ORALB_BT,
     TheengsDecoder::BLE_ID_NUM::ORALB_BT,
+    TheengsDecoder::BLE_ID_NUM::BM6,
+    TheengsDecoder::BLE_ID_NUM::BM6,
 };
 
 // uuid test input [test name] [device name] [uuid] [manufacturer data] [service data]