theengsdecoder 1.9.9__tar.gz → 2.0.0__tar.gz

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

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

{theengsdecoder-1.9.9 → theengsdecoder-2.0.0}/PKG-INFO

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

{theengsdecoder-1.9.9 → theengsdecoder-2.0.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,
@@ -88,6 +93,7 @@ public:
     H5102,
     H5106,
     H5179,
+    H5179_N,
     HHCCJCY10,
     MUE4094RT,
     NODONNIU,
@@ -124,6 +130,7 @@ public:
     HHCCPOT002,
     HOBOMX2001,
     BPARASITE,
+    BPARASITEV2,
     BWBSDOO,
     BM2,
     BM6,

theengsdecoder-2.0.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.0.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-2.0.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.0.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"
+      }
+   }
+})"""";*/

theengsdecoder-2.0.0/src/devices/LYWSD03MMC_json.h

@@ -0,0 +1,171 @@
+#include "common_props.h"
+
+const char* _LYWSD03MMC_json_ATC = "{\"brand\":\"Xiaomi\",\"model\":\"TH Sensor\",\"model_id\":\"LYWSD03MMC/MJWSD05MMC_ATC\",\"tag\":\"01\",\"condition\":[\"servicedata\",\"=\",26,\"index\",0,\"a4c138\",\"&\",\"uuid\",\"index\",0,\"181a\"],\"properties\":{\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",12,4,false,true],\"post_proc\":[\"/\",10]},\"hum\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",16,2,false,false]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",18,2,false,false]},\"volt\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",20,4,false,false],\"post_proc\":[\"/\",1000]},\"mac\":{\"decoder\":[\"mac_from_hex_data\",\"servicedata\",0]}}}";
+/* R""""(
+{
+   "brand":"Xiaomi",
+   "model":"TH Sensor",
+   "model_id":"LYWSD03MMC/MJWSD05MMC_ATC",
+   "tag":"01",
+   "condition":["servicedata", "=", 26, "index", 0 , "a4c138", "&", "uuid", "index", 0, "181a"],
+   "properties":{
+      "tempc":{
+         "decoder":["value_from_hex_data", "servicedata", 12, 4, false, true],
+         "post_proc":["/", 10]
+      },
+      "hum":{
+         "decoder":["value_from_hex_data", "servicedata", 16, 2, false, false]
+      },
+      "batt":{
+         "decoder":["value_from_hex_data", "servicedata", 18, 2, false, false]
+      },
+      "volt":{
+         "decoder":["value_from_hex_data", "servicedata", 20, 4, false, false],
+         "post_proc":["/", 1000]
+      },
+      "mac":{
+         "decoder":["mac_from_hex_data", "servicedata", 0]
+      }
+   }
+})"""";*/
+
+const char* _LYWSD03MMC_json_PVVX = "{\"brand\":\"Xiaomi\",\"model\":\"TH Sensor\",\"model_id\":\"LYWSD03MMC/MJWSD05MMC_PVVX\",\"tag\":\"01\",\"condition\":[\"servicedata\",\"=\",30,\"index\",6,\"38c1a4\",\"&\",\"uuid\",\"index\",0,\"181a\"],\"properties\":{\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",12,4,true,true],\"post_proc\":[\"/\",100]},\"hum\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",16,4,true,false],\"post_proc\":[\"/\",100]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",24,2,false,false]},\"volt\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",20,4,true,false],\"post_proc\":[\"/\",1000]},\"mac\":{\"decoder\":[\"revmac_from_hex_data\",\"servicedata\",0]}}}";
+/* R""""(
+{
+   "brand":"Xiaomi",
+   "model":"TH Sensor",
+   "model_id":"LYWSD03MMC/MJWSD05MMC_PVVX",
+   "tag":"01",
+   "condition":["servicedata", "=", 30, "index", 6 , "38c1a4", "&", "uuid", "index", 0, "181a"],
+   "properties":{
+      "tempc":{
+         "decoder":["value_from_hex_data", "servicedata", 12, 4, true, true],
+         "post_proc":["/", 100]
+      },
+      "hum":{
+         "decoder":["value_from_hex_data", "servicedata", 16, 4, true, false],
+         "post_proc":["/", 100]
+      },
+      "batt":{
+         "decoder":["value_from_hex_data", "servicedata", 24, 2, false, false]
+      },
+      "volt":{
+         "decoder":["value_from_hex_data", "servicedata", 20, 4, true, false],
+         "post_proc":["/", 1000]
+      },
+      "mac":{
+         "decoder":["revmac_from_hex_data", "servicedata", 0]
+      }
+   }
+})"""";*/
+
+const char* _LYWSD03MMC_json_PVVX_DECR = "{\"brand\":\"Xiaomi\",\"model\":\"TH Sensor\",\"model_id\":\"LYWSD03MMC/MJWSD05MMC_PVVX_DECR\",\"tag\":\"01\",\"condition\":[\"servicedata\",\"=\",12,\"&\",\"uuid\",\"index\",0,\"181a\"],\"properties\":{\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",0,4,true,true],\"post_proc\":[\"/\",100]},\"hum\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",4,4,true,false],\"post_proc\":[\"/\",100]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",8,2,false,false]}}}";
+/* R""""(
+{
+   "brand":"Xiaomi",
+   "model":"TH Sensor",
+   "model_id":"LYWSD03MMC/MJWSD05MMC_PVVX_DECR",
+   "tag":"01",
+   "condition":["servicedata", "=", 12, "&", "uuid", "index", 0, "181a"],
+   "properties":{
+      "tempc":{
+         "decoder":["value_from_hex_data", "servicedata", 0, 4, true, true],
+         "post_proc":["/", 100]
+      },
+      "hum":{
+         "decoder":["value_from_hex_data", "servicedata", 4, 4, true, false],
+         "post_proc":["/", 100]
+      },
+      "batt":{
+         "decoder":["value_from_hex_data", "servicedata", 8, 2, false, false]
+      }
+   }
+})"""";*/
+
+const char* _LYWSD03MMC_json_PVVX_BTHOME = "{\"brand\":\"Xiaomi\",\"model\":\"TH Sensor\",\"model_id\":\"LYWSD03MMC/MJWSD05MMC_PVVX_BTHOME\",\"tag\":\"0102\",\"condition\":[\"servicedata\",\"=\",22,\"index\",0,\"40\",\"|\",\"servicedata\",\"=\",20,\"index\",0,\"40\",\"&\",\"uuid\",\"index\",0,\"fcd2\",\"&\",\"name\",\"index\",0,\"ATC\"],\"properties\":{\"packet_1\":{\"condition\":[\"servicedata\",2,\"00\",\"&\",\"servicedata\",\"=\",22],\"decoder\":[\"value_from_hex_data\",\"servicedata\",4,2,false,false]},\"tempc\":{\"condition\":[\"servicedata\",10,\"02\",\"&\",\"servicedata\",\"=\",22],\"decoder\":[\"value_from_hex_data\",\"servicedata\",12,4,true,true],\"post_proc\":[\"/\",100]},\"hum\":{\"condition\":[\"servicedata\",16,\"03\",\"&\",\"servicedata\",\"=\",22],\"decoder\":[\"value_from_hex_data\",\"servicedata\",18,4,true,false],\"post_proc\":[\"/\",100]},\"batt\":{\"condition\":[\"servicedata\",6,\"01\",\"&\",\"servicedata\",\"=\",22],\"decoder\":[\"value_from_hex_data\",\"servicedata\",8,2,false,false]},\"packet_2\":{\"condition\":[\"servicedata\",2,\"00\",\"&\",\"servicedata\",\"=\",20],\"decoder\":[\"value_from_hex_data\",\"servicedata\",4,2,false,false]},\"volt\":{\"condition\":[\"servicedata\",6,\"0c\",\"&\",\"servicedata\",\"=\",20],\"decoder\":[\"value_from_hex_data\",\"servicedata\",8,4,true,false],\"post_proc\":[\"/\",1000]},\"power\":{\"condition\":[\"servicedata\",12,\"10\",\"&\",\"servicedata\",\"=\",20],\"decoder\":[\"value_from_hex_data\",\"servicedata\",14,2,false,false]},\"open\":{\"condition\":[\"servicedata\",16,\"11\",\"&\",\"servicedata\",\"=\",20],\"decoder\":[\"value_from_hex_data\",\"servicedata\",18,2,false,false]}}}";
+/* R""""(
+{
+   "brand":"Xiaomi",
+   "model":"TH Sensor",
+   "model_id":"LYWSD03MMC/MJWSD05MMC_PVVX_BTHOME",
+   "tag":"0102",
+   "condition":["servicedata", "=", 22, "index", 0, "40", "|", "servicedata", "=", 20, "index", 0, "40", "&", "uuid", "index", 0, "fcd2", "&", "name", "index", 0, "ATC"],
+   "properties":{
+      "packet_1":{
+         "condition":["servicedata", 2, "00", "&", "servicedata", "=", 22],
+         "decoder":["value_from_hex_data", "servicedata", 4, 2, false, false]
+      },
+      "tempc":{
+         "condition":["servicedata", 10, "02", "&", "servicedata", "=", 22],
+         "decoder":["value_from_hex_data", "servicedata", 12, 4, true, true],
+         "post_proc":["/", 100]
+      },
+      "hum":{
+         "condition":["servicedata", 16, "03", "&", "servicedata", "=", 22],
+         "decoder":["value_from_hex_data", "servicedata", 18, 4, true, false],
+         "post_proc":["/", 100]
+      },
+      "batt":{
+         "condition":["servicedata", 6, "01", "&", "servicedata", "=", 22],
+         "decoder":["value_from_hex_data", "servicedata", 8, 2, false, false]
+      },
+      "packet_2":{
+         "condition":["servicedata", 2, "00", "&", "servicedata", "=", 20],
+         "decoder":["value_from_hex_data", "servicedata", 4, 2, false, false]
+      },
+      "volt":{
+         "condition":["servicedata", 6, "0c", "&", "servicedata", "=", 20],
+         "decoder":["value_from_hex_data", "servicedata", 8, 4, true, false],
+         "post_proc":["/", 1000]
+      },
+      "power":{
+         "condition":["servicedata", 12, "10", "&", "servicedata", "=", 20],
+         "decoder":["value_from_hex_data", "servicedata", 14, 2, false, false]
+      },
+      "open":{
+         "condition":["servicedata", 16, "11", "&", "servicedata", "=", 20],
+         "decoder":["value_from_hex_data", "servicedata", 18, 2, false, false]
+      }
+   }
+})"""";*/
+
+const char* _LYWSD03MMC_json_props = _common_BVTH_props;
+
+const char* _LYWSD03MMC_BTHOME_json_props = "{\"properties\":{\"packet_1\":{\"unit\":\"int\",\"name\":\"packet id\"},\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"hum\":{\"unit\":\"%\",\"name\":\"humidity\"},\"batt\":{\"unit\":\"%\",\"name\":\"battery\"},\"packet_2\":{\"unit\":\"int\",\"name\":\"packet id\"},\"volt\":{\"unit\":\"V\",\"name\":\"voltage\"},\"power\":{\"unit\":\"int\",\"name\":\"power\"},\"open\":{\"unit\":\"int\",\"name\":\"open\"}}}";
+/*R""""(
+{
+   "properties":{
+      "packet_1":{
+         "unit":"int",
+         "name":"packet id"
+      },
+      "tempc":{
+         "unit":"°C",
+         "name":"temperature"
+      },
+      "hum":{
+         "unit":"%",
+         "name":"humidity"
+      },
+      "batt":{
+         "unit":"%",
+         "name":"battery"
+      },
+      "packet_2":{
+         "unit":"int",
+         "name":"packet id"
+      },
+      "volt": {
+         "unit": "V",
+         "name": "voltage"
+      },
+      "power": {
+         "unit": "int",
+         "name": "power"
+      },
+      "open": {
+         "unit": "int",
+         "name": "open"
+      }
+   }
+})"""";*/

theengsdecoder-2.0.0/src/devices/TPMSBR_json.h

@@ -0,0 +1,41 @@
+const char* _TPMSBR_json = "{\"brand\":\"GENERIC\",\"model\":\"BR TPMS\",\"model_id\":\"TPMSBR\",\"tag\":\"0a03\",\"condition\":[\"manufacturerdata\",\"=\",14,\"&\",\"name\",\"index\",0,\"BR\"],\"properties\":{\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",4,2,false]},\"pres\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",6,4,false,false],\"post_proc\":[\"/\",10,\"-\",14.5,\"/\",14.5]},\"volt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",2,2,false],\"post_proc\":[\"/\",10]}}}";
+/*R""""(
+{
+   "brand":"GENERIC",
+   "model":"BR TPMS",
+   "model_id":"TPMSBR",
+   "tag":"0a03",
+   "condition":["manufacturerdata", "=", 14, "&", "name", "index", 0, "BR"],
+   "properties":{
+      "tempc":{
+         "decoder":["value_from_hex_data", "manufacturerdata", 4, 2, false]
+      },
+      "pres":{
+         "decoder":["value_from_hex_data", "manufacturerdata", 6, 4, false, false],
+         "post_proc":["/", 10, "-", 14.5, "/", 14.5]
+      },
+      "volt":{
+         "decoder":["value_from_hex_data", "manufacturerdata", 2, 2, false],
+         "post_proc":["/", 10]
+      }
+   }
+})"""";*/
+
+const char* _TPMSBR_json_props = "{\"properties\":{\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"pres\":{\"unit\":\"bar\",\"name\":\"pressure\"},\"volt\":{\"unit\":\"V\",\"name\":\"voltage\"}}}";
+/*R""""(
+{
+   "properties":{
+      "tempc":{
+         "unit":"°C",
+         "name":"temperature"
+      },
+      "pres":{
+         "unit":"bar",
+         "name":"pressure"
+      },
+      "volt":{
+         "unit":"V",
+         "name":"voltage"
+      }
+   }
+})"""";*/

{theengsdecoder-1.9.9 → theengsdecoder-2.0.0}/src/devices/TPTH_json.h

@@ -1,13 +1,13 @@
 #include "common_props.h"
 
-const char* _TPTH_json = "{\"brand\":\"ThermoPro\",\"model\":\"TH Sensor\",\"model_id\":\"TP35X/393\",\"tag\":\"0103\",\"condition\":[\"name\",\"index\",0,\"TP357\",\"|\",\"name\",\"index\",0,\"TP358\",\"|\",\"name\",\"index\",0,\"TP359\",\"|\",\"name\",\"index\",0,\"TP393\",\"&\",\"manufacturerdata\",\">=\",12,\"index\",0,\"c2\"],\"properties\":{\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",2,4,true,true],\"post_proc\":[\"/\",10]},\"hum\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",6,2,false,false]},\"batt_low\":{\"condition\":[\"manufacturerdata\",9,\"bit\",1,1],\"decoder\":[\"static_value\",false]},\"_batt_low\":{\"condition\":[\"manufacturerdata\",9,\"bit\",1,0],\"decoder\":[\"static_value\",true]}}}";
+const char* _TPTH_json = "{\"brand\":\"ThermoPro\",\"model\":\"TH Sensor\",\"model_id\":\"TP35X/393\",\"tag\":\"0103\",\"condition\":[\"name\",\"index\",0,\"TP350\",\"|\",\"name\",\"index\",0,\"TP357\",\"|\",\"name\",\"index\",0,\"TP358\",\"|\",\"name\",\"index\",0,\"TP359\",\"|\",\"name\",\"index\",0,\"TP393\",\"&\",\"manufacturerdata\",\">=\",12,\"index\",0,\"c2\"],\"properties\":{\"tempc\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",2,4,true,true],\"post_proc\":[\"/\",10]},\"hum\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",6,2,false,false]},\"batt_low\":{\"condition\":[\"manufacturerdata\",9,\"bit\",1,1],\"decoder\":[\"static_value\",false]},\"_batt_low\":{\"condition\":[\"manufacturerdata\",9,\"bit\",1,0],\"decoder\":[\"static_value\",true]}}}";
 /*R""""(
 {
    "brand":"ThermoPro",
    "model":"TH Sensor",
    "model_id":"TP35X/393",
    "tag":"0103",
-   "condition":["name", "index", 0, "TP357", "|", "name", "index", 0, "TP358", "|", "name", "index", 0, "TP359", "|", "name", "index", 0, "TP393", "&", "manufacturerdata", ">=", 12, "index", 0, "c2"],
+   "condition":["name", "index", 0, "TP350", "|", "name", "index", 0, "TP357", "|", "name", "index", 0, "TP358", "|", "name", "index", 0, "TP359", "|", "name", "index", 0, "TP393", "&", "manufacturerdata", ">=", 12, "index", 0, "c2"],
    "properties":{
       "tempc":{
          "decoder":["value_from_hex_data", "manufacturerdata", 2, 4, true, true],

{theengsdecoder-1.9.9 → theengsdecoder-2.0.0}/src/devices/iNodeEM_json.h

@@ -39,7 +39,7 @@ const char* _iNodeEM_json = "{\"brand\":\"iNode\",\"model\":\"Energy Meter\",\"m
    }
 })"""";*/
 
-const char* _iNodeEM_json_props = "{\"properties\":{\"avg\":{\"unit\":\"kW/m³\",\"name\":\"average\"},\"avgu\":{\"unit\":\"string\",\"name\":\"average unit\"},\"sum\":{\"unit\":\"kWh/m³\",\"name\":\"sum\"},\"sumu\":{\"unit\":\"string\",\"name\":\"sum unit\"},\"batt\":{\"unit\":\"%\",\"name\":\"battery\"},\"lowbatt\":{\"unit\":\"status\",\"name\":\"low battery\"}}}";
+const char* _iNodeEM_json_props = "{\"properties\":{\"avg\":{\"unit\":\"kW/m³\",\"name\":\"average\"},\"avgu\":{\"unit\":\"string\",\"name\":\"average unit\"},\"sum\":{\"unit\":\"kWh/m³\",\"name\":\"sum\"},\"sumu\":{\"unit\":\"string\",\"name\":\"sum unit\"},\"batt\":{\"unit\":\"%\",\"name\":\"battery\"},\"lowbatt\":{\"unit\":\"status\",\"name\":\"battery\"}}}";
 /*R""""(
 {
    "properties":{
@@ -65,7 +65,7 @@ const char* _iNodeEM_json_props = "{\"properties\":{\"avg\":{\"unit\":\"kW/m³\"
       },
       "lowbatt":{
          "unit":"status",
-         "name":"low battery"
+         "name":"battery"
       }
    }
 })"""";*/