added function to check for charging state of system

Author: BumSan

tests/test_wallbox_proxy.py

@@ -361,3 +361,24 @@ def test_is_pv_charge_activation_allowed(setup_wallboxes_off_state, setup_config
     assert wbprox.is_pv_charge_activation_allowed(wallbox[0]) == wb1_result
     assert wbprox.is_pv_charge_activation_allowed(wallbox[1]) == wb2_result
 
+
+@pytest.mark.activate
+@pytest.mark.parametrize(
+    "pv_charge_on, grid_charge_on, result",
+    [
+        (True, False, True)
+        , (True, True, True)
+        , (False, True, True)
+        , (False, False, False)
+    ])
+def test_is_charging_active(setup_wallboxes_off_state, setup_config, pv_charge_on, grid_charge_on, result):
+
+    wallbox = setup_wallboxes_off_state
+    wbprox = WallboxProxy(setup_config)
+
+    wallbox[0].pv_charge_active = pv_charge_on
+    wallbox[0].grid_charge_active = grid_charge_on
+    wallbox[1].pv_charge_active = pv_charge_on
+    wallbox[1].grid_charge_active = grid_charge_on
+
+    assert wbprox.is_charging_active(wallbox) == result

wallbox_proxy.py

@@ -99,8 +99,7 @@ def activate_pv_charge(self, wallbox_connection: ModbusRTUHeidelbergWB, wallbox:
                     else:  # we do not have enough power. Check if we can deactivate this WB
                         if self.is_pv_charge_deactivation_allowed(wb):
                             used_current = 0
-                            # not 0 but stay below min to keep car charge ready (not accounted to current budget)
-                            self.set_current_for_wallbox(wallbox_connection, wb, self.cfg.WB_MIN_CURRENT-1)
+                            self.set_current_for_wallbox(wallbox_connection, wb, used_current)
                             self.deactivate_pv_charge_for_wallbox(wb)
                             logging.warning('Charge deactivation for Wallbox ID %s', wb.slave_id)
                         else:  # not allowed, so reduce it to min value for now and try again later
@@ -177,3 +176,9 @@ def deactivate_pv_charge(self, wallbox_connection: ModbusRTUHeidelbergWB, wallbo
                 wallbox_connection.set_max_current(wb.slave_id, 0)
                 wb.pv_charge_active = False
                 wb.last_charge_deactivation = datetime.datetime.now()
+
+    def is_charging_active(self, wallbox: List[WBSystemState]) -> bool:
+        for wb in wallbox:
+            if wb.pv_charge_active or wb.grid_charge_active:
+                return True
+        return False