theengsdecoder 1.8.4__tar.gz → 1.9.0__tar.gz

{theengsdecoder-1.8.4 → theengsdecoder-1.9.0}/CMakeLists.txt

@@ -1,6 +1,6 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.5)
 
-project(decoder VERSION 1.8.4)
+project(decoder VERSION 1.9.0)
 find_package(PythonExtensions REQUIRED)
 
 add_library(_decoder MODULE TheengsDecoder/_decoder.cpp src/decoder.cpp)

{theengsdecoder-1.8.4/theengsdecoder.egg-info → theengsdecoder-1.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: theengsdecoder
-Version: 1.8.4
+Version: 1.9.0
 Summary: A message decoder for the Internet of Things
 Author: Theengs
 License:  GPL-3.0 License

{theengsdecoder-1.8.4 → theengsdecoder-1.9.0}/src/decoder.cpp

@@ -29,10 +29,13 @@
 #ifdef DEBUG_DECODER
 #  include <stdio.h>
 #  define DEBUG_PRINT(...) \
-    { printf(__VA_ARGS__); }
+    {                      \
+      printf(__VA_ARGS__); \
+    }
 #else
 #  define DEBUG_PRINT(...) \
-    {}
+    {                      \
+    }
 #endif
 
 #ifdef UNIT_TESTING
@@ -63,7 +66,7 @@ void TheengsDecoder::reverse_hex_data(const char* in, char* out, int l) {
     i -= 2;
     j += 2;
   }
-  out[l] = '\0';
+  out[j] = '\0';
 }
 
 double TheengsDecoder::bf_value_from_hex_string(const char* data_str,
@@ -103,11 +106,11 @@ double TheengsDecoder::value_from_hex_string(const char* data_str,
     DEBUG_PRINT("extracted value from %s = %lld\n", data.c_str(), (long long)value);
   } else {
     union {
-      long longV;
+      long long longV;
       float floatV;
     };
-    longV = strtol(data.c_str(), NULL, 16);
-    DEBUG_PRINT("extracted float value from %s = %f\n", data.c_str(), floatV);
+    longV = strtoll(data.c_str(), NULL, 16);
+    DEBUG_PRINT("extracted float value from %s = %lld = %f\n", data.c_str(), (long long)longV, floatV);
     value = floatV;
   }
 
@@ -285,9 +288,9 @@ bool TheengsDecoder::checkDeviceMatch(const JsonArray& condition,
         string_to_compare = mac_string.c_str();
 
         if (strstr(cond_str, "revmac@index") != nullptr) {
-          char* reverse_mac_string = (char*)malloc(strlen(string_to_compare) + 1);
-
+          char reverse_mac_string[13]; // 12 bytes + null terminator
           reverse_hex_data(string_to_compare, reverse_mac_string, 12);
+          reverse_mac_string[12] = '\0'; // Ensure null termination
           string_to_compare = reverse_mac_string;
         }
 
@@ -302,9 +305,7 @@ bool TheengsDecoder::checkDeviceMatch(const JsonArray& condition,
                     string_to_compare,
                     cond_index);
 
-        if (strncmp(&cmp_str[cond_index],
-                    string_to_compare,
-                    12) == 0) {
+        if (strncmp(&cmp_str[cond_index], string_to_compare, 12) == 0) {
           match = true;
         } else {
           match = false;
@@ -439,14 +440,14 @@ bool TheengsDecoder::checkPropCondition(const JsonArray& prop_condition,
           cond_met = evaluateDatalength(op, data_len, req_len);
         }
       } else if (dev_name != nullptr && strstr(prop_condition[i].as<const char*>(), "name") != nullptr) {
-        if (strstr(prop_condition[i+1].as<const char*>(), "contain") != nullptr) {
-          if (strstr(dev_name, prop_condition[i+2].as<const char*>()) != nullptr) {
-            cond_met = (strstr(prop_condition[i+1].as<const char*>(), "not_") != nullptr) ? false : true;
+        if (strstr(prop_condition[i + 1].as<const char*>(), "contain") != nullptr) {
+          if (strstr(dev_name, prop_condition[i + 2].as<const char*>()) != nullptr) {
+            cond_met = (strstr(prop_condition[i + 1].as<const char*>(), "not_") != nullptr) ? false : true;
           } else {
-            cond_met = (strstr(prop_condition[i+1].as<const char*>(), "not_") != nullptr) ? true : false;
+            cond_met = (strstr(prop_condition[i + 1].as<const char*>(), "not_") != nullptr) ? true : false;
           }
         }
-        
+
       } else {
         DEBUG_PRINT("ERROR property condition data source invalid\n");
         return false;
@@ -585,6 +586,9 @@ int TheengsDecoder::decodeBLEJson(JsonObject& jsondata) {
           case 18:
             doc["type"] = "AUDIO"; // Button
             break;
+          case 19:
+            doc["type"] = "WIND"; // Button
+            break;
           case 254:
             doc["type"] = "RMAC"; // random MAC address devices
             break;
@@ -728,18 +732,18 @@ int TheengsDecoder::decodeBLEJson(JsonObject& jsondata) {
                         temp_val += post_proc[i + 1].as<double>();
                         break;
                       case '%': {
-                        long val = (long)temp_val;
-                        temp_val = val % post_proc[i + 1].as<long>();
+                        long long val = (long long)temp_val;
+                        temp_val = (double)(val % post_proc[i + 1].as<long long>());
                         break;
                       }
                       case '<': {
-                        long val = (long)temp_val;
-                        temp_val = val << post_proc[i + 1].as<unsigned int>();
+                        long long val = (long long)temp_val;
+                        temp_val = (double)(val << post_proc[i + 1].as<unsigned int>());
                         break;
                       }
                       case '>': {
-                        long val = (long)temp_val;
-                        temp_val = val >> post_proc[i + 1].as<unsigned int>();
+                        long long val = (long long)temp_val;
+                        temp_val = (double)(val >> post_proc[i + 1].as<unsigned int>());
                         break;
                       }
                       case '!': {
@@ -749,12 +753,12 @@ int TheengsDecoder::decodeBLEJson(JsonObject& jsondata) {
                       }
                       case '&': {
                         long long val = (long long)temp_val;
-                        temp_val = val & post_proc[i + 1].as<unsigned int>();
+                        temp_val = (double)(val & post_proc[i + 1].as<unsigned int>());
                         break;
                       }
                       case '^': {
                         long long val = (long long)temp_val;
-                        temp_val = val ^ post_proc[i + 1].as<unsigned int>();
+                        temp_val = (double)(val ^ post_proc[i + 1].as<unsigned int>());
                         break;
                       }
                     }
@@ -774,7 +778,7 @@ int TheengsDecoder::decodeBLEJson(JsonObject& jsondata) {
                     }
                   } else if (strncmp(post_proc[i].as<const char*>(), "abs", 3) == 0) {
                     long long val = (long long)temp_val;
-                    temp_val = abs(val);
+                    temp_val = (double)abs(val);
                   } else if (strncmp(post_proc[i].as<const char*>(), "SBBT-dir", 8) == 0) { // "SBBT" decoder specific post_proc
                     if (temp_val < 0) {
                       proc_str = "down";
@@ -936,8 +940,14 @@ int TheengsDecoder::decodeBLEJson(JsonObject& jsondata) {
               ascii += ch;
             }
 
+            // DEBUG_PRINT("PROP: %s\n", prop.as<JsonObject>();
+
             if (ascii != "") {
-              jsondata[sanitizeJsonKey(kv.key().c_str())] = ascii;
+              if (prop.containsKey("is_double")) {
+                jsondata[sanitizeJsonKey(kv.key().c_str())] = std::stod(ascii);
+              } else {
+                jsondata[sanitizeJsonKey(kv.key().c_str())] = ascii;
+              }
             }
 
             success = i_main;

{theengsdecoder-1.8.4 → theengsdecoder-1.9.0}/src/decoder.h

@@ -140,6 +140,7 @@ public:
     MOPEKA,
     T201,
     T301,
+    THB1,
     NUT,
     NUTALE,
     ITAG,
@@ -156,10 +157,14 @@ public:
     APPLEAIRPODS,
     APPLEWATCH,
     APPLEDEVICE,
+    HOLYIOT,
     IBEACON,
     APPLE_CONT,
     APPLE_CONTAT,
+    SPHTP,
+    SPHT,
     SERVICE_DATA,
+    UT363BT,
     SE_RHT,
     SE_TEMP,
     SE_TPROBE,
@@ -173,6 +178,7 @@ public:
     SBMO_003Z_ENCR,
     SBHT_003C,
     SBHT_003C_ENCR,
+    VCH6003,
     BLE_ID_MAX
   };
 
@@ -189,7 +195,7 @@ private:
                                const char* dev_name, const char* svc_uuid, const char* mac_id);
   std::string sanitizeJsonKey(const char* key_in);
 
-  size_t m_docMax = 12000;
+  size_t m_docMax = 12200;
   size_t m_minSvcDataLen = 20;
   size_t m_minMfgDataLen = 16;
 };

theengsdecoder-1.9.0/src/devices/APPLEAIRPODS_json.h

@@ -0,0 +1,172 @@
+const char* _APPLEAIRPODS_json = "{\"brand\":\"Apple/Beats\",\"model\":\"AirPods (Pro)/Solo|Studio Buds\",\"model_id\":\"APPLEAIRPODS\",\"tag\":\"1218\",\"condition\":[\"manufacturerdata\",\"=\",58,\"index\",0,\"4c00071901\"],\"properties\":{\"version\":{\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",10,4],\"lookup\":[\"0220\",\"AirPods 1st gen.\",\"0f20\",\"AirPods 2nd gen.\",\"0e20\",\"AirPods Pro 1st gen.\",\"1420\",\"AirPods Pro 2 Lightning\",\"2420\",\"AirPods Pro 2 USB-C\",\"0a20\",\"AirPods Max Lightning\",\"0320\",\"Powerbeats³\",\"0520\",\"BeatsX\",\"0620\",\"Beats Solo³\"]},\"color\":{\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",22,2],\"lookup\":[\"00\",\"white\",\"01\",\"black\",\"02\",\"red\",\"03\",\"blue\",\"04\",\"pink\",\"05\",\"gray\",\"06\",\"silver\",\"07\",\"gold\",\"08\",\"rose gold\",\"09\",\"space gray\",\"0a\",\"dark blue\",\"0b\",\"light blue\",\"0c\",\"yellow\",\"11\",\"green\"]},\"status\":{\"condition\":[\"manufacturerdata\",10,\"!\",\"0a20\"],\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",14,2],\"lookup\":[\"05\",\"both in case\",\"14\",\"both in case\",\"15\",\"both in case\",\"25\",\"both in case\",\"34\",\"both in case\",\"35\",\"both in case\",\"55\",\"both in case\",\"75\",\"both in case\",\"00\",\"L in case - R out of case\",\"11\",\"L in case - R out of case\",\"71\",\"L in case - R out of case\",\"02\",\"L in case - R in ear\",\"13\",\"L in case - R in ear\",\"24\",\"L in case - R in ear\",\"73\",\"L in case - R in ear\",\"20\",\"R in case - L out of case\",\"31\",\"R in case - L out of case\",\"51\",\"R in case - L out of case\",\"04\",\"R in case - L in ear\",\"22\",\"R in case - L in ear\",\"33\",\"R in case - L in ear\",\"53\",\"R in case - L in ear\",\"01\",\"both out of case\",\"21\",\"both out of case\",\"03\",\"R in ear - L out of case\",\"29\",\"R in ear - L out of case\",\"23\",\"L in ear - R out of case\",\"09\",\"L in ear - R out of case\",\"0b\",\"both in ears\",\"2b\",\"both in ears\"]},\"_status\":{\"condition\":[\"manufacturerdata\",10,\"0a20\"],\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",14,2],\"lookup\":[\"25\",\"in case\",\"34\",\"in case\",\"35\",\"in case\",\"75\",\"in case\",\"21\",\"out of case\",\"2b\",\"on ears\"]},\"batt_r\":{\"condition\":[\"manufacturerdata\",14,\"bit\",1,1],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",16,1],\"post_proc\":[\"*\",10,\"max\",100]},\"_batt_r\":{\"condition\":[\"manufacturerdata\",14,\"bit\",1,0,\"&\",\"manufacturerdata\",10,\"!\",\"0a20\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",17,1],\"post_proc\":[\"*\",10,\"max\",100]},\"batt_l\":{\"condition\":[\"manufacturerdata\",14,\"bit\",1,1,\"&\",\"manufacturerdata\",10,\"!\",\"0a20\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",17,1],\"post_proc\":[\"*\",10,\"max\",100]},\"_batt_l\":{\"condition\":[\"manufacturerdata\",14,\"bit\",1,0,\"&\",\"manufacturerdata\",10,\"!\",\"0a20\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",16,1],\"post_proc\":[\"*\",10,\"max\",100]},\"batt_case\":{\"condition\":[\"manufacturerdata\",10,\"!\",\"0a20\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",19,1],\"post_proc\":[\"*\",10,\"max\",100]},\"charging_r\":{\"condition\":[\"manufacturerdata\",14,\"bit\",1,1],\"decoder\":[\"bit_static_value\",\"manufacturerdata\",18,1,false,true]},\"_charging_r\":{\"condition\":[\"manufacturerdata\",14,\"bit\",1,0,\"&\",\"manufacturerdata\",10,\"!\",\"0a20\"],\"decoder\":[\"bit_static_value\",\"manufacturerdata\",18,0,false,true]},\"charging_l\":{\"condition\":[\"manufacturerdata\",14,\"bit\",1,1,\"&\",\"manufacturerdata\",10,\"!\",\"0a20\"],\"decoder\":[\"bit_static_value\",\"manufacturerdata\",18,0,false,true]},\"_charging_l\":{\"condition\":[\"manufacturerdata\",14,\"bit\",1,0,\"&\",\"manufacturerdata\",10,\"!\",\"0a20\"],\"decoder\":[\"bit_static_value\",\"manufacturerdata\",18,1,false,true]},\"charging_case\":{\"condition\":[\"manufacturerdata\",10,\"!\",\"0a20\"],\"decoder\":[\"bit_static_value\",\"manufacturerdata\",18,2,false,true]}}}";
+/*R""""(
+{
+   "brand":"Apple/Beats",
+   "model":"AirPods (Pro)/Solo|Studio Buds",
+   "model_id":"APPLEAIRPODS",
+   "tag":"1218",
+   "condition":["manufacturerdata","=", 58, "index", 0, "4c00071901"],
+   "properties":{
+      "version":{
+         "decoder":["string_from_hex_data", "manufacturerdata", 10, 4],
+         "lookup":["0220", "AirPods 1st gen.",
+                   "0f20", "AirPods 2nd gen.",
+                   "0e20", "AirPods Pro 1st gen.",
+                   "1420", "AirPods Pro 2 Lightning",
+                   "2420", "AirPods Pro 2 USB-C",
+                   "0a20", "AirPods Max Lightning",
+                   "0320", "Powerbeats³",
+                   "0520", "BeatsX",
+                   "0620", "Beats Solo³"]
+      },
+      "color":{
+         "decoder":["string_from_hex_data", "manufacturerdata", 22, 2],
+         "lookup":["00", "white",
+                   "01", "black",
+                   "02", "red",
+                   "03", "blue",
+                   "04", "pink",
+                   "05", "gray",
+                   "06", "silver",
+                   "07", "gold",
+                   "08", "rose gold",
+                   "09", "space gray",
+                   "0a", "dark blue",
+                   "0b", "light blue",
+                   "0c", "yellow",
+                   "11", "green"]
+      },
+      "status":{
+         "condition":["manufacturerdata", 10, "!", "0a20"],
+         "decoder":["string_from_hex_data", "manufacturerdata", 14, 2],
+         "lookup":["05", "both in case",
+                   "14", "both in case",
+                   "15", "both in case",
+                   "25", "both in case",
+                   "34", "both in case",
+                   "35", "both in case",
+                   "55", "both in case",
+                   "75", "both in case",
+                   "00", "L in case - R out of case",
+                   "11", "L in case - R out of case",
+                   "71", "L in case - R out of case",
+                   "02", "L in case - R in ear",
+                   "13", "L in case - R in ear",
+                   "24", "L in case - R in ear",
+                   "73", "L in case - R in ear",
+                   "20", "R in case - L out of case",
+                   "31", "R in case - L out of case",
+                   "51", "R in case - L out of case",
+                   "04", "R in case - L in ear",
+                   "22", "R in case - L in ear",
+                   "33", "R in case - L in ear",
+                   "53", "R in case - L in ear",
+                   "01", "both out of case",
+                   "21", "both out of case",
+                   "03", "R in ear - L out of case",
+                   "29", "R in ear - L out of case",
+                   "23", "L in ear - R out of case",
+                   "09", "L in ear - R out of case",
+                   "0b", "both in ears",
+                   "2b", "both in ears"]
+      },
+       "_status":{
+         "condition":["manufacturerdata", 10, "0a20"],
+         "decoder":["string_from_hex_data", "manufacturerdata", 14, 2],
+         "lookup":["25", "in case",
+                   "34", "in case",
+                   "35", "in case",
+                   "75", "in case",
+                   "21", "out of case",
+                   "2b", "on ears"]
+      },
+      "batt_r":{
+         "condition":["manufacturerdata", 14, "bit", 1, 1],
+         "decoder":["value_from_hex_data", "manufacturerdata", 16, 1],
+         "post_proc":["*", 10, "max", 100]
+      },
+      "_batt_r":{
+         "condition":["manufacturerdata", 14, "bit", 1, 0, "&", "manufacturerdata", 10, "!", "0a20"],
+         "decoder":["value_from_hex_data", "manufacturerdata", 17, 1],
+         "post_proc":["*", 10, "max", 100]
+      },
+      "batt_l":{
+         "condition":["manufacturerdata", 14, "bit", 1, 1, "&", "manufacturerdata", 10, "!", "0a20"],
+         "decoder":["value_from_hex_data", "manufacturerdata", 17, 1],
+         "post_proc":["*", 10, "max", 100]
+      },
+      "_batt_l":{
+         "condition":["manufacturerdata", 14, "bit", 1, 0, "&", "manufacturerdata", 10, "!", "0a20"],
+         "decoder":["value_from_hex_data", "manufacturerdata", 16, 1],
+         "post_proc":["*", 10, "max", 100]
+      },
+      "batt_case":{
+         "condition":["manufacturerdata", 10, "!", "0a20"],
+         "decoder":["value_from_hex_data", "manufacturerdata", 19, 1],
+         "post_proc":["*", 10, "max", 100]
+      },
+      "charging_r":{
+         "condition":["manufacturerdata", 14, "bit", 1, 1],
+         "decoder":["bit_static_value", "manufacturerdata", 18, 1, false, true]
+      },
+      "_charging_r":{
+         "condition":["manufacturerdata", 14, "bit", 1, 0, "&", "manufacturerdata", 10, "!", "0a20"],
+         "decoder":["bit_static_value", "manufacturerdata", 18, 0, false, true]
+      },
+      "charging_l":{
+         "condition":["manufacturerdata", 14, "bit", 1, 1, "&", "manufacturerdata", 10, "!", "0a20"],
+         "decoder":["bit_static_value", "manufacturerdata", 18, 0, false, true]
+      },
+      "_charging_l":{
+         "condition":["manufacturerdata", 14, "bit", 1, 0, "&", "manufacturerdata", 10, "!", "0a20"],
+         "decoder":["bit_static_value", "manufacturerdata", 18, 1, false, true]
+      },
+      "charging_case":{
+         "condition":["manufacturerdata", 10, "!", "0a20"],
+         "decoder":["bit_static_value", "manufacturerdata", 18, 2, false, true]
+      }
+   }
+})"""";*/
+
+const char* _APPLEAIRPODS_json_props = "{\"properties\":{\"version\":{\"unit\":\"string\",\"name\":\"model version\"},\"color\":{\"unit\":\"string\",\"name\":\"color\"},\"status\":{\"unit\":\"string\",\"name\":\"status\"},\"batt_r\":{\"unit\":\"%\",\"name\":\"battery\"},\"batt_l\":{\"unit\":\"%\",\"name\":\"battery\"},\"batt_case\":{\"unit\":\"%\",\"name\":\"battery\"},\"charging_r\":{\"unit\":\"status\",\"name\":\"battery_charging\"},\"charging_l\":{\"unit\":\"status\",\"name\":\"battery_charging\"},\"charging_case\":{\"unit\":\"status\",\"name\":\"battery_charging\"}}}";
+/*R""""(
+{
+   "properties":{
+      "version":{
+         "unit":"string",
+         "name":"model version"
+      },
+      "color":{
+         "unit":"string",
+         "name":"color"
+      },
+      "status":{
+         "unit":"string",
+         "name":"status"
+      },
+      "batt_r":{
+         "unit":"%",
+         "name":"battery"
+      },
+      "batt_l":{
+         "unit":"%",
+         "name":"battery"
+      },
+      "batt_case":{
+         "unit":"%",
+         "name":"battery"
+      },
+      "charging_r":{
+         "unit":"status",
+         "name":"battery_charging"
+      },
+      "charging_l":{
+         "unit":"status",
+         "name":"battery_charging"
+      },
+      "charging_case":{
+         "unit":"status",
+         "name":"battery_charging"
+      }
+   }
+})"""";*/

