improve error handling internal cp

Author: LKuemmel

packages/modules/chargepoints/external_openwb/chargepoint_module.py

@@ -115,7 +115,10 @@ def on_message(client, userdata, message):
                         elif received_topics[f"{topic_prefix}fault_state"] == 1:
                             self.fault_state.warning(received_topics[f"{topic_prefix}fault_str"])
                     except KeyError:
-                        raise KeyError("Es wurden nicht alle notwendigen Daten empfangen.")
+                        if received_topics[f"{topic_prefix}fault_state"] == 2:
+                            self.fault_state.error(received_topics[f"{topic_prefix}fault_str"])
+                        else:
+                            raise KeyError("Es wurden nicht alle notwendigen Daten empfangen.")
                 else:
                     self.fault_state.warning(f"Keine MQTT-Daten für Ladepunkt {self.config.name} empfangen. Noch keine "
                                              "Daten nach dem Start oder Ladepunkt nicht erreichbar.")

packages/modules/internal_chargepoint_handler/clients.py

@@ -45,16 +45,16 @@ def __init__(self,
 
     def _evse_factory(self, client: Union[ModbusSerialClient_, ModbusTcpClient_], evse_ids: List[int]) -> evse.Evse:
         for modbus_id in evse_ids:
-            evse_client = evse.Evse(modbus_id, client)
-            with client:
-                try:
+            try:
+                evse_client = evse.Evse(modbus_id, client)
+                with client:
                     if evse_client.get_firmware_version() > EVSE_MIN_FIRMWARE:
                         log.debug(client)
                         with ModifyLoglevelContext(log, logging.DEBUG):
                             log.debug("Modbus-ID der EVSE an LP"+str(self.local_charge_point_num)+": "+str(modbus_id))
                         return evse_client
-                except Exception:
-                    pass
+            except Exception:
+                pass
         else:
             return None