theengsdecoder 2.3.0__tar.gz → 2.4.0__tar.gz

{theengsdecoder-2.3.0 → theengsdecoder-2.4.0}/CMakeLists.txt

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

{theengsdecoder-2.3.0/theengsdecoder.egg-info → theengsdecoder-2.4.0}/PKG-INFO

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

{theengsdecoder-2.3.0 → theengsdecoder-2.4.0}/src/decoder.cpp

@@ -125,6 +125,48 @@ double TheengsDecoder::value_from_hex_string(const char* data_str,
   return value;
 }
 
+/*
+ * @brief Extracts bit-aligned values from a hex string.
+ * Bit 0 is the least significant bit of the first byte.
+ */
+double TheengsDecoder::value_from_bit_string(const char* data_str,
+                                             int bit_offset, int bit_length,
+                                             bool canBeNegative) {
+  if (bit_offset < 0 || bit_length <= 0 || bit_length > 63) {
+    return 0;
+  }
+
+  size_t data_chars = strlen(data_str);
+  size_t required_chars = ((size_t)(bit_offset + bit_length + 7) / 8) * 2;
+  if (data_chars < required_chars) {
+    return 0;
+  }
+
+  unsigned long long value = 0;
+  for (int i = 0; i < bit_length; ++i) {
+    int abs_bit = bit_offset + i;
+    size_t byte_idx = (size_t)abs_bit / 8;
+    uint8_t bit_idx = (uint8_t)(abs_bit % 8);
+    size_t hex_idx = byte_idx * 2;
+
+    uint8_t byte = (uint8_t)((getBinaryData(data_str[hex_idx]) << 4) |
+                             getBinaryData(data_str[hex_idx + 1]));
+    if ((byte >> bit_idx) & 0x01) {
+      value |= (1ULL << i);
+    }
+  }
+
+  long long signed_value = (long long)value;
+  if (canBeNegative) {
+    unsigned long long sign_bit = (1ULL << (bit_length - 1));
+    if (value & sign_bit) {
+      signed_value -= (long long)(1ULL << bit_length);
+    }
+  }
+
+  return (double)signed_value;
+}
+
 /*
  * @brief Removes the underscores at the beginning of key strings
  * when duplicate properties exist in a device.
@@ -587,7 +629,7 @@ int TheengsDecoder::decodeBLEJson(JsonObject& jsondata) {
             doc["type"] = "BODY"; // health monitoring devices
             break;
           case 12:
-            doc["type"] = "ENRG"; // energy monitoring devices
+            doc["type"] = "ENRG"; // energy producing, monitoring and storing devices
             break;
           case 13:
             doc["type"] = "WCVR"; // window covering
@@ -610,9 +652,6 @@ int TheengsDecoder::decodeBLEJson(JsonObject& jsondata) {
           case 19:
             doc["type"] = "WIND"; // Anemometers
             break;
-          case 20:
-            doc["type"] = "ENRG"; // Energy
-            break;
           case 254:
             doc["type"] = "RMAC"; // random MAC address devices
             break;
@@ -670,6 +709,12 @@ int TheengsDecoder::decodeBLEJson(JsonObject& jsondata) {
             doc["ctrl"] = true;
             jsondata["ctrl"] = doc["ctrl"];
           }
+
+          if (((data >> 2) & 0x01) == 1) { // BVPP - Battery and/or voltage are primary properties
+            doc.add("bvpp");
+            doc["bvpp"] = true;
+            jsondata["bvpp"] = doc["bvpp"];
+          }
         }
 
         // Octet Byte[2] - Encryption Model
@@ -692,7 +737,8 @@ int TheengsDecoder::decodeBLEJson(JsonObject& jsondata) {
 
         if (checkPropCondition(prop["condition"], svc_data, mfg_data, dev_name)) {
           JsonArray decoder = prop["decoder"];
-          if (strstr((const char*)decoder[0], "value_from_hex_data") != nullptr) {
+          if (strstr((const char*)decoder[0], "value_from_hex_data") != nullptr ||
+              strstr((const char*)decoder[0], "value_from_bit_data") != nullptr) {
             const char* src = svc_data;
             if (strstr((const char*)decoder[1], MFG_DATA)) {
               src = mfg_data;
@@ -703,7 +749,21 @@ int TheengsDecoder::decodeBLEJson(JsonObject& jsondata) {
             static double cal_val = 0;
             std::string proc_str = "";
 
-            if (data_index_is_valid(src, decoder[2].as<int>(), decoder[3].as<int>())) {
+            if (strstr((const char*)decoder[0], "value_from_bit_data") != nullptr) {
+              int bit_offset = decoder[2].as<int>();
+              int bit_length = decoder[3].as<int>();
+              size_t required_chars = ((size_t)(bit_offset + bit_length + 7) / 8) * 2;
+
+              if (data_index_is_valid(src, 0, required_chars)) {
+                temp_val = value_from_bit_string(
+                    src,
+                    bit_offset,
+                    bit_length,
+                    decoder[4].isNull() ? true : decoder[4].as<bool>());
+              } else {
+                break;
+              }
+            } else if (data_index_is_valid(src, decoder[2].as<int>(), decoder[3].as<int>())) {
               decoder_function dec_fun = &TheengsDecoder::value_from_hex_string;
 
               if (strstr((const char*)decoder[0], "bf") != nullptr) {
@@ -816,6 +876,28 @@ int TheengsDecoder::decodeBLEJson(JsonObject& jsondata) {
               }
             }
 
+            /* Optional enum-style lookup for numeric decoders. */
+            if (prop.containsKey("lookup")) {
+              JsonArray lookup = prop["lookup"];
+              for (unsigned int i = 0; i + 1 < lookup.size(); i += 2) {
+                long long lookup_key = LLONG_MIN;
+
+                if (lookup[i].is<const char*>()) {
+                  const char* key_str = lookup[i].as<const char*>();
+                  if (key_str != nullptr) {
+                    lookup_key = strtoll(key_str, NULL, 16);
+                  }
+                }
+
+                if (lookup_key != LLONG_MIN &&
+                    (long long)temp_val == lookup_key &&
+                    lookup[i + 1].is<const char*>()) {
+                  proc_str = lookup[i + 1].as<const char*>();
+                  break;
+                }
+              }
+            }
+
             /* If there is any underscores at the beginning of the property name, there is multiple
                 * properties of this type, we need remove the underscores for creating the key.
                 */
