theengsdecoder 2.0.0__tar.gz → 2.1.0__tar.gz

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

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

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

@@ -1,10 +1,15 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: theengsdecoder
-Version: 2.0.0
+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-2.0.0 → theengsdecoder-2.1.0}/src/decoder.h

@@ -92,6 +92,7 @@ public:
     H5074,
     H5102,
     H5106,
+    H5140,
     H5179,
     H5179_N,
     HHCCJCY10,
@@ -174,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,
@@ -210,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/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.0.0 → 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.0.0 → theengsdecoder-2.1.0}/src/devices/NODONNIU_json.h

@@ -1,4 +1,4 @@
-const char* _NODONNIU_json = "{\"brand\":\"NodOn\",\"model\":\"NIU smart button\",\"model_id\":\"NODONNIU\",\"tag\":\"110e\",\"condition\":[\"servicedata\",\"=\",32,\"&\",\"uuid\",\"index\",0,\"0000\"],\"properties\":{\"button\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",30,2],\"lookup\":[\"01\",1,\"02\",2,\"03\",9,\"04\",10,\"05\",3,\"06\",4,\"07\",5]},\"color\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",20,4],\"lookup\":[\"0002\",\"White\",\"0003\",\"TechBlue\",\"0004\",\"CozyGrey\",\"0005\",\"Wazabi\",\"0006\",\"Lagoon\",\"0007\",\"Softberry\"]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",24,2,false,false],\"post_proc\":[\"&\",127]}}}";
+const char* _NODONNIU_json = "{\"brand\":\"NodOn\",\"model\":\"NIU smart button\",\"model_id\":\"NODONNIU\",\"tag\":\"1106\",\"condition\":[\"servicedata\",\"=\",32,\"&\",\"uuid\",\"index\",0,\"0000\"],\"properties\":{\"button\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",30,2],\"lookup\":[\"01\",1,\"02\",2,\"03\",9,\"04\",10,\"05\",3,\"06\",4,\"07\",5]},\"color\":{\"decoder\":[\"string_from_hex_data\",\"servicedata\",20,4],\"lookup\":[\"0002\",\"White\",\"0003\",\"TechBlue\",\"0004\",\"CozyGrey\",\"0005\",\"Wazabi\",\"0006\",\"Lagoon\",\"0007\",\"Softberry\"]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",24,2,false,false],\"post_proc\":[\"&\",127]}}}";
 
 /*
 R""""(
@@ -6,7 +6,7 @@ R""""(
    "brand":"NodOn",
    "model":"NIU smart button",
    "model_id":"NODONNIU",
-   "tag":"110e",
+   "tag":"1106",
    "condition":["servicedata", "=", 32, "&", "uuid", "index", 0, "0000"],
    "properties":{
       "button":{

{theengsdecoder-2.0.0 → theengsdecoder-2.1.0}/src/devices/THB1_json.h

@@ -1,11 +1,11 @@
-const char* _THB1_json = "{\"brand\":\"Tuya\",\"model\":\"THB1 Thermo-Hygrometer\",\"model_id\":\"THB1\",\"tag\":\"0102\",\"condition\":[\"servicedata\",\"=\",28,\"index\",0,\"40\",\"&\",\"uuid\",\"index\",0,\"fcd2\",\"&\",\"name\",\"index\",0,\"THB1\"],\"properties\":{\"packet\":{\"condition\":[\"servicedata\",2,\"00\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",4,2,false,false]},\"tempc\":{\"condition\":[\"servicedata\",10,\"02\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",12,4,true,true],\"post_proc\":[\"/\",100]},\"hum\":{\"condition\":[\"servicedata\",16,\"03\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",18,4,true,false],\"post_proc\":[\"/\",100]},\"batt\":{\"condition\":[\"servicedata\",6,\"01\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",8,2,false,false]},\"volt\":{\"condition\":[\"servicedata\",22,\"0c\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",24,4,true,false],\"post_proc\":[\"/\",1000]}}}";
+const char* _THB1_json = "{\"brand\":\"Tuya\",\"model\":\"Thermo-Hygrometer\",\"model_id\":\"THB1/BTH01/TH05F\",\"tag\":\"0102\",\"condition\":[\"name\",\"index\",0,\"THB1\",\"|\",\"name\",\"index\",0,\"BTH01\",\"|\",\"name\",\"index\",0,\"TH05F\",\"&\",\"servicedata\",\"=\",28,\"index\",0,\"40\",\"&\",\"uuid\",\"index\",0,\"fcd2\"],\"properties\":{\"packet\":{\"condition\":[\"servicedata\",2,\"00\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",4,2,false,false]},\"tempc\":{\"condition\":[\"servicedata\",10,\"02\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",12,4,true,true],\"post_proc\":[\"/\",100]},\"hum\":{\"condition\":[\"servicedata\",16,\"03\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",18,4,true,false],\"post_proc\":[\"/\",100]},\"batt\":{\"condition\":[\"servicedata\",6,\"01\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",8,2,false,false]},\"volt\":{\"condition\":[\"servicedata\",22,\"0c\"],\"decoder\":[\"value_from_hex_data\",\"servicedata\",24,4,true,false],\"post_proc\":[\"/\",1000]}}}";
 /* R""""(
 {
    "brand":"Tuya",
-   "model":"THB1 Thermo-Hygrometer",
-   "model_id":"THB1",
+   "model":"Thermo-Hygrometer",
+   "model_id":"THB1/BTH01/TH05F",
    "tag":"0102",
-   "condition":["servicedata", "=", 28, "index", 0, "40", "&", "uuid", "index", 0, "fcd2", "&", "name", "index", 0, "THB1"],
+   "condition":["name", "index", 0, "THB1", "|", "name", "index", 0, "BTH01", "|", "name", "index", 0, "TH05F", "&", "servicedata", "=", 28, "index", 0, "40", "&", "uuid", "index", 0, "fcd2" ],
    "properties":{
       "packet":{
          "condition":["servicedata", 2, "00"],

theengsdecoder-2.1.0/src/devices/VICTRON_SBS_json.h

@@ -0,0 +1,43 @@
+const char* _VICTSBS_json = "{\"brand\":\"Victron Energy\",\"model\":\"Smart Battery Sense\",\"model_id\":\"VICTSBS\",\"tag\":\"1408\",\"condition\":[\"manufacturerdata\",\"index\",8,\"a5a3\",\"|\",\"manufacturerdata\",\"index\",8,\"a4a3\",\"&\",\"manufacturerdata\",\"=\",50,\"index\",0,\"e10211\",\"&\",\"manufacturerdata\",\"index\",12,\"02ffff\"],\"properties\":{\"volt\":{\"condition\":[\"manufacturerdata\",24,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",24,4,true,false],\"post_proc\":[\"/\",100]},\"tempc\":{\"condition\":[\"manufacturerdata\",37,\"bit\",0,0,\"&\",\"manufacturerdata\",37,\"bit\",1,1],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",32,4,true,false],\"post_proc\":[\"-\",27315,\"/\",100]},\"alarm_reason\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4]}}}";
+/*R""""(
+{
+   "brand":"Victron Energy",
+   "model":"Smart Battery Sense",
+   "model_id":"VICTSBS",
+   "tag":"1408",
+   "condition":["manufacturerdata", "index", 8, "a5a3", "|", "manufacturerdata", "index", 8, "a4a3", "&", "manufacturerdata", "=", 50, "index", 0, "e10211", "&", "manufacturerdata", "index", 12, "02ffff"],
+   "properties":{
+      "volt":{
+        "condition":["manufacturerdata", 24, "!", "ffff"],
+        "decoder":["value_from_hex_data", "manufacturerdata", 24, 4, true, false],
+        "post_proc":["/", 100]
+      },
+      "tempc":{
+        "condition":["manufacturerdata", 37, "bit", 0, 0, "&", "manufacturerdata", 37, "bit", 1, 1],
+        "decoder":["value_from_hex_data", "manufacturerdata", 32, 4, true, false],
+        "post_proc":["-", 27315, "/", 100]
+      },
+      "alarm_reason":{
+        "decoder":["value_from_hex_data", "manufacturerdata", 28, 4]
+      }
+   }
+})"""";*/
+
+const char* _VICTSBS_json_props = "{\"properties\":{\"volt\":{\"unit\":\"V\",\"name\":\"voltage\"},\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"alarm_reason\":{\"unit\":\"int\",\"name\":\"alarm reason\"}}}";
+/*R""""(
+{
+   "properties":{
+      "volt": {
+         "unit": "V",
+         "name": "voltage"
+      },
+      "tempc":{
+         "unit":"°C",
+         "name":"temperature"
+      },
+      "alarm_reason":{
+         "unit":"int",
+         "name":"alarm reason"
+      }
+   }
+})"""";*/

