Update victron_mqtt to 2025.7.33 and merge topics (#51)

Co-authored-by: tomer-w <57483589+tomer-w@users.noreply.github.com>

Author: github-actions[bot]

custom_components/victron_mqtt/manifest.json

@@ -11,13 +11,13 @@
   "iot_class": "local_push",
   "issue_tracker": "https://github.com/tomer-w/ha-victron-mqtt/issues",
   "requirements": [
-    "victron_mqtt==2025.7.31"
+    "victron_mqtt==2025.7.33"
   ],
   "ssdp": [
     {
       "manufacturer": "Victron Energy",
       "X_MqttOnLan": "1"
     }
   ],
-  "version": "2025.7.22"
+  "version": "2025.7.23"
 }

custom_components/victron_mqtt/translations/en.json

@@ -155,6 +155,9 @@
       "battery_time_to_go": {
         "name": "Battery time to go"
       },
+      "charge_mode": {
+        "name": "Battery charge mode"
+      },
       "inverter_state": {
         "name": "Inverter state"
       },
@@ -304,6 +307,15 @@
       },
       "alternator_input_power": {
         "name": "Input Power"
+      },
+      "dcload_voltage": {
+        "name": "DC load voltage"
+      },
+      "dcload_current": {
+        "name": "DC load current"
+      },
+      "dcload_power": {
+        "name": "DC load power"
       }
     },
     "switch": {
@@ -349,8 +361,8 @@
       "temperature_scale": {
         "name": "Temperature scale factor"
       },
-      "cgwacs_ac_power_set_point": {
-        "name": "CGwacs AC Power Setpoint"
+      "system_ac_power_set_point": {
+        "name": "AC Power Setpoint"
       },
       "switch_output_dimming": {
         "name": "Switch {output} Dimming"

victron_mqtt.json

@@ -762,6 +762,24 @@
       "is_adjustable_suffix": null,
       "key_values": {}
     },
+    {
+      "topic": "N/+/battery/+/Info/ChargeMode",
+      "message_type": "MetricKind.SENSOR",
+      "short_id": "charge_mode",
+      "name": "Battery charge mode",
+      "unit_of_measurement": null,
+      "metric_type": "MetricType.NONE",
+      "metric_nature": "MetricNature.NONE",
+      "device_type": "Battery",
+      "value_type": "ValueType.STRING",
+      "precision": null,
+      "enum": null,
+      "min_max_range": "RangeType.STATIC",
+      "min": null,
+      "max": null,
+      "is_adjustable_suffix": null,
+      "key_values": {}
+    },
     {
       "topic": "N/+/vebus/+/Mode",
       "message_type": "MetricKind.SELECT",
@@ -1827,12 +1845,12 @@
     {
       "topic": "N/+/settings/+/Settings/CGwacs/AcPowerSetPoint",
       "message_type": "MetricKind.NUMBER",
-      "short_id": "cgwacs_ac_power_set_point",
-      "name": "CGwacs AC Power Setpoint",
+      "short_id": "system_ac_power_set_point",
+      "name": "AC Power Setpoint",
       "unit_of_measurement": "W",
       "metric_type": "MetricType.POWER",
       "metric_nature": "MetricNature.INSTANTANEOUS",
-      "device_type": "Carlo Gavazzi Wired AC Sensors",
+      "device_type": "System",
       "value_type": "ValueType.INT",
       "precision": null,
       "enum": null,
@@ -1842,6 +1860,60 @@
       "is_adjustable_suffix": null,
       "key_values": {}
     },
+    {
+      "topic": "N/+/dcload/+/Dc/0/Voltage",
+      "message_type": "MetricKind.SENSOR",
+      "short_id": "dcload_voltage",
+      "name": "DC load voltage",
+      "unit_of_measurement": "V",
+      "metric_type": "MetricType.VOLTAGE",
+      "metric_nature": "MetricNature.INSTANTANEOUS",
+      "device_type": "DC Load",
+      "value_type": "ValueType.FLOAT",
+      "precision": 2,
+      "enum": null,
+      "min_max_range": "RangeType.STATIC",
+      "min": null,
+      "max": null,
+      "is_adjustable_suffix": null,
+      "key_values": {}
+    },
+    {
+      "topic": "N/+/dcload/+/Dc/0/Current",
+      "message_type": "MetricKind.SENSOR",
+      "short_id": "dcload_current",
+      "name": "DC load current",
+      "unit_of_measurement": "A",
+      "metric_type": "MetricType.CURRENT",
+      "metric_nature": "MetricNature.INSTANTANEOUS",
+      "device_type": "DC Load",
+      "value_type": "ValueType.FLOAT",
+      "precision": 1,
+      "enum": null,
+      "min_max_range": "RangeType.STATIC",
+      "min": null,
+      "max": null,
+      "is_adjustable_suffix": null,
+      "key_values": {}
+    },
+    {
+      "topic": "N/+/dcload/+/Dc/0/Power",
+      "message_type": "MetricKind.SENSOR",
+      "short_id": "dcload_power",
+      "name": "DC load power",
+      "unit_of_measurement": "W",
+      "metric_type": "MetricType.POWER",
+      "metric_nature": "MetricNature.INSTANTANEOUS",
+      "device_type": "DC Load",
+      "value_type": "ValueType.FLOAT",
+      "precision": 1,
+      "enum": null,
+      "min_max_range": "RangeType.STATIC",
+      "min": null,
+      "max": null,
+      "is_adjustable_suffix": null,
+      "key_values": {}
+    },
     {
       "topic": "N/+/switch/+/SwitchableOutput/output_{output(1-4)}/State",
       "message_type": "MetricKind.SWITCH",
@@ -1953,6 +2025,11 @@
           "name": "Carlo Gavazzi Wired AC Sensors",
           "value": "CGwacs"
         },
+        {
+          "id": "DC_LOAD",
+          "name": "DC Load",
+          "value": "dcload"
+        },
         {
           "id": "ALTERNATOR",
           "name": "Charger (Orion/Alternator)",