@@ -897,6 +979,12 @@ int TheengsDecoder::decodeBLEJson(JsonObject& jsondata) {
 
             std::string value(src + decoder[2].as<int>(), decoder[3].as<int>());
 
+            if (strstr((const char*)decoder[0], "reverse_") != nullptr) {
+              std::string reversed(value.length(), '\0');
+              reverse_hex_data(value.c_str(), &reversed[0], value.length());
+              value = reversed;
+            }
+
             /* Lookup table */
             if (prop.containsKey("lookup")) {
               JsonArray lookup = prop["lookup"];

{theengsdecoder-2.3.0 → theengsdecoder-2.4.0}/src/decoder.h

@@ -177,6 +177,7 @@ public:
     UT363BT,
     VICTRON_ENCR,
     VICTBSC,
+    VICTORIONTR,
     VICTORIONXS,
     VICTSBP,
     VICTSBS,
@@ -185,6 +186,7 @@ public:
     SE_TEMP,
     SE_TPROBE,
     SE_MAG,
+    ODACE_WLBL,
     SBBT_002C,
     SBBT_002C_ENCR,
     SBBT_004CEU_US,
@@ -201,6 +203,7 @@ public:
 private:
   void        reverse_hex_data(const char* in, char* out, int l);
   double      value_from_hex_string(const char* data_str, int offset, int data_length, bool reverse, bool canBeNegative = true, bool isFloat = false);
+  double      value_from_bit_string(const char* data_str, int bit_offset, int bit_length, bool canBeNegative = true);
   double      bf_value_from_hex_string(const char* data_str, int offset, int data_length, bool reverse, bool canBeNegative = true, bool isFloat = false);
   bool        data_index_is_valid(const char* str, size_t index, size_t len);
   bool        data_length_is_valid(size_t data_len, size_t default_min, const JsonArray& condition, int *idx);

{theengsdecoder-2.3.0 → theengsdecoder-2.4.0}/src/devices/BM2_json.h

@@ -1,11 +1,11 @@
-const char* _BM2_json = "{\"brand\":\"GENERIC\",\"model\":\"BM2 Battery Monitor\",\"model_id\":\"BM2\",\"tag\":\"0808\",\"condition\":[\"manufacturerdata\",\"=\",50,\"index\",0,\"4c000215655f83caae16a10a702e31f30d58dd82\"],\"properties\":{\"batt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",48,2,false]},\"device\":{\"decoder\":[\"static_value\",\"BM2 Tracker\"]}}}";
+const char* _BM2_json = "{\"brand\":\"GENERIC\",\"model\":\"BM2 Battery Monitor\",\"model_id\":\"BM2\",\"tag\":\"0848\",\"condition\":[\"manufacturerdata\",\"=\",50,\"index\",0,\"4c000215655f83caae16a10a702e31f30d58dd82\"],\"properties\":{\"batt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",48,2,false]},\"device\":{\"decoder\":[\"static_value\",\"BM2 Tracker\"]}}}";
 
 /*R""""(
 {
    "brand":"GENERIC",
    "model":"BM2 Battery Monitor",
    "model_id":"BM2",
-   "tag":"0808",
+   "tag":"0848",
    "condition":["manufacturerdata", "=", 50, "index", 0, "4c000215655f83caae16a10a702e31f30d58dd82"],
    "properties":{
       "batt":{

{theengsdecoder-2.3.0 → theengsdecoder-2.4.0}/src/devices/BM6_json.h

@@ -1,10 +1,10 @@
-const char* _BM6_json = "{\"brand\":\"GENERIC\",\"model\":\"BM6 Battery Monitor\",\"model_id\":\"BM6\",\"tag\":\"0808\",\"condition\":[\"manufacturerdata\",\"=\",50,\"index\",0,\"4c0002153ba29cd9a42c894856badaf2606ef777\"],\"properties\":{\"batt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",42,2,false]},\"device\":{\"decoder\":[\"static_value\",\"BM6 Tracker\"]}}}";
+const char* _BM6_json = "{\"brand\":\"GENERIC\",\"model\":\"BM6 Battery Monitor\",\"model_id\":\"BM6\",\"tag\":\"0848\",\"condition\":[\"manufacturerdata\",\"=\",50,\"index\",0,\"4c0002153ba29cd9a42c894856badaf2606ef777\"],\"properties\":{\"batt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",42,2,false]},\"device\":{\"decoder\":[\"static_value\",\"BM6 Tracker\"]}}}";
 /*R""""(
 {
    "brand":"GENERIC",
    "model":"BM6 Battery Monitor",
    "model_id":"BM6",
-   "tag":"0808",
+   "tag":"0848",
    "condition":["manufacturerdata", "=", 50, "index", 0, "4c0002153ba29cd9a42c894856badaf2606ef777"],
    "properties":{
       "batt":{

{theengsdecoder-2.3.0 → theengsdecoder-2.4.0}/src/devices/ECOFLOW_ADV_json.h

@@ -1,10 +1,10 @@
-const char* _ECOFLOW_ADV_json = "{\"brand\":\"EcoFlow\",\"model\":\"Power Station\",\"model_id\":\"ECOFLOW_ADV\",\"tag\":\"1409\",\"condition\":[\"manufacturerdata\",\"=\",52,\"index\",0,\"b5b5\"],\"properties\":{\"version\":{\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",6,6],\"lookup\":[\"00\",\"off\",\"523630\",\"RIVER 2\",\"523631\",\"RIVER 2 Max\",\"523632\",\"RIVER 2 Pro\",\"523635\",\"RIVER 3\",\"523333\",\"DELTA 2\"]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",38,2,false,false],\"post_proc\":[\"&\",127]}}}";
+const char* _ECOFLOW_ADV_json = "{\"brand\":\"EcoFlow\",\"model\":\"Power Station\",\"model_id\":\"ECOFLOW_ADV\",\"tag\":\"0c49\",\"condition\":[\"manufacturerdata\",\"=\",52,\"index\",0,\"b5b5\"],\"properties\":{\"version\":{\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",6,6],\"lookup\":[\"00\",\"off\",\"523630\",\"RIVER 2\",\"523631\",\"RIVER 2 Max\",\"523632\",\"RIVER 2 Pro\",\"523635\",\"RIVER 3\",\"523333\",\"DELTA 2\"]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",38,2,false,false],\"post_proc\":[\"&\",127]}}}";
 /*R""""(
 {
    "brand":"EcoFlow",
    "model":"Power Station",
    "model_id":"ECOFLOW_ADV",
-   "tag":"1409",
+   "tag":"0c49",
    "condition":["manufacturerdata", "=", 52, "index", 0, "b5b5"],
    "properties":{
       "version":{

theengsdecoder-2.4.0/src/devices/ODACE_WLBL_json.h

@@ -0,0 +1,46 @@
+const char* _ODACE_WLBL_json = "{\"brand\":\"Schneider Electric\",\"model\":\"Odace WLBL\",\"model_id\":\"S520104\",\"tag\":\"1104\",\"condition\":[\"manufacturerdata\",\">=\",24,\"index\",0,\"b6028e44\"],\"properties\":{\"uid\":{\"decoder\":[\"reverse_string_from_hex_data\",\"manufacturerdata\",14,6]},\"action\":{\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",22,2],\"lookup\":[\"00\",\"off\",\"01\",\"on\",\"02\",\"toggle\",\"03\",\"dim_up\",\"04\",\"dim_down\",\"05\",\"up\",\"06\",\"down\",\"07\",\"stop\",\"08\",\"scene_user\",\"09\",\"scene_in\",\"0a\",\"scene_out\"]}}}";
+
+/*R""""(
+{
+   "brand":"Schneider Electric",
+   "model":"Odace WLBL",
+   "model_id":"S520104",
+   "tag":"1104",
+   "condition":["manufacturerdata", ">=", 24, "index", 0, "b6028e44"],
+   "properties":{
+      "uid":{
+         "decoder":["reverse_string_from_hex_data", "manufacturerdata", 14, 6]
+      },
+      "action":{
+         "decoder":["string_from_hex_data", "manufacturerdata", 22, 2],
+         "lookup":["00", "off",
+                   "01", "on",
+                   "02", "toggle",
+                   "03", "dim_up",
+                   "04", "dim_down",
+                   "05", "up",
+                   "06", "down",
+                   "07", "stop",
+                   "08", "scene_user",
+                   "09", "scene_in",
+                   "0a", "scene_out"]
+      }
+   }
+})"""";*/
+
+const char* _ODACE_WLBL_json_props = "{\"properties\":{\"uid\":{\"unit\":\"string\",\"name\":\"device UID\"},\"action\":{\"unit\":\"event\",\"name\":\"button action\",\"events\":[\"off\",\"on\",\"toggle\",\"dim_up\",\"dim_down\",\"up\",\"down\",\"stop\",\"scene_user\",\"scene_in\",\"scene_out\"]}}}";
+
+/*R""""(
+{
+   "properties":{
+      "uid":{
+         "unit":"string",
+         "name":"device UID"
+      },
+      "action":{
+         "unit":"event",
+         "name":"button action",
+         "events":["off", "on", "toggle", "dim_up", "dim_down", "up", "down", "stop", "scene_user", "scene_in", "scene_out"]
+      }
+   }
+})"""";*/

