Merge branch 'main' of https://github.com/tomer-w/ha-victron-mqtt

Author: tomer-w

custom_components/victron_mqtt/_vendor/__init__.py

@@ -1,3 +1,3 @@
 """Vendored third-party packages."""
 
-VICTRON_MQTT_VERSION = "2026.5.7"
+VICTRON_MQTT_VERSION = "2026.5.11"

custom_components/victron_mqtt/_vendor/victron_mqtt/__init__.py

@@ -31,6 +31,7 @@
     GeneratorRunningByConditionCode,
     GenericAlarmEnum,
     GenericOnOff,
+    GenericOnOffInverted,
     InverterMode,
     MppOperationMode,
     PhoenixInverterMode,
@@ -91,6 +92,7 @@
     "GeneratorRunningByConditionCode",
     "GenericAlarmEnum",
     "GenericOnOff",
+    "GenericOnOffInverted",
     "GpsLocation",
     "Hub",
     "InvalidInstallationIdError",

custom_components/victron_mqtt/_vendor/victron_mqtt/_unwrappers.py

@@ -17,6 +17,7 @@ def unwrap_bool(json_str: str) -> bool | None:
     except (json.JSONDecodeError, KeyError, ValueError, TypeError):
         return None
 
+
 def unwrap_int(json_str: str) -> int | None:
     """Unwrap an integer value from a JSON string."""
     try:
@@ -27,6 +28,7 @@ def unwrap_int(json_str: str) -> int | None:
     except (json.JSONDecodeError, KeyError, ValueError, TypeError):
         return None
 
+
 def unwrap_int_default_0(json_str: str) -> int:
     """Unwrap an integer value from a JSON string, defaulting to 0."""
     try:
@@ -37,6 +39,7 @@ def unwrap_int_default_0(json_str: str) -> int:
     except (json.JSONDecodeError, KeyError, ValueError, TypeError):
         return 0
 
+
 def unwrap_int_seconds_to_hours(json_str: str, precision: int | None) -> float | None:
     """Convert seconds to hours."""
     seconds = unwrap_int(json_str)
@@ -45,6 +48,7 @@ def unwrap_int_seconds_to_hours(json_str: str, precision: int | None) -> float |
     hours = seconds / 3600
     return hours if precision is None else round(hours, precision)
 
+
 def unwrap_int_seconds_to_minutes(json_str: str, precision: int | None) -> float | None:
     """Convert seconds to minutes."""
     seconds = unwrap_int(json_str)
@@ -53,6 +57,7 @@ def unwrap_int_seconds_to_minutes(json_str: str, precision: int | None) -> float
     minutes = seconds / 60
     return minutes if precision is None else round(minutes, precision)
 
+
 def unwrap_float(json_str: str, precision: int | None, json_value: str = "value") -> float | None:
     """Unwrap a float value from a JSON string."""
     try:
