theengsdecoder 2.1.0__tar.gz → 2.2.0__tar.gz

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

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

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

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

{theengsdecoder-2.1.0 → theengsdecoder-2.2.0}/src/decoder.cpp

@@ -274,23 +274,44 @@ bool TheengsDecoder::checkDeviceMatch(const JsonArray& condition,
       } else if (strstr(cond_str, "mac@index") != nullptr) {
         size_t cond_index = condition[++i].as<size_t>();
         size_t cond_len = 12;
-        const char* string_to_compare = nullptr;
-        std::string mac_string = mac_id;
+        char normalized_mac[13];   // 12 hex chars + null terminator
+        char reverse_mac_string[13];
+        const char* string_to_compare = normalized_mac;
+
+        // Bail out cleanly on missing mac_id; passing nullptr to
+        // std::string's constructor (as the previous implementation
+        // did) is undefined behaviour.
+        if (mac_id == nullptr) {
+          DEBUG_PRINT("mac_id is null; skipping mac@index\n");
+          match = false;
+          break;
+        }
 
-        // remove colons and make lower case
-        for (int x = 0; x < mac_string.length(); x++) {
-          if (mac_string[x] == ':') {
-            mac_string.erase(x, 1);
+        // Normalize mac_id: strip colons, lowercase hex, into a
+        // fixed-size stack buffer. The previous implementation built
+        // a std::string and then erased colons in place while
+        // simultaneously indexing past the just-erased position;
+        // that pattern triggered a miscompile under aggressive LTO
+        // on at least one toolchain (Android NDK Clang 19, observed
+        // to silently return false from this entire branch).
+        size_t out = 0;
+        for (const char* p = mac_id; *p != '\0' && out < cond_len; ++p) {
+          if (*p != ':') {
+            normalized_mac[out++] = (char)tolower((unsigned char)*p);
           }
-          mac_string[x] = tolower(mac_string[x]);
         }
-
-        string_to_compare = mac_string.c_str();
+        if (out != cond_len) {
+          // mac_id had fewer than 12 hex chars after stripping colons,
+          // so a 12-char comparison cannot match.
+          DEBUG_PRINT("mac_id %s has fewer than 12 hex chars; skipping\n", mac_id);
+          match = false;
+          break;
+        }
+        normalized_mac[cond_len] = '\0';
 
         if (strstr(cond_str, "revmac@index") != nullptr) {
-          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
+          reverse_hex_data(normalized_mac, reverse_mac_string, (int)cond_len);
+          reverse_mac_string[cond_len] = '\0';
           string_to_compare = reverse_mac_string;
         }
 
@@ -305,7 +326,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, cond_len) == 0) {
           match = true;
         } else {
           match = false;

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

@@ -180,6 +180,7 @@ public:
     VICTORIONXS,
     VICTSBP,
     VICTSBS,
+    VICTSCC,
     SE_RHT,
     SE_TEMP,
     SE_TPROBE,

theengsdecoder-2.2.0/src/devices/VICTRON_SCC_json.h

@@ -0,0 +1,97 @@
+const char* _VICTSCC_json = "{\"brand\":\"Victron Energy\",\"model\":\"Solar Charge Controller\",\"model_id\":\"VICTSCC\",\"tag\":\"1408\",\"condition\":[\"manufacturerdata\",\"=\",44,\"index\",0,\"e10211\",\"&\",\"manufacturerdata\",\"index\",12,\"01ffff\"],\"properties\":{\"device_state\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",20,2]},\"_device_state\":{\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",20,2],\"lookup\":[\"00\",\"off\",\"01\",\"low power\",\"02\",\"fault\",\"03\",\"bulk\",\"04\",\"absorption\",\"05\",\"float\",\"06\",\"storage\",\"07\",\"equalize manual\",\"09\",\"inverting\",\"0b\",\"power supply\",\"f5\",\"starting up\",\"f6\",\"repeated absorption\",\"f7\",\"recondition\",\"f8\",\"battery safe\",\"f9\",\"active\",\"fc\",\"external control\",\"ff\",\"N/A\"]},\"volt_batt\":{\"condition\":[\"manufacturerdata\",24,\"!\",\"7fff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",24,4,true,true],\"post_proc\":[\"&\",32767,\"/\",100]},\"current_batt\":{\"condition\":[\"manufacturerdata\",28,\"!\",\"7fff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4,true,true],\"post_proc\":[\"&\",32767,\"/\",10]},\"yield_today\":{\"condition\":[\"manufacturerdata\",32,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",32,4,true,false],\"post_proc\":[\"/\",100]},\"pv_power\":{\"condition\":[\"manufacturerdata\",36,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",36,4,true,false]},\"current_load\":{\"condition\":[\"manufacturerdata\",40,\"!\",\"01ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",40,4,true,false],\"post_proc\":[\"&\",511,\"/\",10]},\"error_code\":{\"condition\":[\"manufacturerdata\",22,\"!\",\"ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",22,2]}}}";
+/*R""""(
+{
+   "brand":"Victron Energy",
+   "model":"Solar Charge Controller",
+   "model_id":"VICTSCC",
+   "tag":"1408",
+   "condition":["manufacturerdata", "=", 44, "index", 0, "e10211", "&", "manufacturerdata", "index", 12, "01ffff"],
+   "properties":{
+      "device_state":{
+         "decoder":["value_from_hex_data", "manufacturerdata", 20, 2]
+      },
+      "_device_state":{
+         "decoder":["string_from_hex_data", "manufacturerdata", 20, 2],
+         "lookup":["00", "off",
+                   "01", "low power",
+                   "02", "fault",
+                   "03", "bulk",
+                   "04", "absorption",
+                   "05", "float",
+                   "06", "storage",
+                   "07", "equalize manual",
+                   "09", "inverting",
+                   "0b", "power supply",
+                   "f5", "starting up",
+                   "f6", "repeated absorption",
+                   "f7", "recondition",
+                   "f8", "battery safe",
+                   "f9", "active",
+                   "fc", "external control",
+                   "ff", "N/A"]
+      },
+      "volt_batt":{
+         "condition":["manufacturerdata", 24, "!", "7fff"],
+         "decoder":["value_from_hex_data", "manufacturerdata", 24, 4, true, true],
+         "post_proc":["&", 32767, "/", 100]
+      },
+      "current_batt":{
+         "condition":["manufacturerdata", 28, "!", "7fff"],
+         "decoder":["value_from_hex_data", "manufacturerdata", 28, 4, true, true],
+         "post_proc":["&", 32767, "/", 10]
+      },
+      "yield_today":{
+         "condition":["manufacturerdata", 32, "!", "ffff"],
+         "decoder":["value_from_hex_data", "manufacturerdata", 32, 4, true, false],
+         "post_proc":["/", 100]
+      },
+      "pv_power":{
+         "condition":["manufacturerdata", 36, "!", "ffff"],
+         "decoder":["value_from_hex_data", "manufacturerdata", 36, 4, true, false]
+      },
+      "current_load":{
+         "condition":["manufacturerdata", 40, "!", "01ff"],
+         "decoder":["value_from_hex_data", "manufacturerdata", 40, 4, true, false],
+         "post_proc":["&", 511,"/", 10]
+      },
+       "error_code":{
+         "condition":["manufacturerdata", 22, "!", "ff"],
+         "decoder":["value_from_hex_data", "manufacturerdata", 22, 2]
+      }
+   }
+})"""";*/
+
+const char* _VICTSCC_json_props = "{\"properties\":{\"device_state\":{\"unit\":\"string\",\"name\":\"device state\"},\"volt_batt\":{\"unit\":\"V\",\"name\":\"voltage\"},\"current_batt\":{\"unit\":\"A\",\"name\":\"current\"},\"yield_today\":{\"unit\":\"kWh\",\"name\":\"energy\"},\"pv_power\":{\"unit\":\"W\",\"name\":\"power\"},\"current_load\":{\"unit\":\"A\",\"name\":\"current\"},\"error_code\":{\"unit\":\"int\",\"name\":\"error code\"}}}";
+/*R""""(
+{
+   "properties":{
+      "device_state":{
+         "unit":"string",
+         "name":"device state"
+      },
+      "volt_batt": {
+         "unit": "V",
+         "name": "voltage"
+      },
+      "current_batt": {
+         "unit": "A",
+         "name": "current"
+      },
+      "yield_today": {
+         "unit": "kWh",
+         "name": "energy"
+      },
+      "pv_power": {
+         "unit": "W",
+         "name": "power"
+      },
+      "current_load": {
+         "unit": "A",
+         "name": "current"
+      },
+      "error_code":{
+         "unit":"int",
+         "name":"error code"
+      }
+   }
+})"""";*/

