diff --git a/docs/devices/IBT_6XS.md b/docs/devices/IBT_6XS.md index c6087006..0c9d6437 100644 --- a/docs/devices/IBT_6XS.md +++ b/docs/devices/IBT_6XS.md @@ -1,12 +1,12 @@ -# Inkbird 6XS BBQ +# Inkbird 6X(S) BBQ -|Model Id|[IBT_6XS](https://github.com/theengs/decoder/blob/development/src/devices/IBS_6XS_json.h)| +|Model Id|[IBT_6X(S)](https://github.com/theengs/decoder/blob/development/src/devices/IBT_6XS_SOLIS6_json.h)| |-|-| |Brand|Inkbird| |Model|BBQ Temperature sensor| |Short Description|BBQ Temperature sensor with 6 probes| |Communication|BLE broadcast| |Frequency|2.4Ghz| -|Power source|Rechargeable battery, USB| +|Power source|2 AAA (Rechargeable battery, USB)| |Exchanged data|temperature, temperature2, temperature3, temperature4, temperature5, temperature6| |Encrypted|No| diff --git a/docs/devices/SOLIS_6.md b/docs/devices/SOLIS_6.md index 6410e5a3..cf0bb86c 100644 --- a/docs/devices/SOLIS_6.md +++ b/docs/devices/SOLIS_6.md @@ -1,12 +1,12 @@ # Tenergy SOLIS 6 BBQ -|Model Id|[SOLIS_6](https://github.com/theengs/decoder/blob/development/src/devices/SOLIS_6_json.h)| +|Model Id|[SOLIS_6](https://github.com/theengs/decoder/blob/development/src/devices/IBT_6XS_SOLIS6_json.h)| |-|-| |Brand|Ternergy| |Model|BBQ Temperature sensor| |Short Description|BBQ Temperature sensor with 6 probes| |Communication|BLE broadcast| |Frequency|2.4Ghz| -|Power source|Rechargeable battery, USB| +|Power source|2 AA| |Exchanged data|temperature, temperature2, temperature3, temperature4, temperature5, temperature6| |Encrypted|No| diff --git a/src/decoder.h b/src/decoder.h index 869bb7ec..eb0a102a 100644 --- a/src/decoder.h +++ b/src/decoder.h @@ -60,7 +60,7 @@ class TheengsDecoder { IBSTH1, IBSTH2, IBT4XS, - IBT6XS, + IBT6XS_SOLIS, MIBAND, XMTZC04HM, XMTZC05HM, @@ -85,7 +85,6 @@ class TheengsDecoder { BM_V23, MS_CDP, GAEN, - SOLIS_6, BLE_ID_MAX }; diff --git a/src/devices.h b/src/devices.h index a7916ce0..50079e59 100644 --- a/src/devices.h +++ b/src/devices.h @@ -34,7 +34,7 @@ #include "devices/IBS_TH2_json.h" #include "devices/IBT_2X_json.h" #include "devices/IBT_4XS_json.h" -#include "devices/IBT_6XS_json.h" +#include "devices/IBT_6XS_SOLIS6_json.h" #include "devices/JQJCY01YM_json.h" #include "devices/LYWSD02_json.h" #include "devices/LYWSD03MMC_ATC_json.h" @@ -57,7 +57,6 @@ #include "devices/iBeacon_json.h" #include "devices/iNode_json.h" #include "devices/BM_V23_json.h" -#include "devices/SOLIS_6_json.h" const char* _devices[][2] = { {_HHCCJCY01HHCC_json, _HHCCJCY01HHCC_json_props}, @@ -74,7 +73,7 @@ const char* _devices[][2] = { {_IBS_TH1_json, _IBS_TH1_json_props}, {_IBS_TH2_json, _IBS_TH2_json_props}, {_IBT_4XS_json, _IBT_4XS_json_props}, - {_IBT_6XS_json, _IBT_6XS_json_props}, + {_IBT_6XS_SOLIS6_json, _IBT_6XS_SOLIS6_json_props}, {_Miband_json, _Miband_json_props}, {_XMTZC04HM_json, _XMTZC04HM_json_props}, {_XMTZC05HM_json, _XMTZC05HM_json_props}, @@ -99,5 +98,4 @@ const char* _devices[][2] = { {_BM_V23_json, _BM_V23_json_props}, {_MS_CDP_json, _MS_CDP_json_props}, {_GAEN_json, _GAEN_json_props}, - {_SOLIS_6_json, _SOLIS_6_json_props}, }; diff --git a/src/devices/IBT_2X_json.h b/src/devices/IBT_2X_json.h index 94f1a617..098264f4 100644 --- a/src/devices/IBT_2X_json.h +++ b/src/devices/IBT_2X_json.h @@ -1,28 +1,18 @@ -const char* _IBT_2X_json = "{\"brand\":\"Inkbird\",\"model\":\"iBBQ\",\"model_id\":\"IBT-2X\",\"condition\":[\"name\",\"index\",0,\"iBBQ\",\"&\",\"manufacturerdata\",\">=\",24,\"index\",0,\"0000\",\"&\",\"manufacturerdata\",\"<=\",28,\"index\",0,\"0000\"],\"properties\":{\"tempc\":{\"condition\":[\"manufacturerdata\",0,\"!\",\"00000000\",\"&\",\"manufacturerdata\",16,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",16,4,true,false],\"post_proc\":[\"/\",10]},\"_tempc\":{\"condition\":[\"manufacturerdata\",0,\"00000000\",\"&\",\"manufacturerdata\",20,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",20,4,true,false],\"post_proc\":[\"/\",10]},\"tempc2\":{\"condition\":[\"manufacturerdata\",0,\"!\",\"00000000\",\"&\",\"manufacturerdata\",20,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",20,4,true,false],\"post_proc\":[\"/\",10]},\"_tempc2\":{\"condition\":[\"manufacturerdata\",0,\"00000000\",\"&\",\"manufacturerdata\",24,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",24,4,true,false],\"post_proc\":[\"/\",10]}}}"; +const char* _IBT_2X_json = "{\"brand\":\"Inkbird\",\"model\":\"iBBQ\",\"model_id\":\"IBT-2X\",\"condition\":[\"name\",\"index\",0,\"iBBQ\",\"&\",\"manufacturerdata\",\"=\",28,\"index\",0,\"00000000\"],\"properties\":{\"tempc\":{\"condition\":[\"manufacturerdata\",20,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",20,4,true,false],\"post_proc\":[\"/\",10]},\"tempc2\":{\"condition\":[\"manufacturerdata\",24,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",24,4,true,false],\"post_proc\":[\"/\",10]}}}"; /*R""""( { "brand":"Inkbird", "model":"iBBQ", "model_id":"IBT-2X", - "condition":["name", "index", 0, "iBBQ","&","manufacturerdata", ">=", 24, "index", 0, "0000","&","manufacturerdata", "<=", 28, "index", 0, "0000"], + "condition":["name", "index", 0, "iBBQ","&","manufacturerdata", "=", 28, "index", 0, "00000000"], "properties":{ "tempc":{ - "condition":["manufacturerdata", 0, "!", "00000000", "&", "manufacturerdata", 16, "!", "f6ff"], - "decoder":["value_from_hex_data", "manufacturerdata", 16, 4, true, false], - "post_proc":["/", 10] - }, - "_tempc":{ - "condition":["manufacturerdata", 0, "00000000", "&", "manufacturerdata", 20, "!", "f6ff"], + "condition":["manufacturerdata", 20, "!", "f6ff"], "decoder":["value_from_hex_data", "manufacturerdata", 20, 4, true, false], "post_proc":["/", 10] }, "tempc2":{ - "condition":["manufacturerdata", 0, "!", "00000000", "&", "manufacturerdata", 20, "!", "f6ff"], - "decoder":["value_from_hex_data", "manufacturerdata", 20, 4, true, false], - "post_proc":["/", 10] - }, - "_tempc2":{ - "condition":["manufacturerdata", 0, "00000000", "&", "manufacturerdata", 24, "!", "f6ff"], + "condition":["manufacturerdata", 24, "!", "f6ff"], "decoder":["value_from_hex_data", "manufacturerdata", 24, 4, true, false], "post_proc":["/", 10] } diff --git a/src/devices/IBT_6XS_SOLIS6_json.h b/src/devices/IBT_6XS_SOLIS6_json.h new file mode 100644 index 00000000..5757d07b --- /dev/null +++ b/src/devices/IBT_6XS_SOLIS6_json.h @@ -0,0 +1,70 @@ +const char* _IBT_6XS_SOLIS6_json = "{\"brand\":\"Inkbird/Tenergy\",\"model\":\"iBBQ/SOLIS6\",\"model_id\":\"IBT-6XS/SOLIS-6\",\"condition\":[\"name\",\"index\",0,\"iBBQ\",\"&\",\"manufacturerdata\",\"=\",44,\"index\",0,\"00000000\"],\"properties\":{\"tempc\":{\"condition\":[\"manufacturerdata\",20,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",20,4,true,false],\"post_proc\":[\"/\",10]},\"tempc2\":{\"condition\":[\"manufacturerdata\",24,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",24,4,true,false],\"post_proc\":[\"/\",10]},\"tempc3\":{\"condition\":[\"manufacturerdata\",28,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4,true,false],\"post_proc\":[\"/\",10]},\"tempc4\":{\"condition\":[\"manufacturerdata\",32,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",32,4,true,false],\"post_proc\":[\"/\",10]},\"tempc5\":{\"condition\":[\"manufacturerdata\",36,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",36,4,true,false],\"post_proc\":[\"/\",10]},\"tempc6\":{\"condition\":[\"manufacturerdata\",40,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",40,4,true,false],\"post_proc\":[\"/\",10]}}}"; +/*R""""( +{ + "brand":"Inkbird/Tenergy", + "model":"iBBQ/SOLIS6", + "model_id":"IBT-6XS/SOLIS-6", + "condition":["name", "index", 0, "iBBQ", "&", "manufacturerdata", "=", 44, "index", 0, "00000000"], + "properties":{ + "tempc":{ + "condition":["manufacturerdata", 20, "!", "f6ff"], + "decoder":["value_from_hex_data", "manufacturerdata", 20, 4, true, false], + "post_proc":["/", 10] + }, + "tempc2":{ + "condition":["manufacturerdata", 24, "!", "f6ff"], + "decoder":["value_from_hex_data", "manufacturerdata", 24, 4, true, false], + "post_proc":["/", 10] + }, + "tempc3":{ + "condition":["manufacturerdata", 28, "!", "f6ff"], + "decoder":["value_from_hex_data", "manufacturerdata", 28, 4, true, false], + "post_proc":["/", 10] + }, + "tempc4":{ + "condition":["manufacturerdata", 32, "!", "f6ff"], + "decoder":["value_from_hex_data", "manufacturerdata", 32, 4, true, false], + "post_proc":["/", 10] + }, + "tempc5":{ + "condition":["manufacturerdata", 36, "!", "f6ff"], + "decoder":["value_from_hex_data", "manufacturerdata", 36, 4, true, false], + "post_proc":["/", 10] + }, + "tempc6":{ + "condition":["manufacturerdata", 40, "!", "f6ff"], + "decoder":["value_from_hex_data", "manufacturerdata", 40, 4, true, false], + "post_proc":["/", 10] + } + } +})"""";*/ +const char* _IBT_6XS_SOLIS6_json_props = "{\"properties\":{\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"tempc2\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"tempc3\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"tempc4\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"tempc5\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"tempc6\":{\"unit\":\"°C\",\"name\":\"temperature\"}}}"; +/*R""""( +{ + "properties":{ + "tempc":{ + "unit":"°C", + "name":"temperature" + }, + "tempc2":{ + "unit":"°C", + "name":"temperature" + }, + "tempc3":{ + "unit":"°C", + "name":"temperature" + }, + "tempc4":{ + "unit":"°C", + "name":"temperature" + }, + "tempc5":{ + "unit":"°C", + "name":"temperature" + }, + "tempc6":{ + "unit":"°C", + "name":"temperature" + } + } +})"""";*/ \ No newline at end of file diff --git a/src/devices/IBT_6XS_json.h b/src/devices/IBT_6XS_json.h deleted file mode 100644 index 4980a9dc..00000000 --- a/src/devices/IBT_6XS_json.h +++ /dev/null @@ -1,71 +0,0 @@ -const char* _IBT_6XS_json = "{\"brand\":\"Inkbird\",\"model\":\"iBBQ\",\"model_id\":\"IBT-6XS\",\"condition\":[\"name\",\"index\",0,\"iBBQ\",\"&\",\"manufacturerdata\",\"=\",40,\"index\",0,\"0000\"],\"properties\":{\"tempc\":{\"condition\":[\"manufacturerdata\",16,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",16,4,true,false],\"post_proc\":[\"/\",10]},\"tempc2\":{\"condition\":[\"manufacturerdata\",20,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",20,4,true,false],\"post_proc\":[\"/\",10]},\"tempc3\":{\"condition\":[\"manufacturerdata\",24,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",24,4,true,false],\"post_proc\":[\"/\",10]},\"tempc4\":{\"condition\":[\"manufacturerdata\",28,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4,true,false],\"post_proc\":[\"/\",10]},\"tempc5\":{\"condition\":[\"manufacturerdata\",32,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",32,4,true,false],\"post_proc\":[\"/\",10]},\"tempc6\":{\"condition\":[\"manufacturerdata\",36,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",36,4,true,false],\"post_proc\":[\"/\",10]}}}"; - -/*R""""( -{ - "brand":"Inkbird", - "model":"iBBQ", - "model_id":"IBT-6XS", - "condition":["name", "index", 0, "iBBQ","&","manufacturerdata","=", 40, "index", 0, "0000"], - "properties":{ - "tempc":{ - "condition":["manufacturerdata", 16, "!", "f6ff"], - "decoder":["value_from_hex_data", "manufacturerdata", 16, 4, true, false], - "post_proc":["/", 10] - }, - "tempc2":{ - "condition":["manufacturerdata", 20, "!", "f6ff"], - "decoder":["value_from_hex_data", "manufacturerdata", 20, 4, true, false], - "post_proc":["/", 10] - }, - "tempc3":{ - "condition":["manufacturerdata", 24, "!", "f6ff"], - "decoder":["value_from_hex_data", "manufacturerdata", 24, 4, true, false], - "post_proc":["/", 10] - }, - "tempc4":{ - "condition":["manufacturerdata", 28, "!", "f6ff"], - "decoder":["value_from_hex_data", "manufacturerdata", 28, 4, true, false], - "post_proc":["/", 10] - }, - "tempc5":{ - "condition":["manufacturerdata", 32, "!", "f6ff"], - "decoder":["value_from_hex_data", "manufacturerdata", 32, 4, true, false], - "post_proc":["/", 10] - }, - "tempc6":{ - "condition":["manufacturerdata", 36, "!", "f6ff"], - "decoder":["value_from_hex_data", "manufacturerdata", 36, 4, true, false], - "post_proc":["/", 10] - } - } -})"""";*/ -const char* _IBT_6XS_json_props = "{\"properties\":{\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"tempc2\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"tempc3\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"tempc4\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"tempc5\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"tempc6\":{\"unit\":\"°C\",\"name\":\"temperature\"}}}"; -/*R""""( -{ - "properties":{ - "tempc":{ - "unit":"°C", - "name":"temperature" - }, - "tempc2":{ - "unit":"°C", - "name":"temperature" - }, - "tempc3":{ - "unit":"°C", - "name":"temperature" - }, - "tempc4":{ - "unit":"°C", - "name":"temperature" - }, - "tempc5":{ - "unit":"°C", - "name":"temperature" - }, - "tempc6":{ - "unit":"°C", - "name":"temperature" - } - } -})"""";*/ \ No newline at end of file diff --git a/src/devices/SOLIS_6_json.h b/src/devices/SOLIS_6_json.h deleted file mode 100644 index 53e599ce..00000000 --- a/src/devices/SOLIS_6_json.h +++ /dev/null @@ -1,71 +0,0 @@ -const char* _SOLIS_6_json = "{\"brand\":\"Tenergy\",\"model\":\"SOLIS 6 Probes\",\"model_id\":\"SOLIS_6\",\"condition\":[\"name\",\"index\",0,\"iBBQ\",\"&\",\"manufacturerdata\",\"=\",44,\"index\",0,\"000000000\"],\"properties\":{\"tempc\":{\"condition\":[\"manufacturerdata\",20,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",20,4,true,false],\"post_proc\":[\"/\",10]},\"tempc2\":{\"condition\":[\"manufacturerdata\",24,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",24,4,true,false],\"post_proc\":[\"/\",10]},\"tempc3\":{\"condition\":[\"manufacturerdata\",28,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4,true,false],\"post_proc\":[\"/\",10]},\"tempc4\":{\"condition\":[\"manufacturerdata\",32,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",32,4,true,false],\"post_proc\":[\"/\",10]},\"tempc5\":{\"condition\":[\"manufacturerdata\",36,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",36,4,true,false],\"post_proc\":[\"/\",10]},\"tempc6\":{\"condition\":[\"manufacturerdata\",40,\"!\",\"f6ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",40,4,true,false],\"post_proc\":[\"/\",10]}}}"; - -/*R""""( -{ - "brand":"Tenergy", - "model":"SOLIS 6 Probes", - "model_id":"SOLIS_6", - "condition":["name", "index", 0, "iBBQ","&","manufacturerdata","=", 44, "index", 0, "000000000"], - "properties":{ - "tempc":{ - "condition":["manufacturerdata", 20, "!", "f6ff"], - "decoder":["value_from_hex_data", "manufacturerdata", 20, 4, true, false], - "post_proc":["/", 10] - }, - "tempc2":{ - "condition":["manufacturerdata", 24, "!", "f6ff"], - "decoder":["value_from_hex_data", "manufacturerdata", 24, 4, true, false], - "post_proc":["/", 10] - }, - "tempc3":{ - "condition":["manufacturerdata", 28, "!", "f6ff"], - "decoder":["value_from_hex_data", "manufacturerdata", 28, 4, true, false], - "post_proc":["/", 10] - }, - "tempc4":{ - "condition":["manufacturerdata", 32, "!", "f6ff"], - "decoder":["value_from_hex_data", "manufacturerdata", 32, 4, true, false], - "post_proc":["/", 10] - }, - "tempc5":{ - "condition":["manufacturerdata", 36, "!", "f6ff"], - "decoder":["value_from_hex_data", "manufacturerdata", 36, 4, true, false], - "post_proc":["/", 10] - }, - "tempc6":{ - "condition":["manufacturerdata", 40, "!", "f6ff"], - "decoder":["value_from_hex_data", "manufacturerdata", 40, 4, true, false], - "post_proc":["/", 10] - } - } -})"""";*/ -const char* _SOLIS_6_json_props = "{\"properties\":{\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"tempc2\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"tempc3\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"tempc4\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"tempc5\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"tempc6\":{\"unit\":\"°C\",\"name\":\"temperature\"}}}"; -/*R""""( -{ - "properties":{ - "tempc":{ - "unit":"°C", - "name":"temperature" - }, - "tempc2":{ - "unit":"°C", - "name":"temperature" - }, - "tempc3":{ - "unit":"°C", - "name":"temperature" - }, - "tempc4":{ - "unit":"°C", - "name":"temperature" - }, - "tempc5":{ - "unit":"°C", - "name":"temperature" - }, - "tempc6":{ - "unit":"°C", - "name":"temperature" - } - } -})"""";*/ \ No newline at end of file diff --git a/tests/BLE/test_ble.cpp b/tests/BLE/test_ble.cpp index 43f40336..5fe8e6da 100644 --- a/tests/BLE/test_ble.cpp +++ b/tests/BLE/test_ble.cpp @@ -61,7 +61,7 @@ const char* expected_mfg[] = { "{\"brand\":\"Inkbird\",\"model\":\"iBBQ\",\"model_id\":\"IBT-2X\",\"tempc2\":65,\"tempf2\":149}", "{\"brand\":\"Inkbird\",\"model\":\"iBBQ\",\"model_id\":\"IBT-2X\",\"tempc\":22,\"tempf\":71.6,\"tempc2\":21,\"tempf2\":69.8}", "{\"brand\":\"Inkbird\",\"model\":\"iBBQ\",\"model_id\":\"IBT-2X\",\"tempc2\":58,\"tempf2\":136.4}", - "{\"brand\":\"Inkbird\",\"model\":\"iBBQ\",\"model_id\":\"IBT-6XS\",\"tempc\":21,\"tempf\":69.8,\"tempc2\":20,\"tempf2\":68,\"tempc4\":21,\"tempf4\":69.8}", + "{\"brand\":\"Inkbird/Tenergy\",\"model\":\"iBBQ/SOLIS6\",\"model_id\":\"IBT-6XS/SOLIS-6\",\"tempc\":21,\"tempf\":69.8,\"tempc2\":20,\"tempf2\":68,\"tempc4\":21,\"tempf4\":69.8}", "{\"brand\":\"Ruuvi\",\"model\":\"RuuviTag\",\"model_id\":\"RuuviTag_RAWv1\",\"hum\":20.5,\"tempc\":26.3,\"tempf\":79.34,\"pres\":1027.66,\"accx\":-1,\"accy\":-1.726,\"accz\":0.714,\"volt\":2.899}", "{\"brand\":\"Ruuvi\",\"model\":\"RuuviTag\",\"model_id\":\"RuuviTag_RAWv1\",\"hum\":127.5,\"tempc\":127.99,\"tempf\":262.382,\"pres\":1155.35,\"accx\":32.767,\"accy\":32.767,\"accz\":32.767,\"volt\":65.535}", "{\"brand\":\"Ruuvi\",\"model\":\"RuuviTag\",\"model_id\":\"RuuviTag_RAWv1\",\"hum\":0,\"tempc\":-127.99,\"tempf\":-198.382,\"pres\":500,\"accx\":-32.767,\"accy\":-32.767,\"accz\":-32.767,\"volt\":0}", @@ -70,7 +70,7 @@ const char* expected_mfg[] = { "{\"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\":\"GENERIC\",\"model\":\"MS-CDP\",\"model_id\":\"MS-CDP\",\"device\":\"Windows 10 Desktop\",\"salt\":\"ac6d90ec\",\"hash\":\"0132b3204cd39c7ced3e48436ba15dc6\"}", - "{\"brand\":\"Tenergy\",\"model\":\"SOLIS 6 Probes\",\"model_id\":\"SOLIS_6\",\"tempc\":20,\"tempf\":68,\"tempc2\":20,\"tempf2\":68}", + "{\"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}", }; @@ -198,12 +198,12 @@ const char* test_mfgdata[][3] = { {"Inkbird TH2", "tps", "76fb03150110805908"}, {"iNode", "test1", "90826300f0cf0000c409a20080"}, {"iNode", "test2", "9082dd0061b80000c409a00080"}, - {"IBT-2X", "iBBQ", "0000fc45c30c458ee600e600"}, - {"IBT-2X", "iBBQ", "0000fc45c30c458e18014001"}, - {"IBT-2X", "iBBQ", "0000fc45c30c458ef6ff8a02"}, + {"IBT-2X", "iBBQ", "00000000fc45c30c458ee600e600"}, + {"IBT-2X", "iBBQ", "00000000fc45c30c458e18014001"}, + {"IBT-2X", "iBBQ", "00000000fc45c30c458ef6ff8a02"}, {"IBT-2X", "iBBQ", "00000000fc45c30d38a8dc00d200"}, {"IBT-2X", "iBBQ", "00000000fc45c30d38a8f6ff4402"}, - {"IBT-6XS", "iBBQ", "00003403de2745cdd200c800f6ffd200f6fff6ff"}, + {"IBT-6XS", "iBBQ", "000000003403de2745cdd200c800f6ffd200f6fff6ff"}, {"RuuviTag RAWv1", "RuuviTag", "990403291A1ECE1EFC18F94202CA0B53"}, {"RuuviTag RAWv1", "RuuviTag maximum values", "990403FF7F63FFFF7FFF7FFF7FFFFFFF"}, {"RuuviTag RAWv1", "RuuviTag minimum values", "99040300FF6300008001800180010000"}, @@ -212,7 +212,7 @@ const char* test_mfgdata[][3] = { {"RuuviTag RAWv2", "RuuviTag minimum values", "9904058001000000008001800180010000000000CBB8334C884F"}, {"BM_V23", "V23", "330117560e10177000ef01b3006c0100"}, {"MS-CDP", "Windows 10 Desktop", "060001092002ac6d90ec0132b3204cd39c7ced3e48436ba15dc6314778"}, - {"SOLIS_6", "iBBQ", "000000000cb2b71b5b18c800c800f6fff6fff6fff6ff"}, + {"SOLIS_6", "iBBQ", "000000000cb2b71b5b18c800c800f6ffd200f6fff6ff"}, }; TheengsDecoder::BLE_ID_NUM test_mfgdata_id_num[]{ @@ -236,7 +236,7 @@ TheengsDecoder::BLE_ID_NUM test_mfgdata_id_num[]{ TheengsDecoder::BLE_ID_NUM::IBT_2X, TheengsDecoder::BLE_ID_NUM::IBT_2X, TheengsDecoder::BLE_ID_NUM::IBT_2X, - TheengsDecoder::BLE_ID_NUM::IBT6XS, + TheengsDecoder::BLE_ID_NUM::IBT6XS_SOLIS, TheengsDecoder::BLE_ID_NUM::RUUVITAG_RAWV1, TheengsDecoder::BLE_ID_NUM::RUUVITAG_RAWV1, TheengsDecoder::BLE_ID_NUM::RUUVITAG_RAWV1, @@ -245,7 +245,7 @@ TheengsDecoder::BLE_ID_NUM test_mfgdata_id_num[]{ TheengsDecoder::BLE_ID_NUM::RUUVITAG_RAWV2, TheengsDecoder::BLE_ID_NUM::BM_V23, TheengsDecoder::BLE_ID_NUM::MS_CDP, - TheengsDecoder::BLE_ID_NUM::SOLIS_6, + TheengsDecoder::BLE_ID_NUM::IBT6XS_SOLIS, }; // uuid test input [test name] [uuid] [manufacturer data] [service data]