@@ -64,6 +69,7 @@ def unwrap_float(json_str: str, precision: int | None, json_value: str = "value"
     except (json.JSONDecodeError, KeyError, ValueError, TypeError):
         return None
 
+
 def unwrap_float_m3_to_liters(json_str: str, precision: int | None) -> float | None:
     """Convert cubic meters to liters."""
     value = unwrap_float(json_str, None)
@@ -72,6 +78,7 @@ def unwrap_float_m3_to_liters(json_str: str, precision: int | None) -> float | N
     liters = value * 1000
     return liters if precision is None else round(liters, precision)
 
+
 def unwrap_string(json_str: str) -> str | None:
     """Unwrap a string value from a JSON string."""
     try:
@@ -92,6 +99,7 @@ def unwrap_enum(json_str: str, enum: type[VictronEnum]) -> VictronEnum | None:
     val = data["value"]
     return enum.from_code(val) if val is not None else None
 
+
 def unwrap_bitmask(json_str: str, enum: type[VictronEnum]) -> str | None:
     """Unwrap a bitmask value from a JSON string."""
     try:
@@ -101,10 +109,11 @@ def unwrap_bitmask(json_str: str, enum: type[VictronEnum]) -> str | None:
     val = data["value"]
     if val is None:
         return None
-    vals = [2**idx for idx,bit in enumerate(bin(val)[:1:-1]) if int(bit)] if int(val)>0 else [0]
+    vals = [2**idx for idx, bit in enumerate(bin(val)[:1:-1]) if int(bit)] if int(val) > 0 else [0]
     enums = [enum.from_code(v) for v in vals]
     return str.join(BITMASK_SEPARATOR, [e.string for e in enums if e is not None])
 
+
 def unwrap_epoch(json_str: str) -> datetime | None:
     """Unwrap a timestamp value from a JSON string."""
     try:
@@ -116,13 +125,17 @@ def unwrap_epoch(json_str: str) -> datetime | None:
     except (json.JSONDecodeError, KeyError, ValueError, TypeError):
         return None
 
+
 def wrap_enum(enum_val: VictronEnum | str, enum_expected: type[VictronEnum]) -> str:
     """Wrap an Enum value into a JSON string with a 'value' key."""
     if isinstance(enum_val, VictronEnum):
         return json.dumps({"value": enum_val.code})
     return json.dumps({"value": enum_expected.from_id_or_string(enum_val).code})
 
-def wrap_bitmask(bitmask_val: VictronEnum | str | Iterable[VictronEnum] | Iterable[str], enum_expected: type[VictronEnum]) -> str:
+
+def wrap_bitmask(
+    bitmask_val: VictronEnum | str | Iterable[VictronEnum] | Iterable[str], enum_expected: type[VictronEnum]
+) -> str:
     """Wrap an bitmask value into a JSON string with a 'value' key."""
     if isinstance(bitmask_val, VictronEnum):
         bitmask_val = [bitmask_val]
@@ -137,18 +150,22 @@ def wrap_bitmask(bitmask_val: VictronEnum | str | Iterable[VictronEnum] | Iterab
             val += int(enum_expected.from_id_or_string(v).code)
     return json.dumps({"value": val})
 
+
 def wrap_int(value: int | None) -> str:
     """Wrap an integer value into a JSON string with a 'value' key."""
     return json.dumps({"value": value})
 
+
 def wrap_int_hours_to_seconds(value: int | None) -> str:
     """Wrap an integer value into a JSON string with a 'value' key."""
     return json.dumps({"value": value * 3600 if value is not None else None})
 
+
 def wrap_int_minutes_to_seconds(value: int | None) -> str:
     """Wrap an integer value into a JSON string with a 'value' key."""
     return json.dumps({"value": value * 60 if value is not None else None})
 
+
 def wrap_int_default_0(value: int | None) -> str:
     """Wrap an integer value into a JSON string with a 'value' key, defaulting to 0 if None."""
     return json.dumps({"value": value if value is not None else 0})
@@ -163,11 +180,12 @@ def wrap_string(value: str | None) -> str:
     """Wrap a string value into a JSON string with a 'value' key."""
     return json.dumps({"value": value})
 
+
 def wrap_epoch(value: datetime | None) -> str:
     """Wrap a datetime value into a JSON string with a 'value' key in the format of an epoch timestamp."""
     if value is None:
         return json.dumps({"value": None})
-    return json.dumps({"value": datetime.timestamp(value) })
+    return json.dumps({"value": datetime.timestamp(value)})
 
 
 VALUE_TYPE_UNWRAPPER = {
@@ -180,7 +198,7 @@ def wrap_epoch(value: datetime | None) -> str:
     ValueType.EPOCH: unwrap_epoch,
     ValueType.INT_SECONDS_TO_HOURS: unwrap_int_seconds_to_hours,
     ValueType.INT_SECONDS_TO_MINUTES: unwrap_int_seconds_to_minutes,
-    ValueType.FLOAT_M3_TO_LITERS: unwrap_float_m3_to_liters
+    ValueType.FLOAT_M3_TO_LITERS: unwrap_float_m3_to_liters,
 }
 
 VALUE_TYPE_WRAPPER = {
@@ -192,5 +210,5 @@ def wrap_epoch(value: datetime | None) -> str:
     ValueType.BITMASK: wrap_bitmask,
     ValueType.EPOCH: wrap_epoch,
     ValueType.INT_SECONDS_TO_HOURS: wrap_int_hours_to_seconds,
-    ValueType.INT_SECONDS_TO_MINUTES: wrap_int_minutes_to_seconds
+    ValueType.INT_SECONDS_TO_MINUTES: wrap_int_minutes_to_seconds,
 }

custom_components/victron_mqtt/_vendor/victron_mqtt/_victron_enums.py

@@ -60,6 +60,13 @@ class GenericOnOff(VictronEnum):
     ON = (1, "on", "On")
 
 
+class GenericOnOffInverted(VictronEnum):
+    """Inverted On/Off Enum (0=On, 1=Off)"""
+
+    ON = (0, "on", "On")
+    OFF = (1, "off", "Off")
+
+
 class PreferRenewableEnergyEnum(VictronEnum):
     """Prefer Renewable Energy state.
 

custom_components/victron_mqtt/_vendor/victron_mqtt/_victron_topics.py

@@ -30,6 +30,7 @@
     GeneratorRunningByConditionCode,
     GenericAlarmEnum,
     GenericOnOff,
+    GenericOnOffInverted,
     InverterMode,
     MppOperationMode,
     PhoenixInverterMode,
@@ -1323,6 +1324,14 @@
         metric_type=MetricType.VOLTAGE,
     ),
     # Hub4 topics
+    TopicDescriptor(
+        topic="N/{installation_id}/hub4/{device_id}/Overrides/ForceCharge",
+        message_type=MetricKind.SWITCH,
+        short_id="hub4_force_charge",
+        name="Force charge",
+        value_type=ValueType.ENUM,
+        enum=GenericOnOff,
+    ),
     TopicDescriptor(
         topic="N/{installation_id}/hub4/{device_id}/Overrides/Setpoint",
         message_type=MetricKind.NUMBER,
@@ -2062,7 +2071,7 @@
         short_id="system_settings_prevent_ac_feedin",
         name="AC-coupled PV - feed in excess",
         value_type=ValueType.ENUM,
-        enum=GenericOnOff,
+        enum=GenericOnOffInverted,
     ),
     # Dynamic ESS settings topics
     TopicDescriptor(

custom_components/victron_mqtt/translations/en.json

@@ -127,6 +127,13 @@
           "on": "On"
         }
       },
+      "hub4_force_charge": {
+        "name": "Force charge",
+        "state": {
+          "off": "Off",
+          "on": "On"
+        }
+      },
       "inverter_alarm_high_temperature": {
         "name": "High temperature alarm",
         "state": {
@@ -274,14 +281,14 @@
         }
       },
       "system_settings_overvoltage_feedin": {
-        "name": "ESS feed-in excess solar charger power",
+        "name": "DC-coupled PV - feed in excess",
         "state": {
           "off": "Off",
           "on": "On"
         }
       },
       "system_settings_prevent_ac_feedin": {
-        "name": "ESS PV inverter zero feed-in",
+        "name": "AC-coupled PV - feed in excess",
         "state": {
           "off": "Off",
           "on": "On"
@@ -1355,8 +1362,7 @@
         "name": "Installation power"
       },
       "meteo_irradiance": {
-        "name": "Irradiance",
-        "unit_of_measurement": "W/m²"
+        "name": "Irradiance"
       },
       "meteo_time_since_last_sun": {
         "name": "Time since last sun"
@@ -1892,7 +1898,7 @@
         }
       },
       "system_ess_batterylife_state_sensor": {
-        "name": "ESS BatteryLife state (detailed)",
+        "name": "ESS BatteryLife state",
         "state": {
           "keep_batteries_charged": "'Keep batteries charged' mode enabled",
           "recharge": "Recharge, SoC dropped 5% or more below minimum SoC",
@@ -2405,6 +2411,13 @@
           "on": "On"
         }
       },
+      "hub4_force_charge": {
+        "name": "Force charge",
+        "state": {
+          "off": "Off",
+          "on": "On"
+        }
+      },
       "multi_disable_charge": {
         "name": "ESS disable charge",
         "state": {
@@ -2468,14 +2481,14 @@
         }
       },
       "system_settings_overvoltage_feedin": {
-        "name": "ESS feed-in excess solar charger power",
+        "name": "DC-coupled PV - feed in excess",
         "state": {
           "off": "Off",
           "on": "On"
         }
       },
       "system_settings_prevent_ac_feedin": {
-        "name": "ESS PV inverter zero feed-in",
+        "name": "AC-coupled PV - feed in excess",
         "state": {
           "off": "Off",
           "on": "On"