ThermoPro TP357 & TP358 (#198)

theengs · Sep 11, 2022 · aa41e4d · aa41e4d
1 parent 67d889f
commit aa41e4d
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 0 deletions.
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
@@ -75,6 +75,8 @@ module.exports = {
             'devices/SBMT',
             'devices/SBS1',
             'devices/ServiceData',
+            'devices/TP357',
+            'devices/TP358',
             'devices/TPMS',
             'devices/ThermoBeacon',
             'devices/HHCCJCY01HHCC',

diff --git a/docs/devices/TP357.md b/docs/devices/TP357.md
@@ -0,0 +1,12 @@
+# ThermoPro TP357
+
+|Model Id|[TP357](https://github.com/theengs/decoder/blob/development/src/devices/TP357_8_json.h)|
+|-|-|
+|Brand|ThermoPro|
+|Model|TH sensor|
+|Short Description|Temperature and humidity sensor|
+|Communication|BLE broadcast|
+|Frequency|2.4Ghz|
+|Power source|1 AAA|
+|Exchanged data|temperature, humidity|
+|Encrypted|No|
diff --git a/docs/devices/TP358.md b/docs/devices/TP358.md
@@ -0,0 +1,12 @@
+# ThermoPro TP358
+
+|Model Id|[TP358](https://github.com/theengs/decoder/blob/development/src/devices/TP357_8_json.h)|
+|-|-|
+|Brand|ThermoPro|
+|Model|TH sensor|
+|Short Description|Temperature and humidity sensor|
+|Communication|BLE broadcast|
+|Frequency|2.4Ghz|
+|Power source|2 AAA|
+|Exchanged data|temperature, humidity|
+|Encrypted|No|
diff --git a/src/decoder.h b/src/decoder.h
@@ -96,6 +96,7 @@ class TheengsDecoder {
     ABN03,
     ABTEMP,
     AMPHIRO,
+    TP357,
     IBEACON,
     SERVICE_DATA,
     BLE_ID_MAX

diff --git a/src/devices.h b/src/devices.h
@@ -64,6 +64,7 @@
 #include "devices/ABN03_json.h"
 #include "devices/ABTemp_json.h"
 #include "devices/Amphiro_json.h"
+#include "devices/TP357_8_json.h"
 #include "devices/iBeacon_json.h"
 #include "devices/iNodeEM_json.h"
 #include "devices/BM_V23_json.h"
@@ -122,6 +123,7 @@ const char* _devices[][2] = {
     {_ABN03_json, _ABN03_json_props},
     {_ABTemp_json, _ABTemp_json_props},
     {_AMPHIRO_json, _AMPHIRO_json_props},
+    {_TP357_json, _TP357_json_props},
     {_ibeacon_json, _ibeacon_json_props},
     {_ServiceData_json, _ServiceData_json_props},
 };
diff --git a/src/devices/TP357_8_json.h b/src/devices/TP357_8_json.h
@@ -0,0 +1,22 @@
+#include "common_props.h"
+
+const char* _TP357_json = "{\"brand\":\"ThermoPro\",\"model\":\"TH Sensor\",\"model_id\":\"TP357/8\",\"cidc\":false,\"condition\":[\"name\",\"index\",0,\"TP357\",\"|\",\"name\",\"index\",0,\"TP358\",\"&\",\"manufacturerdata\",\"=\",12],\"properties\":{\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",2,4,true,true],\"post_proc\":[\"/\",10]},\"hum\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",6,2,false,false]}}}";
+/*R""""(
+{
+   "brand":"ThermoPro",
+   "model":"TH Sensor",
+   "model_id":"TP357/8",
+   "cidc":false,
+   "condition":["name", "index", 0, "TP357", "|", "name", "index", 0, "TP358", "&","manufacturerdata", "=", 12],
+   "properties":{
+      "tempc":{
+         "decoder":["value_from_hex_data", "manufacturerdata", 2, 4, true, true],
+         "post_proc":["/", 10]
+      },
+      "hum":{
+         "decoder":["value_from_hex_data", "manufacturerdata", 6, 2, false, false]
+      }
+   }
+})"""";*/
+
+const char* _TP357_json_props = _common_TH_props;
diff --git a/tests/BLE/test_ble.cpp b/tests/BLE/test_ble.cpp
@@ -80,6 +80,10 @@ const char* expected_mfg[] = {
     "{\"brand\":\"SmartDry\",\"model\":\"Laundry Sensor\",\"model_id\":\"SDLS\",\"cidc\":false,\"tempc\":29.57704544,\"tempf\":85.23868179,\"hum\":55.99645996,\"shake\":false,\"shake_count\":74,\"volt\":2.929,\"wake\":false}",
     "{\"brand\":\"April Brother\",\"model\":\"ABTemp\",\"model_id\":\"ABTemp\",\"mfid\":\"4c00\",\"uuid\":\"b5b182c7eab14988aa99b5c1517008d9\",\"major\":1,\"batt\":100,\"tempc\":26,\"tempf\":78.8,\"txpower\":-59}",
     "{\"brand\":\"Oras\",\"model\":\"Hydractiva Digital\",\"model_id\":\"ADHS\",\"cidc\":false,\"session\":36,\"seconds\":21,\"litres\":2.6,\"tempc\":41,\"tempf\":105.8,\"energy\":0.12}",
+    "{\"brand\":\"ThermoPro\",\"model\":\"TH Sensor\",\"model_id\":\"TP357/8\",\"cidc\":false,\"tempc\":27.2,\"tempf\":80.96,\"hum\":71}",
+    "{\"brand\":\"ThermoPro\",\"model\":\"TH Sensor\",\"model_id\":\"TP357/8\",\"cidc\":false,\"tempc\":37.4,\"tempf\":99.32,\"hum\":74}",
+    "{\"brand\":\"ThermoPro\",\"model\":\"TH Sensor\",\"model_id\":\"TP357/8\",\"cidc\":false,\"tempc\":24.5,\"tempf\":76.1,\"hum\":50}",
+    "{\"brand\":\"ThermoPro\",\"model\":\"TH Sensor\",\"model_id\":\"TP357/8\",\"cidc\":false,\"tempc\":24.6,\"tempf\":76.28,\"hum\":51}",
 };
 
 const char* expected_uuid_mfgsvcdata[] = {
@@ -264,6 +268,10 @@ const char* test_mfgdata[][3] = {
     {"SmartDry", "Laundry Sensor", "ae01ca9dec4160fc5f424a005206"},
     {"ABTemp", "ABTemp", "4c000215b5b182c7eab14988aa99b5c1517008d90001641ac5"},
     {"Amphiro", "Digital Hand Shower", "eefa0000240015000015001a0029000c194f000000"},
+    {"ThermoPro", "TP357", "c2100147022c"},
+    {"ThermoPro", "TP357", "c276014a022c"},
+    {"ThermoPro", "TP358", "c2f50032022c"},
+    {"ThermoPro", "TP358", "c2f60033022c"},
 };
 
 TheengsDecoder::BLE_ID_NUM test_mfgdata_id_num[]{
@@ -322,6 +330,10 @@ TheengsDecoder::BLE_ID_NUM test_mfgdata_id_num[]{
   TheengsDecoder::BLE_ID_NUM::SMARTDRY,
   TheengsDecoder::BLE_ID_NUM::ABTEMP,
   TheengsDecoder::BLE_ID_NUM::AMPHIRO,
+  TheengsDecoder::BLE_ID_NUM::TP357,
+  TheengsDecoder::BLE_ID_NUM::TP357,
+  TheengsDecoder::BLE_ID_NUM::TP357,
+  TheengsDecoder::BLE_ID_NUM::TP357,
 };
 
 // uuid test input [test name] [uuid] [manufacturer data] [service data]