Merge branch 'main' into dependabot/pip/dot-github/workflows/pyupgrade-3.15.1

Author: lbbrhzn

custom_components/ocpp/api.py

@@ -478,12 +478,23 @@ async def handle_set_charge_rate(call):
 
             accepted_measurands = ",".join(accepted_measurands)
 
-            _LOGGER.debug(f"'{self.id}' allowed measurands '{accepted_measurands}'")
+            if len(accepted_measurands) > 0:
+                _LOGGER.debug(f"'{self.id}' allowed measurands '{accepted_measurands}'")
+                await self.configure(
+                    ckey.meter_values_sampled_data.value,
+                    accepted_measurands,
+                )
+            else:
+                _LOGGER.debug(f"'{self.id}' measurands not configurable by OCPP")
+                resp = await self.get_configuration(
+                    ckey.meter_values_sampled_data.value
+                )
+                accepted_measurands = resp
+                _LOGGER.debug(f"'{self.id}' allowed measurands '{accepted_measurands}'")
 
-            await self.configure(
-                ckey.meter_values_sampled_data.value,
-                accepted_measurands,
-            )
+            updated_entry = {**self.entry.data}
+            updated_entry[CONF_MONITORED_VARIABLES] = accepted_measurands
+            self.hass.config_entries.async_update_entry(self.entry, data=updated_entry)
 
             await self.configure(
                 ckey.meter_value_sample_interval.value,