{theengsdecoder-2.1.0 → theengsdecoder-2.2.0}/src/devices/VICTRON__ENCR_json.h

@@ -1,21 +1,25 @@
-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]}}}";
+const char* _VICTRON_ENCR_json = "{\"brand\":\"Victron Energy\",\"model\":\"Victron encrypted\",\"model_id\":\"VICTRON_ENCR\",\"tag\":\"140003\",\"condition\":[\"manufacturerdata\",\">=\",44,\"index\",0,\"e10210\"],\"properties\":{\"cipher\":{\"condition\":[\"manufacturerdata\",\"=\",44],\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",20,24]},\"_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"],
+   "condition":["manufacturerdata", ">=", 44, "index", 0, "e10210"],
    "properties":{
       "cipher":{
+         "condition":["manufacturerdata", "=", 44],
+         "decoder":["string_from_hex_data", "manufacturerdata", 20, 24]
+      },
+      "_cipher":{
          "condition":["manufacturerdata", "=", 46],
          "decoder":["string_from_hex_data", "manufacturerdata", 20, 26]
       },
-      "_cipher":{
+      "__cipher":{
          "condition":["manufacturerdata", "=", 48],
          "decoder":["string_from_hex_data", "manufacturerdata", 20, 28]
       },
-      "__cipher":{
+      "___cipher":{
          "condition":["manufacturerdata", "=", 50],
          "decoder":["string_from_hex_data", "manufacturerdata", 20, 30]
       },

{theengsdecoder-2.1.0 → theengsdecoder-2.2.0}/src/devices/iNodeEM_json.h

@@ -1,4 +1,4 @@
-const char* _iNodeEM_json = "{\"brand\":\"iNode\",\"model\":\"Energy Meter\",\"model_id\":\"INEM\",\"tag\":\"0c01\",\"condition\":[\"manufacturerdata\",\"index\",0,\"90\",\"|\",\"manufacturerdata\",\"index\",0,\"92\",\"|\",\"manufacturerdata\",\"index\",0,\"94\",\"|\",\"manufacturerdata\",\"index\",0,\"96\",\"&\",\"manufacturerdata\",\"=\",26,\"index\",2,\"82\"],\"properties\":{\".cal\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",16,4,true,false],\"post_proc\":[\"&\",16383]},\"avg\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",4,4,true,false],\"post_proc\":[\"*\",60,\"/\",\".cal\"]},\"avgu\":{\"decoder\":[\"bit_static_value\",\"manufacturerdata\",18,0,\"kW\",\"m³\"]},\"sum\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",8,4,true,false],\"post_proc\":[\"/\",\".cal\"]},\"sumu\":{\"decoder\":[\"bit_static_value\",\"manufacturerdata\",18,0,\"kWh\",\"m³\"]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",20,1,false,false],\"post_proc\":[\"-\",1,\"*\",10]},\"_batt\":{\"condition\":[\"manufacturerdata\",20,\"1\",\"|\",\"manufacturerdata\",20,\"c\",\"|\",\"manufacturerdata\",20,\"d\",\"|\",\"manufacturerdata\",20,\"e\",\"|\",\"manufacturerdata\",20,\"f\"],\"decoder\":[\"static_value\",\"100\"]},\"lowbatt\":{\"decoder\":[\"bit_static_value\",\"manufacturerdata\",1,2,false,true]}}}";
+const char* _iNodeEM_json = "{\"brand\":\"iNode\",\"model\":\"Energy Meter\",\"model_id\":\"INEM\",\"tag\":\"0c01\",\"condition\":[\"manufacturerdata\",\"index\",0,\"90\",\"|\",\"manufacturerdata\",\"index\",0,\"92\",\"|\",\"manufacturerdata\",\"index\",0,\"94\",\"|\",\"manufacturerdata\",\"index\",0,\"96\",\"&\",\"manufacturerdata\",\"=\",26,\"index\",2,\"82\"],\"properties\":{\".cal\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",16,4,true,false],\"post_proc\":[\"&\",16383]},\"avg\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",4,4,true,false],\"post_proc\":[\"*\",60,\"/\",\".cal\"]},\"avgu\":{\"decoder\":[\"bit_static_value\",\"manufacturerdata\",18,0,\"kW\",\"m³\"]},\"sum\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",8,4,true,false],\"post_proc\":[\"/\",\".cal\"]},\"sumu\":{\"decoder\":[\"bit_static_value\",\"manufacturerdata\",18,0,\"kWh\",\"m³\"]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",20,1,false,false],\"post_proc\":[\"-\",1,\"*\",10]},\"_batt\":{\"condition\":[\"manufacturerdata\",20,\"1\",\"|\",\"manufacturerdata\",20,\"c\",\"|\",\"manufacturerdata\",20,\"d\",\"|\",\"manufacturerdata\",20,\"e\",\"|\",\"manufacturerdata\",20,\"f\"],\"decoder\":[\"static_value\",100]},\"lowbatt\":{\"decoder\":[\"bit_static_value\",\"manufacturerdata\",1,2,false,true]}}}";
 /*R""""(
 {
    "brand":"iNode",
@@ -31,7 +31,7 @@ const char* _iNodeEM_json = "{\"brand\":\"iNode\",\"model\":\"Energy Meter\",\"m
       },
       "_batt":{
          "condition":["manufacturerdata", 20, "1", "|", "manufacturerdata", 20, "c", "|", "manufacturerdata", 20, "d", "|", "manufacturerdata", 20, "e", "|", "manufacturerdata", 20, "f"],
-         "decoder":["static_value", "100"]
+         "decoder":["static_value", 100]
       },
       "lowbatt":{
          "decoder":["bit_static_value", "manufacturerdata", 1, 2, false, true]

{theengsdecoder-2.1.0 → theengsdecoder-2.2.0}/src/devices.h

@@ -126,6 +126,7 @@
 #include "devices/VICTRON_ORIONXS_json.h"
 #include "devices/VICTRON_SBP_json.h"
 #include "devices/VICTRON_SBS_json.h"
+#include "devices/VICTRON_SCC_json.h"
 #include "devices/SE_RHT_json.h"
 #include "devices/SE_TEMP_json.h"
 #include "devices/SE_TPROBE_json.h"
@@ -277,6 +278,7 @@ const char* _devices[][2] = {
     {_VICTORIONXS_json, _VICTORIONXS_json_props},
     {_VICTSBP_json, _VICTSBP_json_props},
     {_VICTSBS_json, _VICTSBS_json_props},
+    {_VICTSCC_json, _VICTSCC_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.1.0 → theengsdecoder-2.2.0/theengsdecoder.egg-info}/PKG-INFO

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

{theengsdecoder-2.1.0 → theengsdecoder-2.2.0}/theengsdecoder.egg-info/SOURCES.txt

@@ -553,6 +553,7 @@ src/devices/VICTRON_BSC_json.h
 src/devices/VICTRON_ORIONXS_json.h
 src/devices/VICTRON_SBP_json.h
 src/devices/VICTRON_SBS_json.h
+src/devices/VICTRON_SCC_json.h
 src/devices/VICTRON__ENCR_json.h
 src/devices/XMTZC04HMKG_json.h
 src/devices/XMTZC04HMLB_json.h