Victron encrypted decoder consolidation (#677)

Consolidated the Victron encrypted decoders into one single decoder

Author: DigiH

src/decoder.h

@@ -174,13 +174,10 @@ class TheengsDecoder {
     SPHT,
     SERVICE_DATA,
     UT363BT,
-    VICTBSC_ENCR,
+    VICTRON_ENCR,
     VICTBSC,
-    VICTORIONXS_ENCR,
     VICTORIONXS,
-    VICTSBP_ENCR,
     VICTSBP,
-    VICTSBSBMSS_ENCR,
     VICTSBS,
     SE_RHT,
     SE_TEMP,

src/devices.h

@@ -120,13 +120,10 @@
 #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_SBSBMSS_ENCR_json.h"
 #include "devices/VICTRON_SBS_json.h"
 #include "devices/SE_RHT_json.h"
 #include "devices/SE_TEMP_json.h"
@@ -273,13 +270,10 @@ 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},
-    {_VICTSBSBMSS_ENCR_json, _VICTSBSBMSS_ENCR_json_props},
     {_VICTSBS_json, _VICTSBS_json_props},
     {_SE_RHT_json, _SE_RHT_json_props},
     {_SE_TEMP_json, _SE_TEMP_json_props},

src/devices/VICTRON_BSC_ENCR_json.h

@@ -1,4 +1,4 @@
-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,true],\"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 = "{\"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",
@@ -9,7 +9,7 @@ const char* _VICTSBS_json = "{\"brand\":\"Victron Energy\",\"model\":\"Smart Bat
    "properties":{
       "volt":{
         "condition":["manufacturerdata", 24, "!", "ffff"],
-        "decoder":["value_from_hex_data", "manufacturerdata", 24, 4, true, true],
+        "decoder":["value_from_hex_data", "manufacturerdata", 24, 4, true, false],
         "post_proc":["/", 100]
       },
       "tempc":{

src/devices/VICTRON_ORIONXS_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"
+      }
+   }
+})"""";*/