diff --git a/docs/devices/BM_V23.md b/docs/devices/BM_V23.md index 2b02f13d..06fc0521 100644 --- a/docs/devices/BM_V23.md +++ b/docs/devices/BM_V23.md @@ -4,9 +4,9 @@ |-|-| |Brand|BlueMaestro| |Model|TempoDisc| -|Short Description|Temperature, humidity and due point with voltage, IP42| +|Short Description|Temperature, humidity and dew point with voltage, IP42| |Communication|BLE broadcast| |Frequency|2.4Ghz| |Power source|CR2032| -|Exchanged data|temperature, humidity, duepoint, voltage| +|Exchanged data|temperature, humidity, dew point, voltage| |Encrypted|No| diff --git a/src/devices/BM_V23_json.h b/src/devices/BM_V23_json.h index cdc6af58..ab1aa60c 100644 --- a/src/devices/BM_V23_json.h +++ b/src/devices/BM_V23_json.h @@ -1,6 +1,6 @@ #include "common_props.h" -const char* _BM_V23_json = "{\"brand\":\"BlueMaestro\",\"model\":\"TempoDisc\",\"model_id\":\"BM_V23\",\"condition\":[\"manufacturerdata\",\"=\",32,\"index\",0,\"3301\"],\"properties\":{\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",16,4],\"post_proc\":[\"/\",10]},\"hum\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",20,4],\"post_proc\":[\"/\",10]},\"dp\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",24,4],\"post_proc\":[\"/\",10]},\"volt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4],\"post_proc\":[\"/\",100]}}}"; +const char* _BM_V23_json = "{\"brand\":\"BlueMaestro\",\"model\":\"TempoDisc\",\"model_id\":\"BM_V23\",\"condition\":[\"manufacturerdata\",\"=\",32,\"index\",0,\"3301\"],\"properties\":{\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",16,4],\"post_proc\":[\"/\",10]},\"hum\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",20,4],\"post_proc\":[\"/\",10]},\"tempc2_dp\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",24,4],\"post_proc\":[\"/\",10]},\"volt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4],\"post_proc\":[\"/\",100]}}}"; /*R""""( { @@ -17,7 +17,7 @@ const char* _BM_V23_json = "{\"brand\":\"BlueMaestro\",\"model\":\"TempoDisc\",\ "decoder":["value_from_hex_data", "manufacturerdata", 20, 4], "post_proc":["/", 10] }, - "tempc2":{ + "tempc2_dp":{ "decoder":["value_from_hex_data", "manufacturerdata", 24, 4], "post_proc":["/", 10] }, @@ -28,7 +28,7 @@ const char* _BM_V23_json = "{\"brand\":\"BlueMaestro\",\"model\":\"TempoDisc\",\ } })"""";*/ -const char* _BM_V23_json_props = "{\"properties\":{\"volt\":{\"unit\":\"V\",\"name\":\"voltage\"},\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"dp\":{\"unit\":\"°C\",\"name\":\"dueppoint\"},\"hum\":{\"unit\":\"%\",\"name\":\"humidity\"}}}"; +const char* _BM_V23_json_props = "{\"properties\":{\"volt\":{\"unit\":\"V\",\"name\":\"voltage\"},\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"tempc2_dp\":{\"unit\":\"°C\",\"name\":\"dew point\"},\"hum\":{\"unit\":\"%\",\"name\":\"humidity\"}}}"; /*R""""( { "properties": { @@ -40,9 +40,9 @@ const char* _BM_V23_json_props = "{\"properties\":{\"volt\":{\"unit\":\"V\",\"na "unit": "°C", "name": "temperature" }, - "dp": { + "tempc2_dp": { "unit": "°C", - "name": "duepoint" + "name": "dew point" }, "hum": { "unit": "%", diff --git a/tests/BLE/test_ble.cpp b/tests/BLE/test_ble.cpp index 8683d8bf..e68aecb3 100644 --- a/tests/BLE/test_ble.cpp +++ b/tests/BLE/test_ble.cpp @@ -81,7 +81,7 @@ const char* expected_mfg[] = { "{\"brand\":\"Ruuvi\",\"model\":\"RuuviTag\",\"model_id\":\"RuuviTag_RAWv2\",\"tempc\":24.3,\"tempf\":75.74,\"hum\":53.49,\"pres\":1000.44,\"accx\":0.004,\"accy\":-0.004,\"accz\":1.036,\"volt\":2.977,\"tx\":4,\"mov\":66,\"seq\":205}", "{\"brand\":\"Ruuvi\",\"model\":\"RuuviTag\",\"model_id\":\"RuuviTag_RAWv2\",\"tempc\":163.835,\"tempf\":326.903,\"hum\":163.8350,\"pres\":1155.34,\"accx\":32.767,\"accy\":32.767,\"accz\":32.767,\"volt\":3.646,\"tx\":20,\"mov\":254,\"seq\":65534}", "{\"brand\":\"Ruuvi\",\"model\":\"RuuviTag\",\"model_id\":\"RuuviTag_RAWv2\",\"tempc\":-163.835,\"tempf\":-262.903,\"hum\":0,\"pres\":500,\"accx\":-32.767,\"accy\":-32.767,\"accz\":-32.767,\"volt\":1.6,\"tx\":-40,\"mov\":0,\"seq\":0}", - "{\"brand\":\"BlueMaestro\",\"model\":\"TempoDisc\",\"model_id\":\"BM_V23\",\"tempc\":23.9,\"tempf\":75.02,\"dp\":10.8,\"hum\":43.5,\"volt\":2.56}", + "{\"brand\":\"BlueMaestro\",\"model\":\"TempoDisc\",\"model_id\":\"BM_V23\",\"tempc\":23.9,\"tempf\":75.02,\"hum\":43.5,\"tempc2_dp\":10.8,\"tempf2_dp\":51.44,\"volt\":2.56}", "{\"brand\":\"GENERIC\",\"model\":\"MS-CDP\",\"model_id\":\"MS-CDP\",\"device\":\"Windows 10 Desktop\",\"salt\":\"ac6d90ec\",\"hash\":\"0132b3204cd39c7ced3e48436ba15dc6\"}", "{\"brand\":\"Inkbird/Tenergy\",\"model\":\"iBBQ/SOLIS6\",\"model_id\":\"IBT-6XS/SOLIS-6\",\"tempc\":20,\"tempf\":68,\"tempc2\":20,\"tempf2\":68,\"tempc4\":21,\"tempf4\":69.8}", };