theengsdecoder 1.9.9__tar.gz → 2.1.0__tar.gz

{theengsdecoder-1.9.9 → theengsdecoder-2.1.0}/CMakeLists.txt

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

{theengsdecoder-1.9.9/theengsdecoder.egg-info → theengsdecoder-2.1.0}/PKG-INFO

@@ -1,10 +1,15 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: theengsdecoder
-Version: 1.9.9
+Version: 2.1.0
 Summary: A message decoder for the Internet of Things
 Author: Theengs
 License:  GPL-3.0 License
 Description-Content-Type: text/markdown
+Dynamic: author
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: license
+Dynamic: summary
 
 # Theengs Decoder
 

{theengsdecoder-1.9.9 → theengsdecoder-2.1.0}/src/decoder.h

@@ -63,6 +63,7 @@ public:
     CGDK2_ATC1441,
     CGH1,
     JQJCY01YM,
+    IBS_P02B,
     IBSTHBP01B,
     IBT_2X,
     IBT_2XS,
@@ -74,12 +75,16 @@ public:
     XMTZC05HMKG,
     XMTZC05HMLB,
     TPMS,
+    TPMSBR,
     KKM_K6P,
     KKM_K9,
     LYWSD03MMC_ATC,
     LYWSD03MMC_PVVX,
     LYWSD03MMC_PVVX_DECR,
+    LYWSD03MMC_PVVX_BTHOME,
     LYWSD03MMC_PVVX_ENCR,
+    LYWSD03MMC_PVVX_BTHOME_1_ENCR,
+    LYWSD03MMC_PVVX_BTHOME_2_ENCR,
     CGPR1,
     THERMOBEACON,
     H5055,
@@ -87,7 +92,9 @@ public:
     H5074,
     H5102,
     H5106,
+    H5140,
     H5179,
+    H5179_N,
     HHCCJCY10,
     MUE4094RT,
     NODONNIU,
@@ -124,6 +131,7 @@ public:
     HHCCPOT002,
     HOBOMX2001,
     BPARASITE,
+    BPARASITEV2,
     BWBSDOO,
     BM2,
     BM6,
@@ -167,12 +175,11 @@ public:
     SPHT,
     SERVICE_DATA,
     UT363BT,
-    VICTBSC_ENCR,
+    VICTRON_ENCR,
     VICTBSC,
-    VICTORIONXS_ENCR,
     VICTORIONXS,
-    VICTSBP_ENCR,
     VICTSBP,
+    VICTSBS,
     SE_RHT,
     SE_TEMP,
     SE_TPROBE,
@@ -203,7 +210,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 = 12200;
+  size_t m_docMax = 11800;
   size_t m_minSvcDataLen = 4;
   size_t m_minMfgDataLen = 10;
 };

theengsdecoder-2.1.0/src/devices/APPLEAIRPODS_json.h

@@ -0,0 +1,124 @@
+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\"]},\"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"]
+      },
+      "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\"},\"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"
+      },
+      "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-2.1.0/src/devices/APPLEDEVICE_json.h

@@ -0,0 +1,25 @@
+const char* _APPLEDEVICE_json = "{\"brand\":\"Apple\",\"model\":\"Apple iPhone/iPad\",\"model_id\":\"APPLEDEVICE\",\"tag\":\"1018\",\"condition\":[\"manufacturerdata\",\">=\",8,\"index\",0,\"4c0010\"],\"properties\":{\"device\":{\"decoder\":[\"static_value\",\"iPhone/iPad\"]}}}";
+/*R""""(
+{
+   "brand":"Apple",
+   "model":"Apple iPhone/iPad",
+   "model_id":"APPLEDEVICE",
+   "tag":"1018",
+   "condition":["manufacturerdata", ">=", 8, "index", 0, "4c0010"],
+   "properties":{
+      "device":{
+         "decoder":["static_value", "iPhone/iPad"]
+      }
+   }
+})"""";*/
+
+const char* _APPLEDEVICE_json_props = "{\"properties\":{\"device\":{\"unit\":\"string\",\"name\":\"device\"}}}";
+/*R""""(
+{
+   "properties":{
+      "device":{
+         "unit":"string",
+         "name":"device"
+      }
+   }
+})"""";*/

theengsdecoder-2.1.0/src/devices/BPARASITEV2_json.h

