solve stop button issue

Author: OSkrk

evcc/ev_gui.py

@@ -699,7 +699,6 @@ def stop_ev(self) -> None:
         self.stop_button.setEnabled(False)
         self.start_button.setEnabled(True)
         self.controller.stop()
-        time.sleep(2) # time to finish the sequence before stopping the GUI
         self.start_button.clicked.connect(self.reset_check_boxes)
 
 

evcc/ev_session.py

@@ -128,3 +128,4 @@ class EVSessionParameters(SessionParameters):
     charging: bool = False
     stop_session: bool = False
     processing: bool = False
+    request_type: str = 'SAP'

evcc/tcp_client.py

@@ -74,14 +74,16 @@ def connection_made(self, transport: transports.BaseTransport) -> None:
     def data_received(self, data: bytes) -> None:
         addr = self.transport.get_extra_info('peername')
         logger.info("Received response from %s.", addr)
-        if self.session.state == "WaitForSupportedAppProtocolRes":
+        if self.session.session_parameters.request_type.lower() == "sap":
             packet = SupportedAppMessage(data)
-        elif "Dc" in self.session.state:
+        elif "dc" in self.session.session_parameters.request_type.lower():
             packet = EXIDCMessage(data)
         else:
             packet = EXIMessage(data)
         self.process_incoming_message(packet)
 
+
+
     def eof_received(self) -> Optional[bool]:
         logger.info('Received EOF.')
         if self.transport.can_write_eof():
@@ -103,7 +105,14 @@ def process_incoming_message(self, v2gtp_message: V2GTPMessage) -> None:
         :return:
         """
         if self.message_handler.is_valid(v2gtp_message):
-            payload = v2gtp_message.payload.getfieldval("payloadContent")
+            try:
+                payload = v2gtp_message.payload.getfieldval("payloadContent")
+            except AttributeError as ex:
+                template = "An exception of type {0} occurred. Arguments:\n{1!r}"
+                message = template.format(type(ex).__name__, ex.args)
+                logger.error(message + '\n v2gtp_message has no field payloadContent, incorrect payload')
+                raise
+
             message_type = v2gtp_message.get_payload_type()
             logger.info("Payload type: " + str(message_type))
             logger.debug("Received EXI msg to be decoded: " + hexdump.dump(payload, len(payload), ' '))
@@ -167,6 +176,7 @@ def process_reaction(self, reaction) -> None:
             self.session.reset_sequence_timer()
             self.session.message_timer.start()
             self.send(xml_string, message, request)
+            self.session.session_parameters.request_type = reaction.msg_type
             self.session.save_session_data(reaction.extra_data)
             self.session.next_state()