{theengsdecoder-2.3.0 → theengsdecoder-2.4.0}/src/devices/SBMP_json.h

@@ -1,13 +1,13 @@
 #include "common_props.h"
 
-const char* _SBMP_json = "{\"brand\":\"SwitchBot\",\"model\":\"Meter Pro (CO2)\",\"model_id\":\"W490001X\",\"tag\":\"0f02\",\"condition\":[\"uuid\",\"index\",0,\"fd3d\",\"&\",\"servicedata\",\"=\",6,\"index\",0,\"35\",\"&\",\"manufacturerdata\",\"=\",36,\"index\",0,\"6909\"],\"properties\":{\".cal\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",21,1,false,false],\"post_proc\":[\"/\",10]},\"tempc\":{\"condition\":[\"manufacturerdata\",22,\"bit\",3,0],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",22,2,true,false],\"post_proc\":[\"+\",\".cal\",\"*\",-1]},\"_tempc\":{\"condition\":[\"manufacturerdata\",22,\"bit\",3,1],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",22,2,true,false],\"post_proc\":[\"+\",\".cal\",\"-\",128]},\"hum\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",24,2,false,false],\"post_proc\":[\"&\",127]},\"co2\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",30,4,false,false]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",4,2,false,false],\"post_proc\":[\"&\",127]},\"mac\":{\"decoder\":[\"mac_from_hex_data\",\"manufacturerdata\",4]}}}";
+const char* _SBMP_json = "{\"brand\":\"SwitchBot\",\"model\":\"Meter Pro (CO2)\",\"model_id\":\"W490001X\",\"tag\":\"0202\",\"condition\":[\"servicedata\",\"=\",6,\"index\",0,\"35\",\"|\",\"servicedata\",\"=\",6,\"index\",0,\"34\",\"&\",\"uuid\",\"index\",0,\"fd3d\",\"&\",\"manufacturerdata\",\">=\",30,\"index\",0,\"6909\"],\"properties\":{\".cal\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",21,1,false,false],\"post_proc\":[\"/\",10]},\"tempc\":{\"condition\":[\"manufacturerdata\",22,\"bit\",3,0],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",22,2,true,false],\"post_proc\":[\"+\",\".cal\",\"*\",-1]},\"_tempc\":{\"condition\":[\"manufacturerdata\",22,\"bit\",3,1],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",22,2,true,false],\"post_proc\":[\"+\",\".cal\",\"-\",128]},\"hum\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",24,2,false,false],\"post_proc\":[\"&\",127]},\"batt\":{\"decoder\":[\"value_from_hex_data\",\"servicedata\",4,2,false,false],\"post_proc\":[\"&\",127]},\"mac\":{\"decoder\":[\"mac_from_hex_data\",\"manufacturerdata\",4]},\"co2\":{\"condition\":[\"manufacturerdata\",\"=\",36],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",30,4,false,false]}}}";
 /*R""""(
 {
    "brand":"SwitchBot",
    "model":"Meter Pro (CO2)",
    "model_id":"W490001X",
-   "tag":"0f02",
-   "condition":["uuid", "index", 0, "fd3d", "&", "servicedata", "=", 6, "index", 0, "35", "&", "manufacturerdata", "=", 36, "index", 0, "6909"],
+   "tag":"0202",
+   "condition":["servicedata", "=", 6, "index", 0, "35", "|", "servicedata", "=", 6, "index", 0, "34", "&", "uuid", "index", 0, "fd3d", "&", "manufacturerdata", ">=", 30, "index", 0, "6909"],
    "properties":{
       ".cal":{
          "decoder":["value_from_hex_data", "manufacturerdata", 21, 1, false, false],
@@ -27,15 +27,16 @@ const char* _SBMP_json = "{\"brand\":\"SwitchBot\",\"model\":\"Meter Pro (CO2)\"
          "decoder":["value_from_hex_data", "manufacturerdata", 24, 2, false, false],
          "post_proc":["&", 127]
       },
-      "co2":{
-         "decoder":["value_from_hex_data", "manufacturerdata", 30, 4, false, false]
-      },
       "batt":{
          "decoder":["value_from_hex_data", "servicedata", 4, 2, false, false],
          "post_proc":["&", 127]
       },
       "mac":{
          "decoder":["mac_from_hex_data", "manufacturerdata", 4]
+      },
+      "co2":{
+         "condition":["manufacturerdata", "=", 36],
+         "decoder":["value_from_hex_data", "manufacturerdata", 30, 4, false, false]
       }
    }
 })"""";*/