@@ -0,0 +1,70 @@
+const char* _BPARASITEV2_json = "{\"brand\":\"rbaron\",\"model\":\"b-parasite\",\"model_id\":\"BPv2.0\",\"tag\":\"0902\",\"condition\":[\"name\",\"contain\",\"prst\",\"uuid\",\"contain\",\"fcd2\"],\"properties\":{\"tempc\":{\"condition\":[\"servicedata\",6,\"02\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",8,4,true,true],\"post_proc\":[\"/\",100]},\"hum\":{\"condition\":[\"servicedata\",26,\"2e\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",28,2,false,false]},\"moi\":{\"condition\":[\"servicedata\",30,\"2f\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",32,2,false,false]},\"lux\":{\"condition\":[\"servicedata\",12,\"05\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",14,6,true,false],\"post_proc\":[\"/\",100]},\"batt\":{\"condition\":[\"servicedata\",2,\"01\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",4,2,true,false]},\"volt\":{\"condition\":[\"servicedata\",20,\"0c\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",22,4,true,false],\"post_proc\":[\"/\",1000]}}}";
+
+/* R""""(
+{
+   "brand":"rbaron",
+   "model":"b-parasite",
+   "model_id":"BPv2.0",
+   "tag":"0902",
+   "condition":["name", "contain", "prst", "uuid", "contain", "fcd2"],
+   "properties":{
+      "tempc":{
+         "condition":["servicedata", 6, "02"],
+         "decoder":["value_from_hex_data", "servicedata", 8, 4, true, true],
+         "post_proc":["/", 100]
+      },
+      "hum":{
+         "condition":["servicedata", 26, "2e"],
+         "decoder":["value_from_hex_data", "servicedata", 28, 2, false, false]
+      },
+      "moi":{
+         "condition":["servicedata", 30, "2f"],
+         "decoder":["value_from_hex_data", "servicedata", 32, 2, false, false]
+      },
+      "lux":{
+         "condition": ["servicedata", 12, "05"],
+         "decoder":["value_from_hex_data", "servicedata", 14, 6, true, false],
+         "post_proc":["/", 100]
+      },
+      "batt":{
+         "condition":["servicedata", 2, "01"],
+         "decoder":["value_from_hex_data", "servicedata", 4, 2, true, false]
+      },
+      "volt":{
+         "condition": ["servicedata", 20, "0c"],
+         "decoder":["value_from_hex_data", "servicedata", 22, 4, true, false],
+         "post_proc":["/", 1000]
+      }
+   }
+})"""";*/
+
+const char* _BPARASITEV2_json_props = "{\"properties\":{\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"hum\":{\"unit\":\"%\",\"name\":\"humidity\"},\"moi\":{\"unit\":\"%\",\"name\":\"moisture\"},\"lux\":{\"unit\":\"lx\",\"name\":\"illuminance\"},\"batt\":{\"unit\":\"%\",\"name\":\"battery\"},\"volt\":{\"unit\":\"V\",\"name\":\"voltage\"}}}";
+/*R""""(
+{
+   "properties":{
+      "tempc":{
+         "unit":"°C",
+         "name":"temperature"
+      },
+      "hum":{
+         "unit":"%",
+         "name":"humidity"
+      },
+      "moi":{
+         "unit":"%",
+         "name":"moisture"
+      },
+      "lux":{
+         "unit":"lx",
+         "name":"illuminance"
+      },
+      "batt":{
+         "unit":"%",
+         "name":"battery"
+      },
+      "volt":{
+         "unit":"V",
+         "name":"voltage"
+      }
+   }
+})"""";*/

theengsdecoder-2.1.0/src/devices/H5140_json.h