{theengsdecoder-1.8.4 → theengsdecoder-1.9.0}/src/devices/BC08_json.h

@@ -1,11 +1,11 @@
-const char* _BC08_json = "{\"brand\":\"BlueCharm\",\"model\":\"Beacon 08/04P/021\",\"model_id\":\"KSensor\",\"tag\":\"0708\",\"condition\":[\"servicedata\",\"=\",26,\"index\",0,\"21010b\",\"&\",\"uuid\",\"index\",0,\"feaa\"],\"properties\":{\".cal\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",12,2,false,false],\"post_proc\":[\"/\",256,\"*\",100,\">\",0,\"/\",100]},\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",10,2,false,true],\"post_proc\":[\"+\",\".cal\"]},\"accx\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",14,4,false,true]},\"accy\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",18,4,false,true]},\"accz\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",22,4,false,true]},\"volt\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",6,4,false,false],\"post_proc\":[\"/\",1000]}}}";
+const char* _BC08_json = "{\"brand\":\"BlueCharm\",\"model\":\"Beacon 08/04P/021\",\"model_id\":\"KSensor\",\"tag\":\"0708\",\"condition\":[\"uuid\",\"index\",0,\"feaa\",\"&\",\"servicedata\",\"=\",26,\"index\",0,\"21010b\",\"|\",\"servicedata\",\"=\",26,\"index\",0,\"21000b\"],\"properties\":{\".cal\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",12,2,false,false],\"post_proc\":[\"/\",256,\"*\",100,\">\",0,\"/\",100]},\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",10,2,false,true],\"post_proc\":[\"+\",\".cal\"]},\"accx\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",14,4,false,true]},\"accy\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",18,4,false,true]},\"accz\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",22,4,false,true]},\"volt\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",6,4,false,false],\"post_proc\":[\"/\",1000]}}}";
 /*R""""(
 {
    "brand":"BlueCharm",
    "model":"Beacon 08/04P/021",
    "model_id":"KSensor",
    "tag":"0708",
-   "condition":["servicedata", "=", 26, "index", 0, "21010b", "&", "uuid", "index", 0, "feaa"],
+   "condition":["uuid", "index", 0, "feaa", "&", "servicedata", "=", 26, "index", 0, "21010b", "|", "servicedata", "=", 26, "index", 0, "21000b"],
    "properties":{
       ".cal":{
          "decoder":["value_from_hex_data", "servicedata", 12, 2, false, false],

{theengsdecoder-1.8.4 → theengsdecoder-1.9.0}/src/devices/CGDK2_json.h

@@ -57,14 +57,14 @@ const char* _CGDK2_json_ATC1441 = "{\"brand\":\"ClearGrass/Qingping\",\"model\":
 })"""";*/
 
 // PVVX