{theengsdecoder-2.3.0 → theengsdecoder-2.4.0}/src/devices/VICTRON_BSC_json.h

@@ -1,10 +1,10 @@
-const char* _VICTBSC_json = "{\"brand\":\"Victron Energy\",\"model\":\"Blue Smart Charger\",\"model_id\":\"VICTBSC\",\"tag\":\"1400\",\"condition\":[\"manufacturerdata\",\"=\",46,\"index\",0,\"e10211\",\"&\",\"manufacturerdata\",\"index\",12,\"08ffff\"],\"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_1\":{\"condition\":[\"manufacturerdata\",24,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",24,4,true,false],\"post_proc\":[\"&\",8191,\"/\",100]},\"current_batt_1\":{\"condition\":[\"manufacturerdata\",26,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",26,4,true,false],\"post_proc\":[\">\",5,\"&\",2047,\"/\",10]},\"volt_batt_2\":{\"condition\":[\"manufacturerdata\",30,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",30,4,true,false],\"post_proc\":[\"&\",8191,\"/\",100]},\"current_batt_2\":{\"condition\":[\"manufacturerdata\",32,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",32,4,true,false],\"post_proc\":[\">\",5,\"&\",2047,\"/\",10]},\"volt_batt_3\":{\"condition\":[\"manufacturerdata\",36,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",36,4,true,false],\"post_proc\":[\"&\",8191,\"/\",100]},\"current_batt_3\":{\"condition\":[\"manufacturerdata\",38,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",38,4,true,false],\"post_proc\":[\">\",5,\"&\",2047,\"/\",10]},\"tempc\":{\"condition\":[\"manufacturerdata\",42,\"!\",\"ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",42,2],\"post_proc\":[\"&\",127,\"-\",40]},\"current_ac\":{\"condition\":[\"manufacturerdata\",44,\"!\",\"ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",42,4,false,false],\"post_proc\":[\"&\",511,\"/\",10]},\"error_code\":{\"condition\":[\"manufacturerdata\",22,\"!\",\"ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",22,2]}}}";
+const char* _VICTBSC_json = "{\"brand\":\"Victron Energy\",\"model\":\"Blue Smart Charger\",\"model_id\":\"VICTBSC\",\"tag\":\"0c40\",\"condition\":[\"manufacturerdata\",\"=\",46,\"index\",0,\"e10211\",\"&\",\"manufacturerdata\",\"index\",12,\"08ffff\"],\"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_1\":{\"condition\":[\"manufacturerdata\",24,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",24,4,true,false],\"post_proc\":[\"&\",8191,\"/\",100]},\"current_batt_1\":{\"condition\":[\"manufacturerdata\",26,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",26,4,true,false],\"post_proc\":[\">\",5,\"&\",2047,\"/\",10]},\"volt_batt_2\":{\"condition\":[\"manufacturerdata\",30,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",30,4,true,false],\"post_proc\":[\"&\",8191,\"/\",100]},\"current_batt_2\":{\"condition\":[\"manufacturerdata\",32,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",32,4,true,false],\"post_proc\":[\">\",5,\"&\",2047,\"/\",10]},\"volt_batt_3\":{\"condition\":[\"manufacturerdata\",36,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",36,4,true,false],\"post_proc\":[\"&\",8191,\"/\",100]},\"current_batt_3\":{\"condition\":[\"manufacturerdata\",38,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",38,4,true,false],\"post_proc\":[\">\",5,\"&\",2047,\"/\",10]},\"tempc\":{\"condition\":[\"manufacturerdata\",42,\"!\",\"ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",42,2],\"post_proc\":[\"&\",127,\"-\",40]},\"current_ac\":{\"condition\":[\"manufacturerdata\",44,\"!\",\"ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",42,4,false,false],\"post_proc\":[\"&\",511,\"/\",10]},\"error_code\":{\"condition\":[\"manufacturerdata\",22,\"!\",\"ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",22,2]}}}";
 /*R""""(
 {
    "brand":"Victron Energy",
    "model":"Blue Smart Charger",
    "model_id":"VICTBSC",
-   "tag":"1400",
+   "tag":"0c40",
    "condition":["manufacturerdata", "=", 46, "index", 0, "e10211", "&", "manufacturerdata", "index", 12, "08ffff"],
    "properties":{
       "device_state":{

theengsdecoder-2.4.0/src/devices/VICTRON_ORIONTR_json.h

@@ -0,0 +1,86 @@
+const char* _VICTORIONTR_json = "{\"brand\":\"Victron Energy\",\"model\":\"Orion TR\",\"model_id\":\"VICTORIONTR\",\"tag\":\"0c48\",\"condition\":[\"manufacturerdata\",\"=\",40,\"index\",0,\"e10211\",\"&\",\"manufacturerdata\",\"index\",8,\"d0a3\",\"&\",\"manufacturerdata\",\"index\",12,\"04ffff\"],\"properties\":{\"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_in\":{\"condition\":[\"manufacturerdata\",24,\"!\",\"ff7f\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",24,4,true,true],\"post_proc\":[\"/\",100]},\"current_out\":{\"condition\":[\"manufacturerdata\",28,\"!\",\"ff7f\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4,true,true],\"post_proc\":[\"/\",10]},\"volt_out\":{\"condition\":[\"manufacturerdata\",32,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",32,4,true,false],\"post_proc\":[\"/\",100]},\"current_in\":{\"condition\":[\"manufacturerdata\",36,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",36,4,true,false],\"post_proc\":[\"/\",10]},\"error_code\":{\"condition\":[\"manufacturerdata\",22,\"!\",\"ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",22,2]}}}";
+/*R""""(
+{
+   "brand":"Victron Energy",
+   "model":"Orion TR",
+   "model_id":"VICTORIONTR",
+   "tag":"0c48",
+   "condition":["manufacturerdata", "=", 40, "index", 0, "e10211", "&", "manufacturerdata", "index", 8, "d0a3", "&", "manufacturerdata", "index", 12, "04ffff"],
+   "properties":{
+      "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_in":{
+         "condition":["manufacturerdata", 24, "!", "ff7f"],
+         "decoder":["value_from_hex_data", "manufacturerdata", 24, 4, true, true],
+         "post_proc":["/", 100]
+      },
+      "current_out":{
+         "condition":["manufacturerdata", 28, "!", "ff7f"],
+         "decoder":["value_from_hex_data", "manufacturerdata", 28, 4, true, true],
+         "post_proc":["/", 10]
+      },
+      "volt_out":{
+         "condition":["manufacturerdata", 32, "!", "ffff"],
+         "decoder":["value_from_hex_data", "manufacturerdata", 32, 4, true, false],
+         "post_proc":["/", 100]
+      },
+      "current_in":{
+         "condition":["manufacturerdata", 36, "!", "ffff"],
+         "decoder":["value_from_hex_data", "manufacturerdata", 36, 4, true, false],
+         "post_proc":["/", 10]
+      },
+      "error_code":{
+         "condition":["manufacturerdata", 22, "!", "ff"],
+         "decoder":["value_from_hex_data", "manufacturerdata", 22, 2]
+      }
+   }
+})"""";*/
+
+const char* _VICTORIONTR_json_props = "{\"properties\":{\"device_state\":{\"unit\":\"string\",\"name\":\"device state\"},\"volt_out\":{\"unit\":\"V\",\"name\":\"voltage\"},\"current_out\":{\"unit\":\"A\",\"name\":\"current\"},\"volt_in\":{\"unit\":\"V\",\"name\":\"voltage\"},\"current_in\":{\"unit\":\"A\",\"name\":\"current\"},\"error_code\":{\"unit\":\"int\",\"name\":\"error code\"}}}";
+/*R""""(
+{
+   "properties":{
+      "device_state":{
+         "unit":"string",
+         "name":"device state"
+      },
+      "volt_out": {
+         "unit": "V",
+         "name": "voltage"
+      },
+      "current_out": {
+         "unit": "A",
+         "name": "current"
+      },
+      "volt_in": {
+         "unit": "V",
+         "name": "voltage"
+      },
+      "current_in": {
+         "unit": "A",
+         "name": "current"
+      },
+      "error_code":{
+         "unit":"int",
+         "name":"error code"
+      }
+   }
+})"""";*/