@@ -0,0 +1,69 @@
+const char* _H5140_json = "{\"brand\":\"Govee\",\"model\":\"Smart CO2 Monitor\",\"model_id\":\"H5140\",\"tag\":\"0f03\",\"condition\":[\"name\",\"contain\",\"GV5140\",\"&\",\"manufacturerdata\",\">=\",20,\"index\",0,\"01000101\"],\"properties\":{\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",8,6,false,false],\"post_proc\":[\"/\",10000]},\"hum\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",8,6,false,false],\"post_proc\":[\"&\",2147483647,\"%\",1000,\"/\",10]},\"co2\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",14,4,false,false]}}}";
+/* R""""(
+{
+   "brand":"Govee",
+   "model":"Smart CO2 Monitor",
+   "model_id":"H5140",
+   "tag":"0f03",
+   "condition":["name", "contain", "GV5140", "&", "manufacturerdata", ">=", 20, "index", 0, "01000101"],
+   "properties":{
+      "tempc":{
+         "decoder":["value_from_hex_data", "manufacturerdata", 8, 6, false, false],
+         "post_proc":["/", 10000]
+      },
+      "hum":{
+         "decoder":["value_from_hex_data", "manufacturerdata", 8, 6, false, false],
+         "post_proc":["&", 2147483647, "%", 1000, "/", 10]
+      },
+      "co2":{
+         "decoder":["value_from_hex_data", "manufacturerdata", 14, 4, false, false]
+      }
+   }
+})"""";*/
+
+/*
+ * Govee H5140 Smart CO2 Monitor - BLE Manufacturer Data Format
+ * =============================================================
+ *
+ * Advertisement name pattern: GV5140XXXX (where XXXX is device suffix)
+ * Manufacturer data: 20 hex characters (10 bytes)
+ *
+ * Byte layout:
+ *   Positions 0-7:   01000101 (constant header)
+ *   Positions 8-13:  XXXXXX (24-bit combined temp/humidity)
+ *   Positions 14-17: YYYY (16-bit CO2 in ppm, big-endian)
+ *   Positions 18-19: 00 (padding/unknown)
+ *
+ * Decoding formulas:
+ *   - temp_celsius = 24bit_value / 10000
+ *   - humidity_percent = (24bit_value % 1000) / 10
+ *   - co2_ppm = 16bit_value
+ *
+ * Example: 0100010103fcbf044c00
+ *   - Header: 01000101
+ *   - Temp/Hum: 03fcbf = 261311 decimal
+ *     - Temperature: 261311 / 10000 = 26.13°C (79.04°F)
+ *     - Humidity: (261311 % 1000) / 10 = 31.1%
+ *   - CO2: 044c = 1100 ppm
+ *
+ * Tested with OpenMQTTGateway on ESP32
+ */
+
+const char* _H5140_json_props = "{\"properties\":{\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"hum\":{\"unit\":\"%\",\"name\":\"humidity\"},\"co2\":{\"unit\":\"ppm\",\"name\":\"carbon_dioxide\"}}}";
+/*R""""(
+{
+   "properties":{
+      "tempc":{
+         "unit":"°C",
+         "name":"temperature"
+      },
+      "hum":{
+         "unit":"%",
+         "name":"humidity"
+      },
+      "co2":{
+         "unit":"ppm",
+         "name":"carbon_dioxide"
+      }
+   }
+})"""";*/

theengsdecoder-2.1.0/src/devices/H5179_json.h

@@ -0,0 +1,57 @@
+#include "common_props.h"
+
+const char* _H5179_json = "{\"brand\":\"Govee\",\"model\":\"Thermo-Hygrometer\",\"model_id\":\"H5179\",\"tag\":\"0103\",\"condition\":[\"name\",\"index\",0,\"Govee_H5179\",\"&\",\"manufacturerdata\",\"=\",22,\"index\",0,\"0188ec\"],\"properties\":{\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",12,4,true,true],\"post_proc\":[\"/\",100]},\"hum\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",16,4,true,false],\"post_proc\":[\"/\",100]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",20,2,false,false]}}}";
+/* R""""(
+{
+   "brand":"Govee",
+   "model":"Thermo-Hygrometer",
+   "model_id":"H5179",
+   "tag":"0103",
+   "condition":["name", "index", 0, "Govee_H5179", "&", "manufacturerdata", "=", 22, "index", 0, "0188ec"],
+   "properties":{
+      "tempc":{
+         "decoder":["value_from_hex_data", "manufacturerdata", 12, 4, true, true],
+         "post_proc":["/", 100]
+      },
+      "hum":{
+         "decoder":["value_from_hex_data", "manufacturerdata", 16, 4, true, false],
+         "post_proc":["/", 100]
+      },
+      "batt":{
+         "decoder":["value_from_hex_data", "manufacturerdata", 20, 2, false, false]
+      }
+   }
+})"""";*/
+
+const char* _H5179_json_N = "{\"brand\":\"Govee\",\"model\":\"Thermo-Hygrometer\",\"model_id\":\"H5179_N\",\"tag\":\"0103\",\"condition\":[\"name\",\"index\",0,\"GV5179\",\"&\",\"manufacturerdata\",\">=\",16,\"index\",0,\"0100\"],\"properties\":{\"tempc\":{\"condition\":[\"manufacturerdata\",8,\"bit\",3,0],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",8,6,false,false],\"post_proc\":[\"/\",1000,\">\",0,\"/\",10]},\"_tempc\":{\"condition\":[\"manufacturerdata\",8,\"bit\",3,1],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",8,6,false,false],\"post_proc\":[\"&\",8388607,\"/\",1000,\">\",0,\"/\",10,\"*\",-1]},\"hum\":{\"condition\":[\"name\",\"not_contain\",\"GV5108\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",8,6,false,false],\"post_proc\":[\"&\",8388607,\"%\",1000,\"/\",10]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",14,2,false,false]}}}";
+
+/* R""""(
+{
+   "brand":"Govee",
+   "model":"Thermo-Hygrometer",
+   "model_id":"H5179_N",
+   "tag":"0103",
+   "condition":["name", "index", 0, "GV5179", "&", "manufacturerdata", ">=", 16, "index", 0, "0100"],
+   "properties":{
+      "tempc":{
+         "condition":["manufacturerdata", 8, "bit", 3, 0],
+         "decoder":["value_from_hex_data", "manufacturerdata", 8, 6, false, false],
+         "post_proc":["/", 1000, ">", 0, "/", 10]
+      },
+      "_tempc":{
+         "condition":["manufacturerdata", 8, "bit", 3, 1],
+         "decoder":["value_from_hex_data", "manufacturerdata", 8, 6, false, false],
+         "post_proc":["&", 8388607, "/", 1000, ">", 0, "/", 10, "*", -1]
+      },
+      "hum":{
+         "condition":["name", "not_contain", "GV5108"],
+         "decoder":["value_from_hex_data", "manufacturerdata", 8, 6, false, false],
+         "post_proc":["&", 8388607, "%", 1000, "/", 10]
+      },
+      "batt":{
+         "decoder":["value_from_hex_data", "manufacturerdata", 14, 2, false, false]
+      }
+   }
+})"""";*/
+
+const char* _H5179_json_props = _common_BTH_props;

