Merge pull request #101 from DigiH/inkbird-solis-fixesnmerge

Inkbird fixes and 6X(S) merge with Solis 6
theengs · Mar 26, 2022 · fca6b1d · fca6b1d
2 parents 273c8af + 346074b
commit fca6b1d
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 176 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
+      }
+   }
+})"""";*/
diff --git a/src/devices/IBT_6XS_json.h b/src/devices/IBT_6XS_json.h
diff --git a/src/devices/SOLIS_6_json.h b/src/devices/SOLIS_6_json.h