theengsdecoder-2.1.0/src/devices/VICTRON__ENCR_json.h

@@ -0,0 +1,48 @@
+const char* _VICTRON_ENCR_json = "{\"brand\":\"Victron Energy\",\"model\":\"Victron encrypted\",\"model_id\":\"VICTRON_ENCR\",\"tag\":\"140003\",\"condition\":[\"manufacturerdata\",\">=\",46,\"index\",0,\"e10210\"],\"properties\":{\"cipher\":{\"condition\":[\"manufacturerdata\",\"=\",46],\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",20,26]},\"_cipher\":{\"condition\":[\"manufacturerdata\",\"=\",48],\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",20,28]},\"__cipher\":{\"condition\":[\"manufacturerdata\",\"=\",50],\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",20,30]},\"ctr\":{\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",14,4,true]},\"mic\":{\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",18,2]}}}";
+/*R""""(
+{
+   "brand":"Victron Energy",
+   "model":"Victron encrypted",
+   "model_id":"VICTRON_ENCR",
+   "tag":"140003",
+   "condition":["manufacturerdata", ">=", 46, "index", 0, "e10210"],
+   "properties":{
+      "cipher":{
+         "condition":["manufacturerdata", "=", 46],
+         "decoder":["string_from_hex_data", "manufacturerdata", 20, 26]
+      },
+      "_cipher":{
+         "condition":["manufacturerdata", "=", 48],
+         "decoder":["string_from_hex_data", "manufacturerdata", 20, 28]
+      },
+      "__cipher":{
+         "condition":["manufacturerdata", "=", 50],
+         "decoder":["string_from_hex_data", "manufacturerdata", 20, 30]
+      },
+      "ctr":{
+         "decoder":["string_from_hex_data", "manufacturerdata", 14, 4, true]
+      },
+      "mic":{
+         "decoder":["string_from_hex_data", "manufacturerdata", 18, 2]
+      }
+   }
+})"""";*/
+
+const char* _VICTRON_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 → theengsdecoder-2.1.0}/src/devices.h