{theengsdecoder-1.9.9 → theengsdecoder-2.1.0}/src/devices/HOLYIOT_json.h

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

theengsdecoder-2.1.0/src/devices/IBS_P02B_json.h

@@ -0,0 +1,54 @@
+const char* _IBS_P02B_json = "{\"brand\":\"Inkbird\",\"model\":\"Pool Thermometer\",\"model_id\":\"IBS-P02B\",\"tag\":\"0103\",\"condition\":[\"name\",\"index\",0,\"IBS-P02B\",\"&\",\"manufacturerdata\",\"=\",36],\"properties\":{\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",12,2,true,false],\"post_proc\":[\"/\",10]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",20,2]},\"lowbatt\":{\"decoder\":[\"bit_static_value\",\"manufacturerdata\",26,0,false,true]},\"displayunit\":{\"decoder\":[\"bit_static_value\",\"manufacturerdata\",23,0,\"°C\",\"°F\"]},\"mac\":{\"decoder\":[\"mac_from_hex_data\",\"manufacturerdata\",0]}}}";
+/*R""""(
+{
+  "brand":"Inkbird",
+  "model":"Pool Thermometer",
+  "model_id":"IBS-P02B",
+  "tag": "0103",
+  "condition":["name", "index", 0, "IBS-P02B", "&", "manufacturerdata", "=", 36],
+  "properties":{
+    "tempc":{
+      "decoder":["value_from_hex_data","manufacturerdata", 12, 2, true, false],
+      "post_proc":["/",10]
+    },
+   "batt":{
+      "decoder":["value_from_hex_data", "manufacturerdata", 20, 2]
+   },
+   "lowbatt":{
+      "decoder":["bit_static_value", "manufacturerdata", 26, 0, false, true]
+   },
+   "displayunit":{
+      "decoder":["bit_static_value", "manufacturerdata", 23, 0, "°C", "°F"]
+   },
+   "mac":{
+      "decoder":["mac_from_hex_data", "manufacturerdata", 0]
+   }
+  }
+})"""";*/
+
+const char* _IBS_P02B_json_props = "{\"properties\":{\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"batt\":{\"unit\":\"%\",\"name\":\"battery\"},\"lowbatt\":{\"unit\":\"status\",\"name\":\"battery\"},\"displayunit\":{\"unit\":\"string\",\"name\":\"displayUnit\"},\"mac\":{\"unit\":\"string\",\"name\":\"MAC address\"}}}";
+/*R""""(
+{
+   "properties":{
+      "tempc":{
+         "unit":"°C",
+         "name":"temperature"
+      },
+      "batt":{
+         "unit":"%",
+         "name":"battery"
+      },
+      "lowbatt":{
+         "unit":"status",
+         "name":"battery"
+      },
+      "displayunit":{
+         "unit":"string",
+         "name":"displayUnit"
+      },
+      "mac":{
+         "unit":"string",
+         "name":"MAC address"
+      }
+   }
+})"""";*/

theengsdecoder-2.1.0/src/devices/LYWSD03MMC_ENCR_json.h