{theengsdecoder-2.3.0 → theengsdecoder-2.4.0}/src/devices/VICTRON_ORIONXS_json.h

@@ -1,10 +1,10 @@
-const char* _VICTORIONXS_json = "{\"brand\":\"Victron Energy\",\"model\":\"Orion XS\",\"model_id\":\"VICTORIONXS\",\"tag\":\"1408\",\"condition\":[\"manufacturerdata\",\"=\",48,\"index\",0,\"e10211\",\"&\",\"manufacturerdata\",\"index\",12,\"0fffff\"],\"properties\":{\"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_out\":{\"condition\":[\"manufacturerdata\",24,\"!\",\"7fff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",24,4,true,true],\"post_proc\":[\"/\",100]},\"current_out\":{\"condition\":[\"manufacturerdata\",28,\"!\",\"7fff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4,true,true],\"post_proc\":[\"/\",10]},\"volt_in\":{\"condition\":[\"manufacturerdata\",32,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",32,4,true,false],\"post_proc\":[\"/\",100]},\"current_in\":{\"condition\":[\"manufacturerdata\",36,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",36,4,true,false],\"post_proc\":[\"/\",10]},\"error_code\":{\"condition\":[\"manufacturerdata\",22,\"!\",\"ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",22,2]}}}";
+const char* _VICTORIONXS_json = "{\"brand\":\"Victron Energy\",\"model\":\"Orion XS\",\"model_id\":\"VICTORIONXS\",\"tag\":\"0c48\",\"condition\":[\"manufacturerdata\",\"=\",48,\"index\",0,\"e10211\",\"&\",\"manufacturerdata\",\"index\",12,\"0fffff\"],\"properties\":{\"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_out\":{\"condition\":[\"manufacturerdata\",24,\"!\",\"7fff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",24,4,true,true],\"post_proc\":[\"/\",100]},\"current_out\":{\"condition\":[\"manufacturerdata\",28,\"!\",\"7fff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4,true,true],\"post_proc\":[\"/\",10]},\"volt_in\":{\"condition\":[\"manufacturerdata\",32,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",32,4,true,false],\"post_proc\":[\"/\",100]},\"current_in\":{\"condition\":[\"manufacturerdata\",36,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",36,4,true,false],\"post_proc\":[\"/\",10]},\"error_code\":{\"condition\":[\"manufacturerdata\",22,\"!\",\"ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",22,2]}}}";
 /*R""""(
 {
    "brand":"Victron Energy",
    "model":"Orion XS",
    "model_id":"VICTORIONXS",
-   "tag":"1408",
+   "tag":"0c48",
    "condition":["manufacturerdata", "=", 48, "index", 0, "e10211", "&", "manufacturerdata", "index", 12, "0fffff"],
    "properties":{
       "device_state":{

{theengsdecoder-2.3.0 → theengsdecoder-2.4.0}/src/devices/VICTRON_SBP_json.h

@@ -1,10 +1,10 @@
-const char* _VICTSBP_json = "{\"brand\":\"Victron Energy\",\"model\":\"Smart BatteryProtect\",\"model_id\":\"VICTSBP\",\"tag\":\"1408\",\"condition\":[\"manufacturerdata\",\"=\",50,\"index\",0,\"e10211\",\"&\",\"manufacturerdata\",\"index\",12,\"09ffff\"],\"properties\":{\"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\"]},\"output_state\":{\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",22,2],\"lookup\":[\"00\",\"off\",\"01\",\"on\",\"ff\",\"N/A\"]},\"volt_in\":{\"condition\":[\"manufacturerdata\",34,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",34,4,true,true],\"post_proc\":[\"&\",32767,\"/\",100]},\"volt_out\":{\"condition\":[\"manufacturerdata\",38,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",38,4,true,false],\"post_proc\":[\"/\",100]},\"error_code\":{\"condition\":[\"manufacturerdata\",24,\"!\",\"ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",24,2]},\"alarm_reason\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",26,4]},\"warning_reason\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",30,4]}}}";
+const char* _VICTSBP_json = "{\"brand\":\"Victron Energy\",\"model\":\"Smart BatteryProtect\",\"model_id\":\"VICTSBP\",\"tag\":\"0c48\",\"condition\":[\"manufacturerdata\",\"=\",50,\"index\",0,\"e10211\",\"&\",\"manufacturerdata\",\"index\",12,\"09ffff\"],\"properties\":{\"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\"]},\"output_state\":{\"decoder\":[\"string_from_hex_data\",\"manufacturerdata\",22,2],\"lookup\":[\"00\",\"off\",\"01\",\"on\",\"ff\",\"N/A\"]},\"volt_in\":{\"condition\":[\"manufacturerdata\",34,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",34,4,true,true],\"post_proc\":[\"&\",32767,\"/\",100]},\"volt_out\":{\"condition\":[\"manufacturerdata\",38,\"!\",\"ffff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",38,4,true,false],\"post_proc\":[\"/\",100]},\"error_code\":{\"condition\":[\"manufacturerdata\",24,\"!\",\"ff\"],\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",24,2]},\"alarm_reason\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",26,4]},\"warning_reason\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",30,4]}}}";
 /*R""""(
 {
    "brand":"Victron Energy",
    "model":"Smart BatteryProtect",
    "model_id":"VICTSBP",
-   "tag":"1408",
+   "tag":"0c48",
    "condition":["manufacturerdata", "=", 50, "index", 0, "e10211", "&", "manufacturerdata", "index", 12, "09ffff"],
    "properties":{
       "device_state":{

theengsdecoder-2.4.0/src/devices/VICTRON_SBS_json.h

@@ -0,0 +1,95 @@
+const char* _VICTSBS_json = "{\"brand\":\"Victron Energy\",\"model\":\"Battery Monitor/Smart Battery Sense/SmartShunt\",\"model_id\":\"VICTSBS\",\"tag\":\"0c48\",\"condition\":[\"manufacturerdata\",\"=\",50,\"index\",0,\"e10211\",\"&\",\"manufacturerdata\",\"index\",12,\"02ffff\"],\"properties\":{\"ttg\":{\"condition\":[\"manufacturerdata\",20,\"!\",\"ffff\"],\"decoder\":[\"value_from_bit_data\",\"manufacturerdata\",80,16,false]},\"volt\":{\"decoder\":[\"value_from_bit_data\",\"manufacturerdata\",96,16,true],\"post_proc\":[\"/\",100]},\"volt_aux\":{\"condition\":[\"manufacturerdata\",37,\"bit\",0,0,\"&\",\"manufacturerdata\",37,\"bit\",1,0],\"decoder\":[\"value_from_bit_data\",\"manufacturerdata\",128,16,true],\"post_proc\":[\"/\",100]},\"volt_mid\":{\"condition\":[\"manufacturerdata\",37,\"bit\",0,1,\"&\",\"manufacturerdata\",37,\"bit\",1,0],\"decoder\":[\"value_from_bit_data\",\"manufacturerdata\",128,16,true],\"post_proc\":[\"/\",100]},\"tempc\":{\"condition\":[\"manufacturerdata\",37,\"bit\",0,0,\"&\",\"manufacturerdata\",37,\"bit\",1,1],\"decoder\":[\"value_from_bit_data\",\"manufacturerdata\",128,16,true],\"post_proc\":[\"-\",27315,\"/\",100]},\"current\":{\"condition\":[\"manufacturerdata\",38,\"!\",\"ff\"],\"decoder\":[\"value_from_bit_data\",\"manufacturerdata\",146,22,true],\"post_proc\":[\"/\",1000]},\"consumed_ah\":{\"condition\":[\"manufacturerdata\",41,\"!\",\"fffff\"],\"decoder\":[\"value_from_bit_data\",\"manufacturerdata\",168,20,true],\"post_proc\":[\"/\",-10]},\"soc\":{\"condition\":[\"manufacturerdata\",46,\"!\",\"fff\"],\"decoder\":[\"value_from_bit_data\",\"manufacturerdata\",188,10,false],\"post_proc\":[\"/\",10]},\"alarm_reason\":{\"decoder\":[\"value_from_hex_data\",\"manufacturerdata\",28,4]}}}";
+/*R""""(
+{
+   "brand":"Victron Energy",
+   "model":"Battery Monitor/Smart Battery Sense/SmartShunt",
+   "model_id":"VICTSBS",
+   "tag":"0c48",
+   "condition":["manufacturerdata", "=", 50, "index", 0, "e10211", "&", "manufacturerdata", "index", 12, "02ffff"],
+   "properties":{
+      "ttg":{
+         "condition":["manufacturerdata", 20, "!", "ffff"],
+         "decoder":["value_from_bit_data", "manufacturerdata", 80, 16, false]
+      },
+      "volt":{
+         "decoder":["value_from_bit_data", "manufacturerdata", 96, 16, true],
+         "post_proc":["/", 100]
+      },
+      "volt_aux":{
+         "condition":["manufacturerdata", 37, "bit", 0, 0, "&", "manufacturerdata", 37, "bit", 1, 0],
+         "decoder":["value_from_bit_data", "manufacturerdata", 128, 16, true],
+         "post_proc":["/", 100]
+      },
+      "volt_mid":{
+         "condition":["manufacturerdata", 37, "bit", 0, 1, "&", "manufacturerdata", 37, "bit", 1, 0],
+         "decoder":["value_from_bit_data", "manufacturerdata", 128, 16, true],
+         "post_proc":["/", 100]
+      },
+      "tempc":{
+         "condition":["manufacturerdata", 37, "bit", 0, 0, "&", "manufacturerdata", 37, "bit", 1, 1],
+         "decoder":["value_from_bit_data", "manufacturerdata", 128, 16, true],
+         "post_proc":["-", 27315, "/", 100]
+      },
+      "current":{
+         "condition":["manufacturerdata", 38, "!", "ff"],
+         "decoder":["value_from_bit_data", "manufacturerdata", 146, 22, true],
+         "post_proc":["/", 1000]
+      },
+      "consumed_ah":{
+         "condition":["manufacturerdata", 41, "!", "fffff"],
+         "decoder":["value_from_bit_data", "manufacturerdata", 168, 20, true],
+         "post_proc":["/", -10]
+      },
+      "soc":{
+         "condition":["manufacturerdata", 46, "!", "fff"],
+         "decoder":["value_from_bit_data", "manufacturerdata", 188, 10, false],
+         "post_proc":["/", 10]
+      },
+      "alarm_reason":{
+        "decoder":["value_from_hex_data", "manufacturerdata", 28, 4]
+      }
+   }
+})"""";*/
+
+const char* _VICTSBS_json_props = "{\"properties\":{\"ttg\":{\"unit\":\"min\",\"name\":\"duration\"},\"volt\":{\"unit\":\"V\",\"name\":\"voltage\"},\"volt_aux\":{\"unit\":\"V\",\"name\":\"voltage\"},\"volt_mid\":{\"unit\":\"V\",\"name\":\"voltage\"},\"tempc\":{\"unit\":\"°C\",\"name\":\"temperature\"},\"current\":{\"unit\":\"A\",\"name\":\"current\"},\"consumed_ah\":{\"unit\":\"Ah\",\"name\":\"consumed ampere hours\"},\"soc\":{\"unit\":\"%\",\"name\":\"state of charge\"},\"alarm_reason\":{\"unit\":\"int\",\"name\":\"alarm reason\"}}}";
+/*R""""(
+{
+   "properties":{
+      "ttg":{
+         "unit":"min",
+         "name":"duration"
+      },
+      "volt": {
+         "unit": "V",
+         "name": "voltage"
+      },
+      "volt_aux":{
+         "unit":"V",
+         "name":"voltage"
+      },
+      "volt_mid":{
+         "unit":"V",
+         "name":"voltage"
+      },
+      "tempc":{
+         "unit":"°C",
+         "name":"temperature"
+      },
+      "current":{
+         "unit":"A",
+         "name":"current"
+      },
+      "consumed_ah":{
+         "unit":"Ah",
+         "name":"consumed ampere hours"
+      },
+      "soc":{
+         "unit":"%",
+         "name":"state of charge"
+      },
+      "alarm_reason":{
+         "unit":"int",
+         "name":"alarm reason"
+      }
+   }
+})"""";*/

{theengsdecoder-2.3.0 → theengsdecoder-2.4.0}/src/devices/VICTRON_SCC_json.h

@@ -1,10 +1,10 @@
-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]}}}";
+const char* _VICTSCC_json = "{\"brand\":\"Victron Energy\",\"model\":\"Solar Charge Controller\",\"model_id\":\"VICTSCC\",\"tag\":\"0c48\",\"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",
+   "tag":"0c48",
    "condition":["manufacturerdata", "=", 44, "index", 0, "e10211", "&", "manufacturerdata", "index", 12, "01ffff"],
    "properties":{
       "device_state":{