@@ -36,6 +36,7 @@
 #include "devices/H5074_json.h"
 #include "devices/H5102_json.h"
 #include "devices/H5106_json.h"
+#include "devices/H5140_json.h"
 #include "devices/H5179_json.h"
 #include "devices/HHCCJCY10_json.h"
 #include "devices/HHCCJCY01HHCC_json.h"
@@ -120,12 +121,11 @@
 #include "devices/SensorP_HT_json.h"
 #include "devices/ServiceData_json.h"
 #include "devices/UT363BT_json.h"
-#include "devices/VICTRON_BSC_ENCR_json.h"
+#include "devices/VICTRON__ENCR_json.h"
 #include "devices/VICTRON_BSC_json.h"
-#include "devices/VICTRON_ORIONXS_ENCR_json.h"
 #include "devices/VICTRON_ORIONXS_json.h"
-#include "devices/VICTRON_SBP_ENCR_json.h"
 #include "devices/VICTRON_SBP_json.h"
+#include "devices/VICTRON_SBS_json.h"
 #include "devices/SE_RHT_json.h"
 #include "devices/SE_TEMP_json.h"
 #include "devices/SE_TPROBE_json.h"
@@ -189,6 +189,7 @@ const char* _devices[][2] = {
     {_H5074_json, _H5074_json_props},
     {_H5102_json, _H5102_json_props},
     {_H5106_json, _H5106_json_props},
+    {_H5140_json, _H5140_json_props},
     {_H5179_json, _H5179_json_props},
     {_H5179_json_N, _H5179_json_props},
     {_HHCCJCY10_json, _HHCCJCY10_json_props},
@@ -271,12 +272,11 @@ const char* _devices[][2] = {
     {_SensorPush_HT_json, _SensorPush_HT_json_props},
     {_ServiceData_json, _ServiceData_json_props},
     {_UT363BT_json, _UT363BT_json_props},
-    {_VICTBSC_ENCR_json, _VICTBSC_ENCR_json_props},
+    {_VICTRON_ENCR_json, _VICTRON_ENCR_json_props},
     {_VICTBSC_json, _VICTBSC_json_props},
-    {_VICTORIONXS_ENCR_json, _VICTORIONXS_ENCR_json_props},
     {_VICTORIONXS_json, _VICTORIONXS_json_props},
-    {_VICTSBP_ENCR_json, _VICTSBP_ENCR_json_props},
     {_VICTSBP_json, _VICTSBP_json_props},
+    {_VICTSBS_json, _VICTSBS_json_props},
     {_SE_RHT_json, _SE_RHT_json_props},
     {_SE_TEMP_json, _SE_TEMP_json_props},
     {_SE_TPROBE_json, _SE_TPROBE_json_props},

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

@@ -1,10 +1,15 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: theengsdecoder
-Version: 2.0.0
+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-2.0.0 → theengsdecoder-2.1.0}/theengsdecoder.egg-info/SOURCES.txt

@@ -476,6 +476,7 @@ src/devices/H5072_json.h
 src/devices/H5074_json.h
 src/devices/H5102_json.h
 src/devices/H5106_json.h
+src/devices/H5140_json.h
 src/devices/H5179_json.h
 src/devices/HHCCJCY01HHCC_json.h
 src/devices/HHCCJCY10_json.h
@@ -548,12 +549,11 @@ src/devices/TPTH_json.h
 src/devices/ThermoBeacon_json.h
 src/devices/UT363BT_json.h
 src/devices/VCH6003_json.h
-src/devices/VICTRON_BSC_ENCR_json.h
 src/devices/VICTRON_BSC_json.h
-src/devices/VICTRON_ORIONXS_ENCR_json.h
 src/devices/VICTRON_ORIONXS_json.h
-src/devices/VICTRON_SBP_ENCR_json.h
 src/devices/VICTRON_SBP_json.h
+src/devices/VICTRON_SBS_json.h
+src/devices/VICTRON__ENCR_json.h
 src/devices/XMTZC04HMKG_json.h
 src/devices/XMTZC04HMLB_json.h
 src/devices/XMTZC05HMKG_json.h