@@ -0,0 +1,81 @@
+const char* _LYWSD03MMC_ENCR_json_PVVX = "{\"brand\":\"Xiaomi\",\"model\":\"TH Sensor\",\"model_id\":\"LYWSD03MMC/MJWSD05MMC_PVVX_ENCR\",\"tag\":\"010001\",\"condition\":[\"servicedata\",\"=\",22,\"&\",\"uuid\",\"index\",0,\"181a\"],\"properties\":{\"cipher\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",2,12]},\"ctr\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",0,2]},\"mic\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",14,8]}}}";
+/*R""""(
+{
+   "brand":"Xiaomi",
+   "model":"TH Sensor",
+   "model_id":"LYWSD03MMC/MJWSD05MMC_PVVX_ENCR",
+   "tag":"010001",
+   "condition":["servicedata", "=", 22, "&", "uuid", "index", 0, "181a"],
+   "properties":{
+      "cipher":{
+         "decoder":["string_from_hex_data", "servicedata", 2, 12]
+      },
+      "ctr":{
+         "decoder":["string_from_hex_data", "servicedata", 0, 2]
+      },
+      "mic":{
+         "decoder":["string_from_hex_data", "servicedata", 14, 8]
+      }
+   }
+})"""";*/
+
+const char* _LYWSD03MMC_ENCR_json_PVVX_BTHOME_1 = "{\"brand\":\"Xiaomi\",\"model\":\"TH Sensor\",\"model_id\":\"LYWSD03MMC/MJWSD05MMC_PVVX_BTHOME_ENCR\",\"tag\":\"010202\",\"condition\":[\"servicedata\",\"=\",34,\"index\",0,\"41\",\"&\",\"uuid\",\"index\",0,\"fcd2\",\"&\",\"name\",\"index\",0,\"ATC\"],\"properties\":{\"cipher\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",2,16]},\"ctr\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",18,8]},\"mic\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",26,8]}}}";
+/*R""""(
+{
+   "brand":"Xiaomi",
+   "model":"TH Sensor",
+   "model_id":"LYWSD03MMC/MJWSD05MMC_PVVX_BTHOME_ENCR",
+   "tag":"010202",
+   "condition":["servicedata", "=", 34, "index", 0, "41", "&", "uuid", "index", 0, "fcd2", "&", "name", "index", 0, "ATC"],
+   "properties":{
+      "cipher":{
+         "decoder":["string_from_hex_data", "servicedata", 2, 16]
+      },
+      "ctr":{
+         "decoder":["string_from_hex_data", "servicedata", 18, 8]
+      },
+      "mic":{
+         "decoder":["string_from_hex_data", "servicedata", 26, 8]
+      }
+   }
+})"""";*/
+
+const char* _LYWSD03MMC_ENCR_json_PVVX_BTHOME_2 = "{\"brand\":\"Xiaomi\",\"model\":\"TH Sensor\",\"model_id\":\"LYWSD03MMC/MJWSD05MMC_PVVX_BTHOME_ENCR\",\"tag\":\"010202\",\"condition\":[\"servicedata\",\"=\",32,\"index\",0,\"41\",\"&\",\"uuid\",\"index\",0,\"fcd2\",\"&\",\"name\",\"index\",0,\"ATC\"],\"properties\":{\"cipher\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",2,14]},\"ctr\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",16,8]},\"mic\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",24,8]}}}";
+/*R""""(
+{
+   "brand":"Xiaomi",
+   "model":"TH Sensor",
+   "model_id":"LYWSD03MMC/MJWSD05MMC_PVVX_BTHOME_ENCR",
+   "tag":"010202",
+   "condition":["servicedata", "=", 32, "index", 0, "41", "&", "uuid", "index", 0, "fcd2", "&", "name", "index", 0, "ATC"],
+   "properties":{
+      "cipher":{
+         "decoder":["string_from_hex_data", "servicedata", 2, 14]
+      },
+      "ctr":{
+         "decoder":["string_from_hex_data", "servicedata", 16, 8]
+      },
+      "mic":{
+         "decoder":["string_from_hex_data", "servicedata", 24, 8]
+      }
+   }
+})"""";*/
+
+const char* _LYWSD03MMC_ENCR_json_props = "{\"properties\":{\"cipher\":{\"unit\":\"hex\",\"name\":\"ciphertext\"},\"ctr\":{\"unit\":\"hex\",\"name\":\"counter\"},\"mic\":{\"unit\":\"hex\",\"name\":\"message integrity check\"}}}";
+/*R""""(
+{
+   "properties":{
+      "cipher":{
+         "unit":"hex",
+         "name":"ciphertext"
+      },
+      "ctr":{
+         "unit":"hex",
+         "name":"counter"
+      },
+      "mic":{
+         "unit":"hex",
+         "name":"message integrity check"
+      }
+   }
+})"""";*/