-const char* _CGDK2_json_PVVX = "{\"brand\":\"ClearGrass/Qingping\",\"model\":\"TH Lite\",\"model_id\":\"CGDK2_PVVX\",\"tag\":\"0102\",\"condition\":[\"servicedata\",\"=\",30,\"&\",\"uuid\",\"index\",0,\"181a\",\"&\",\"name\",\"index\",0,\"CGDK\"],\"properties\":{\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",12,4,true],\"post_proc\":[\"/\",100]},\"hum\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",16,4,true],\"post_proc\":[\"/\",100]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",24,2,false]},\"volt\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",20,4,true],\"post_proc\":[\"/\",1000]},\"mac\":{\"decoder\":[\"revmac_from_hex_data\",\"servicedata\",0]}}}";
+const char* _CGDK2_json_PVVX = "{\"brand\":\"ClearGrass/Qingping\",\"model\":\"TH Lite\",\"model_id\":\"CGDK2_PVVX\",\"tag\":\"0102\",\"condition\":[\"servicedata\",\"=\",30,\"&\",\"uuid\",\"index\",0,\"181a\",\"&\",\"name\",\"index\",0,\"CGD\"],\"properties\":{\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",12,4,true],\"post_proc\":[\"/\",100]},\"hum\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",16,4,true],\"post_proc\":[\"/\",100]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",24,2,false]},\"volt\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",20,4,true],\"post_proc\":[\"/\",1000]},\"mac\":{\"decoder\":[\"revmac_from_hex_data\",\"servicedata\",0]}}}";
 /* R""""(
 {
    "brand":"ClearGrass/Qingping",
    "model":"TH Lite",
    "model_id":"CGDK2_PVVX",
    "tag":"0102",
-   "condition":["servicedata", "=", 30, "&", "uuid", "index", 0, "181a", "&", "name", "index", 0, "CGDK"],
+   "condition":["servicedata", "=", 30, "&", "uuid", "index", 0, "181a", "&", "name", "index", 0, "CGD"],
    "properties":{
       "tempc":{
          "decoder":["value_from_hex_data", "servicedata", 12, 4, true],

{theengsdecoder-1.8.4 → theengsdecoder-1.9.0}/src/devices/H5055_json.h

@@ -1,11 +1,11 @@
-const char* _H5055_json = "{\"brand\":\"Govee\",\"model\":\"Bluetooth BBQ Thermometer\",\"model_id\":\"H5055\",\"tag\":\"0301\",\"condition\":[\"manufacturerdata\",\">=\",41,\"index\",12,\"06\",\"|\",\"manufacturerdata\",\">=\",41,\"index\",12,\"20\",\"&\",\"manufacturerdata\",\"index\",26,\"06\",\"|\",\"manufacturerdata\",\">=\",41,\"index\",26,\"20\",\"&\",\"manufacturerdata\",\"index\",40,\"0\"],\"properties\":{\"tempc1\":{\"condition\":[\"manufacturerdata\",14,\"!\",\"ffff\",\"&\",\"manufacturerdata\",10,\"bit\",3,0,\"&\",\"manufacturerdata\",10,\"bit\",2,0],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",14,4,true,false]},\"tempc2\":{\"condition\":[\"manufacturerdata\",28,\"!\",\"ffff\",\"&\",\"manufacturerdata\",10,\"bit\",3,0,\"&\",\"manufacturerdata\",10,\"bit\",2,0],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4,true,false]},\"tempc3\":{\"condition\":[\"manufacturerdata\",14,\"!\",\"ffff\",\"&\",\"manufacturerdata\",10,\"bit\",3,0,\"&\",\"manufacturerdata\",10,\"bit\",2,1],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",14,4,true,false]},\"tempc4\":{\"condition\":[\"manufacturerdata\",28,\"!\",\"ffff\",\"&\",\"manufacturerdata\",10,\"bit\",3,0,\"&\",\"manufacturerdata\",10,\"bit\",2,1],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4,true,false]},\"tempc5\":{\"condition\":[\"manufacturerdata\",14,\"!\",\"ffff\",\"&\",\"manufacturerdata\",10,\"bit\",3,1,\"&\",\"manufacturerdata\",10,\"bit\",2,0],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",14,4,true,false]},\"tempc6\":{\"condition\":[\"manufacturerdata\",28,\"!\",\"ffff\",\"&\",\"manufacturerdata\",10,\"bit\",3,1,\"&\",\"manufacturerdata\",10,\"bit\",2,0],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4,true,false]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",8,2,false]}}}";
+const char* _H5055_json = "{\"brand\":\"Govee\",\"model\":\"Bluetooth BBQ Thermometer\",\"model_id\":\"H5055\",\"tag\":\"0301\",\"condition\":[\"manufacturerdata\",\"index\",12,\"06\",\"|\",\"manufacturerdata\",\"index\",12,\"20\",\"|\",\"manufacturerdata\",\"index\",12,\"22\",\"&\",\"manufacturerdata\",\"=\",44,\"index\",40,\"0000\",\"|\",\"manufacturerdata\",\"=\",41,\"index\",40,\"0\"],\"properties\":{\"tempc1\":{\"condition\":[\"manufacturerdata\",14,\"!\",\"ffff\",\"&\",\"manufacturerdata\",10,\"bit\",3,0,\"&\",\"manufacturerdata\",10,\"bit\",2,0],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",14,4,true,false]},\"tempc2\":{\"condition\":[\"manufacturerdata\",28,\"!\",\"ffff\",\"&\",\"manufacturerdata\",10,\"bit\",3,0,\"&\",\"manufacturerdata\",10,\"bit\",2,0],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4,true,false]},\"tempc3\":{\"condition\":[\"manufacturerdata\",14,\"!\",\"ffff\",\"&\",\"manufacturerdata\",10,\"bit\",3,0,\"&\",\"manufacturerdata\",10,\"bit\",2,1],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",14,4,true,false]},\"tempc4\":{\"condition\":[\"manufacturerdata\",28,\"!\",\"ffff\",\"&\",\"manufacturerdata\",10,\"bit\",3,0,\"&\",\"manufacturerdata\",10,\"bit\",2,1],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4,true,false]},\"tempc5\":{\"condition\":[\"manufacturerdata\",14,\"!\",\"ffff\",\"&\",\"manufacturerdata\",10,\"bit\",3,1,\"&\",\"manufacturerdata\",10,\"bit\",2,0],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",14,4,true,false]},\"tempc6\":{\"condition\":[\"manufacturerdata\",28,\"!\",\"ffff\",\"&\",\"manufacturerdata\",10,\"bit\",3,1,\"&\",\"manufacturerdata\",10,\"bit\",2,0],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4,true,false]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",8,2,false]}}}";
 /*R""""(
 {
    "brand":"Govee",
    "model":"Bluetooth BBQ Thermometer",
    "model_id":"H5055",
    "tag":"0301",
-   "condition":["manufacturerdata", ">=", 41, "index", 12, "06", "|", "manufacturerdata", ">=", 41, "index", 12, "20", "&", "manufacturerdata", "index", 26, "06", "|", "manufacturerdata", ">=", 41, "index", 26, "20", "&", "manufacturerdata", "index", 40, "0"],
+   "condition":["manufacturerdata", "index", 12, "06", "|", "manufacturerdata", "index", 12, "20", "|", "manufacturerdata", "index", 12, "22", "&", "manufacturerdata", "=", 44, "index", 40, "0000", "|", "manufacturerdata", "=", 41, "index", 40, "0"],
    "properties":{
       "tempc1":{
         "condition":["manufacturerdata", 14, "!", "ffff", "&", "manufacturerdata", 10, "bit", 3, 0, "&", "manufacturerdata", 10, "bit", 2, 0],

{theengsdecoder-1.8.4 → theengsdecoder-1.9.0}/src/devices/HOBOMX2001_json.h

@@ -1,4 +1,4 @@
-const char* _HOBOMX2001_json = "{\"brand\":\"Onset\",\"model\":\"Hobo Water Level Sensor\",\"model_id\":\"HOBOMX2001\",\"tag\":\"ff\",\"condition\":[\"manufacturerdata\",\"=\",44,\"index\",0,\"c500\"],\"properties\":{\"lvl_cm\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",36,8,true,false,true],\"post_proc\":[\"*\",100]}}}";
+const char* _HOBOMX2001_json = "{\"brand\":\"Onset\",\"model\":\"Hobo Water Level Sensor\",\"model_id\":\"HOBOMX2001\",\"tag\":\"ff\",\"condition\":[\"manufacturerdata\",\"=\",44,\"index\",0,\"c500\"],\"properties\":{\"lvl_cm\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",36,8,true,true,true],\"post_proc\":[\"*\",100]}}}";
 /* R""""(
 {
    "brand":"Onset",
@@ -8,7 +8,7 @@ const char* _HOBOMX2001_json = "{\"brand\":\"Onset\",\"model\":\"Hobo Water Leve
    "condition":["manufacturerdata", "=", 44, "index", 0, "c500"],
    "properties":{
       "lvl_cm":{
-         "decoder":["value_from_hex_data", "manufacturerdata", 36, 8, true, false, true],
+         "decoder":["value_from_hex_data", "manufacturerdata", 36, 8, true, true, true],
          "post_proc":["*", 100]
       }
    }

theengsdecoder-1.9.0/src/devices/HOLYIOT_json.h

@@ -0,0 +1,32 @@
+const char* _HOLYIOT_json = "{\"brand\":\"HolyIoT\",\"model\":\"Beacon\",\"model_id\":\"HOLYIOT\",\"tag\":\"1009\",\"condition\":[\"manufacturerdata\",\"=\",50,\"index\",0,\"4c000215\",\"&\",\"servicedata\",\"=\",26,\"index\",0,\"416\",\"&\",\"uuid\",\"index\",0,\"5242\"],\"properties\":{\"batt\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",2,2]},\"device\":{\"decoder\":[\"static_value\",\"HolyIoT Beacon Tracker\"]}}}";
+/*R""""(
+{
+   "brand":"HolyIoT",
+   "model":"Beacon",
+   "model_id":"HOLYIOT",
+   "tag":"1009",
+   "condition":["manufacturerdata", "=", 50, "index", 0, "4c000215", "&", "servicedata", "=", 26, "index", 0, "416", "&", "uuid", "index", 0, "5242"],
+   "properties":{
+      "batt":{
+         "decoder":["value_from_hex_data", "servicedata", 2, 2]
+      },
+      "device":{
+         "decoder":["static_value", "HolyIoT Beacon Tracker"]
+      }
+   }
+})"""";*/
+
+const char* _HOLYIOT_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"
+      }
+   }
+})"""";*/

{theengsdecoder-1.8.4 → theengsdecoder-1.9.0}/src/devices/RuuviTag_RAWv2_json.h

@@ -1,4 +1,4 @@
-const char* _RuuviTag_RAWv2_json = "{\"brand\":\"Ruuvi\",\"model\":\"RuuviTag\",\"model_id\":\"RuuviTag_RAWv2\",\"tag\":\"0708\",\"condition\":[\"manufacturerdata\",\"=\",52,\"index\",0,\"990405\"],\"properties\":{\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",6,4,false,true],\"post_proc\":[\"/\",200]},\"hum\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",10,4,false,false],\"post_proc\":[\"/\",400]},\"pres\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",14,4,false,false],\"post_proc\":[\"+\",50000,\"/\",100]},\"accx\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",18,4,false,true],\"post_proc\":[\"/\",10000,\"*\",9.80665]},\"accy\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",22,4,false,true],\"post_proc\":[\"/\",10000,\"*\",9.80665]},\"accz\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",26,4,false,true],\"post_proc\":[\"/\",10000,\"*\",9.80665]},\"volt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",30,4,false,false],\"post_proc\":[\">\",5,\"+\",1600,\"/\",1000]},\"tx\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",30,4,false,false],\"post_proc\":[\"%\",32,\"*\",2,\"-\",40]},\"mov\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",34,2,false,false]},\"seq\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",36,4,false,false]},\"mac\":{\"decoder\":[\"mac_from_hex_data\",\"manufacturerdata\",40]}}}";
+const char* _RuuviTag_RAWv2_json = "{\"brand\":\"Ruuvi\",\"model\":\"RuuviTag\",\"model_id\":\"RuuviTag_RAWv2\",\"tag\":\"0708\",\"condition\":[\"manufacturerdata\",\"=\",52,\"index\",0,\"990405\"],\"properties\":{\"tempc\":{\"condition\":[\"manufacturerdata\",6,\"!\",\"8000\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",6,4,false,true],\"post_proc\":[\"/\",200]},\"hum\":{\"condition\":[\"manufacturerdata\",10,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",10,4,false,false],\"post_proc\":[\"/\",400]},\"pres\":{\"condition\":[\"manufacturerdata\",14,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",14,4,false,false],\"post_proc\":[\"+\",50000,\"/\",100]},\"accx\":{\"condition\":[\"manufacturerdata\",18,\"!\",\"8000\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",18,4,false,true],\"post_proc\":[\"/\",10000,\"*\",9.80665]},\"accy\":{\"condition\":[\"manufacturerdata\",22,\"!\",\"8000\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",22,4,false,true],\"post_proc\":[\"/\",10000,\"*\",9.80665]},\"accz\":{\"condition\":[\"manufacturerdata\",26,\"!\",\"8000\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",26,4,false,true],\"post_proc\":[\"/\",10000,\"*\",9.80665]},\"volt\":{\"condition\":[\"manufacturerdata\",30,\"!\",\"7ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",30,4,false,false],\"post_proc\":[\">\",5,\"+\",1600,\"/\",1000]},\"tx\":{\"condition\":[\"manufacturerdata\",33,\"!\",\"f\",\"&\",\"manufacturerdata\",32,\"!\",\"1\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",30,4,false,false],\"post_proc\":[\"%\",32,\"*\",2,\"-\",40]},\"mov\":{\"condition\":[\"manufacturerdata\",34,\"!\",\"ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",34,2,false,false]},\"seq\":{\"condition\":[\"manufacturerdata\",36,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",36,4,false,false]},\"mac\":{\"decoder\":[\"mac_from_hex_data\",\"manufacturerdata\",40]}}}";
 /*R""""(
 {
    "brand":"Ruuvi",
@@ -8,41 +8,51 @@ const char* _RuuviTag_RAWv2_json = "{\"brand\":\"Ruuvi\",\"model\":\"RuuviTag\",
    "condition":["manufacturerdata", "=", 52, "index", 0, "990405"],
    "properties":{
       "tempc":{
+         "condition":["manufacturerdata", 6, "!", "8000"],
          "decoder":["value_from_hex_data", "manufacturerdata", 6, 4, false, true],
          "post_proc":["/", 200]
       },
       "hum":{
+         "condition":["manufacturerdata", 10, "!", "ffff"],
          "decoder":["value_from_hex_data", "manufacturerdata", 10, 4, false, false],
          "post_proc":["/", 400]
       },
       "pres":{
+         "condition":["manufacturerdata", 14, "!", "ffff"],
          "decoder":["value_from_hex_data", "manufacturerdata", 14, 4, false, false],
          "post_proc":["+", 50000, "/", 100]
       },
       "accx":{
+         "condition":["manufacturerdata", 18, "!", "8000"],
          "decoder":["value_from_hex_data", "manufacturerdata", 18, 4, false, true],
          "post_proc":["/", 10000, "*", 9.80665]
       },
       "accy":{
+         "condition":["manufacturerdata", 22, "!", "8000"],
          "decoder":["value_from_hex_data", "manufacturerdata", 22, 4, false, true],
          "post_proc":["/", 10000, "*", 9.80665]
       },
       "accz":{
+         "condition":["manufacturerdata", 26, "!", "8000"],
          "decoder":["value_from_hex_data", "manufacturerdata", 26, 4, false, true],
          "post_proc":["/", 10000, "*", 9.80665]
       },
       "volt":{
+         "condition":["manufacturerdata", 30, "!", "7ff"],
          "decoder":["value_from_hex_data", "manufacturerdata", 30, 4, false, false],
          "post_proc":[">", 5, "+", 1600, "/", 1000]
       },
       "tx":{
+         "condition":["manufacturerdata", 33, "!", "f", "&", "manufacturerdata", 32, "!", "1"],
          "decoder":["value_from_hex_data", "manufacturerdata", 30, 4, false, false],
          "post_proc":["%", 32, "*", 2, "-", 40]
       },
       "mov":{
+         "condition":["manufacturerdata", 34, "!", "ff"],
          "decoder":["value_from_hex_data", "manufacturerdata", 34, 2, false, false]
       },
       "seq":{
+         "condition":["manufacturerdata", 36, "!", "ffff"],
          "decoder":["value_from_hex_data", "manufacturerdata", 36, 4, false, false]
       },
       "mac":{

theengsdecoder-1.9.0/src/devices/SensorP_HTP_json.h

@@ -0,0 +1,42 @@
+const char* _SensorPush_HTP_json = "{\"brand\":\"SensorPush\",\"model\":\"HTP.xw\",\"model_id\":\"SPHTP\",\"tag\":\"0209\",\"condition\":[\"manufacturerdata\",\"=\",14,\"index\",0,\"00\"],\"properties\":{\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",2,12,true,true],\"post_proc\":[\"%\",72001,\"*\",0.0025,\"+\",-40]},\"hum\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",2,12,true,false],\"post_proc\":[\"%\",2880112001,\"/\",72001,\"*\",0.0025]},\"pres\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",2,12,true,false],\"post_proc\":[\"%\",273613520207001,\"/\",2880112001,\"+\",30000.0,\"/\",100.0]}}}";
+/* R""""(
+{
+   "brand": "SensorPush",
+   "model": "HTP.xw",
+   "model_id": "SPHTP",
+   "tag": "0209",
+   "condition": ["manufacturerdata", "=", 14, "index", 0, "00"],
+   "properties": {
+      "tempc": {
+         "decoder": ["value_from_hex_data", "manufacturerdata", 2, 12, true, true],
+         "post_proc": ["%", 72001, "*", 0.0025, "+", -40]
+      },
+      "hum": {
+         "decoder": ["value_from_hex_data", "manufacturerdata", 2, 12, true, false],
+         "post_proc": ["%", 2880112001, "/", 72001, "*", 0.0025]
+      },
+      "pres":{
+         "decoder": ["value_from_hex_data", "manufacturerdata", 2, 12, true, false],
+         "post_proc": ["%", 273613520207001, "/", 2880112001, "+", 30000.0, "/", 100.0]
+      }
+   }
+})"""";*/
+
+const char* _SensorPush_HTP_json_props = "{\"properties\":{\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"hum\":{\"unit\":\"%\",\"name\":\"humidity\"},\"pres\":{\"unit\":\"hPa\",\"name\":\"pressure\"}}}";
+/*R""""(
+{
+   "properties": {
+      "tempc": {
+         "unit":"°C",
+         "name":"temperature"
+     },
+      "hum": {
+         "unit":"%",
+         "name":"humidity"
+     },
+      "pres": {
+         "unit":"hPa",
+         "name":"pressure"
+     }
+   }
+})"""";*/