Fix max_current per connector bug. Remove ChargerSession sensors (used for debugging). Fix Charge Control naming when only one connector. More CodeRabbit suggestions.

Author: Jan Thunqvist

custom_components/ocpp/button.py

@@ -38,7 +38,7 @@ class OcppButtonDescription(ButtonEntityDescription):
     OcppButtonDescription(
         key="unlock",
         name="Unlock",
-        device_class=ButtonDeviceClass.UPDATE,
+        device_class=None,
         entity_category=EntityCategory.CONFIG,
         press_action=HAChargerServices.service_unlock.name,
         per_connector=True,

custom_components/ocpp/number.py

@@ -157,7 +157,6 @@ def __init__(
             )
         self._attr_native_value = self.entity_description.initial_value
         self._attr_should_poll = False
-        self._attr_available = True
 
     async def async_added_to_hass(self) -> None:
         """Handle entity which will be added."""
@@ -188,7 +187,7 @@ async def async_set_native_value(self, value):
         resp = await self.central_system.set_max_charge_rate_amps(
             self.cpid,
             num_value,
-            connector_id=0,
+            connector_id=self._op_connector_id,
         )
         if resp is True:
             self._attr_native_value = num_value

custom_components/ocpp/ocppv201.py

@@ -165,7 +165,8 @@ def _apply_status_notification(
     ):
         """Update per connector and evse aggregated."""
         if evse_id > len(self._connector_status):
-            self._connector_status += [[]] * (evse_id - len(self._connector_status))
+            needed = evse_id - len(self._connector_status)
+            self._connector_status.extend([[] for _ in range(needed)])
         if connector_id > len(self._connector_status[evse_id - 1]):
             self._connector_status[evse_id - 1] += [None] * (
                 connector_id - len(self._connector_status[evse_id - 1])
@@ -346,9 +347,18 @@ async def set_charge_rate(
         conn_id: int = 0,
         profile: dict | None = None,
     ):
-        """Set a charging profile with defined limit (OCPP 2.x)."""
+        """Set a charging profile with defined limit (OCPP 2.x).
+
+        - conn_id=0 (default) targets the Charging Station (evse_id=0).
+        - conn_id>0 targets the specific EVSE corresponding to the global connector index.
+        """
+
+        evse_target = 0
+        if conn_id and conn_id > 0:
+            with contextlib.suppress(Exception):
+                evse_target, _ = self._global_to_pair(int(conn_id))
         if profile is not None:
-            req = call.SetChargingProfile(0, profile)
+            req = call.SetChargingProfile(evse_target, profile)
             resp: call_result.SetChargingProfile = await self.call(req)
             if resp.status != ChargingProfileStatusEnumType.accepted:
                 raise HomeAssistantError(
@@ -394,7 +404,9 @@ async def set_charge_rate(
             "charging_schedule": [schedule],
         }
 
-        req: call.SetChargingProfile = call.SetChargingProfile(0, charging_profile)
+        req: call.SetChargingProfile = call.SetChargingProfile(
+            evse_target, charging_profile
+        )
         resp: call_result.SetChargingProfile = await self.call(req)
         if resp.status != ChargingProfileStatusEnumType.accepted:
             raise HomeAssistantError(
@@ -859,6 +871,7 @@ def on_transaction_event(
             if event_type == TransactionEventEnumType.ended.value:
                 self._metrics[(global_idx, csess.transaction_id.value)].value = ""
                 self._metrics[(global_idx, cstat.id_tag.value)].value = ""
+                self._tx_start_time.pop(global_idx, None)
 
         if not offline:
             self.hass.async_create_task(self.update(self.settings.cpid))

custom_components/ocpp/sensor.py

@@ -28,7 +28,7 @@
     ICON,
     Measurand,
 )
-from .enums import HAChargerDetails, HAChargerSession, HAChargerStatuses
+from .enums import HAChargerDetails, HAChargerStatuses
 
 
 @dataclass
@@ -50,10 +50,10 @@ async def async_setup_entry(hass, entry, async_add_devices):
 
         configured = [
             m.strip()
-            for m in cp_id_settings[CONF_MONITORED_VARIABLES].split(",")
+            for m in str(cp_id_settings.get(CONF_MONITORED_VARIABLES, "")).split(",")
             if m and m.strip()
         ]
-        measurands = list(set(configured + list(HAChargerSession)))
+        measurands = sorted(configured)
 
         CHARGER_ONLY = [
             HAChargerStatuses.status.value,

custom_components/ocpp/switch.py

@@ -121,16 +121,11 @@ def __init__(
         self._flatten_single = flatten_single
         self._state = self.entity_description.default_state
         parts = [SWITCH_DOMAIN, DOMAIN, cpid]
-        if self.connector_id:
+        if self.connector_id and not self._flatten_single:
             parts.append(f"conn{self.connector_id}")
         parts.append(description.key)
         self._attr_unique_id = ".".join(parts)
         self._attr_name = self.entity_description.name
-        if self.entity_description.per_connector and self.connector_id:
-            if self._flatten_single:
-                self._attr_name = (
-                    f"Connector {self.connector_id} {self.entity_description.name}"
-                )
         if self.connector_id and not self._flatten_single:
             self._attr_device_info = DeviceInfo(
                 identifiers={(DOMAIN, f"{cpid}-conn{self.connector_id}")},
@@ -174,18 +169,14 @@ def is_on(self) -> bool:
 
     async def async_turn_on(self, **kwargs):
         """Turn the switch on."""
-        target_conn = (
-            self.connector_id if self.entity_description.per_connector else None
-        )
+        target_conn = self.connector_id if self.entity_description.per_connector else 0
         self._state = await self.central_system.set_charger_state(
             self.cpid, self.entity_description.on_action, True, connector_id=target_conn
         )
 
     async def async_turn_off(self, **kwargs):
         """Turn the switch off."""
-        target_conn = (
-            self.connector_id if self.entity_description.per_connector else None
-        )
+        target_conn = self.connector_id if self.entity_description.per_connector else 0
         if self.entity_description.off_action is None:
             resp = True
         elif self.entity_description.off_action == self.entity_description.on_action:

scripts/develop

@@ -3,10 +3,10 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-# Create config dir if not present
-if [[ ! -d "${PWD}/config" ]]; then
-    mkdir -p "${PWD}/config"
-    /home/vscode/.local/ha-venv/bin/python -m homeassistant --config "${PWD}/config" --script ensure_config
+# Create/prepare config
+mkdir -p "${PWD}/config"
+if [[ ! -f "${PWD}/config/configuration.yaml" ]]; then
+  /home/vscode/.local/ha-venv/bin/python -m homeassistant --config "${PWD}/config" --script ensure_config
 fi
 
 # Ensure custom components dir exists
@@ -19,7 +19,11 @@ if [[ ! -d "$src" ]]; then
   echo "Missing integration sources at: $src" >&2
   exit 1
 fi
-ln -sfn "$src" "$dst"
+
+# Remove existing dir/symlink/file at destination
+if [[ -e "$dst" || -L "$dst" ]]; then
+  rm -rf -- "$dst"
+fi
 
 # Install debugpy if missing
 if ! /home/vscode/.local/ha-venv/bin/python -c 'import debugpy' >/dev/null 2>&1; then

tests/charge_point_test.py

@@ -28,11 +28,10 @@
 
 async def set_switch(hass: HomeAssistant, cpid: str, key: str, on: bool):
     """Toggle a switch."""
-    prefix = "_" if key == "availability" else "_connector_1_"
     await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_ON if on else SERVICE_TURN_OFF,
-        service_data={ATTR_ENTITY_ID: f"{SWITCH_DOMAIN}.{cpid}{prefix}{key}"},
+        service_data={ATTR_ENTITY_ID: f"{SWITCH_DOMAIN}.{cpid}_{key}"},
         blocking=True,
     )