exit after displaying an error message since app will be in inconsistent state

Author: bri3d

VW_Flash_GUI.py

@@ -48,11 +48,7 @@
 logger = logging.getLogger("VWFlash")
 
 
-def handle_exception(exc_type, exc_value, exc_traceback):
-    if issubclass(exc_type, KeyboardInterrupt):
-        sys.__excepthook__(exc_type, exc_value, exc_traceback)
-        return
-    logger.error("Uncaught exception", exc_info=(exc_type, exc_value, exc_traceback))
+def show_error_dialog(exc_type, exc_value):
     dlg = wx.MessageDialog(
         None,
         f"A Python exception occured: {exc_type}, {exc_value}. Please check the log file.",
@@ -63,6 +59,15 @@ def handle_exception(exc_type, exc_value, exc_traceback):
     dlg.Destroy()
 
 
+def handle_exception(exc_type, exc_value, exc_traceback):
+    if issubclass(exc_type, KeyboardInterrupt):
+        sys.__excepthook__(exc_type, exc_value, exc_traceback)
+        return
+    logger.error("Uncaught exception", exc_info=(exc_type, exc_value, exc_traceback))
+    wx.CallAfter(show_error_dialog, exc_type, exc_value)
+    wx.CallAfter(wx.Exit)
+
+
 def handle_threaded_exception(args, /):
     (exc_type, exc_value, exc_traceback, thread) = args
     handle_exception(exc_type, exc_value, exc_traceback)

lib/constants.py

@@ -241,8 +241,9 @@ def internal_path(*path_parts) -> str:
 
 testdata = {
     b"\x10\x03": b"\x50\x03\x12\x23\x34\x45",
-    b"\x22\xf1\x90": b"\x62\xf1\x903VW12345678912345",
     b"\x10\x4f": b"\x50\x4f\x12\x23\x34\x45",
+    b"\x10\x02": b"\x50\x02\x12\x23\x34\x45",
+    b"\x22\xf1\x90": b"\x62\xf1\x903VW12345678912345",
     b"\x27\x03": b"\x67\x03\x12\x23\x34\x45",
     b"\x27\x04\x12\x23\xa1\x88": b"\x67\x04",
     b"\x2c\x03\xf2\x00": b"\x2c\x03\xf2\x00",
@@ -263,6 +264,9 @@ def internal_path(*path_parts) -> str:
     b"\x22\xf1\x7c": b"\x62\xf1\x7c\x5a\x53\x43\x2d\x38\x36\x34\x31\x35\x2e\x30\x37\x2e\x31\x38\x37\x38\x34\x33\x30\x33\x32\x30",
     b"\x22\xf1\xa5": b"\x62\xf1\xa5\x00\x00\x03\x78\x1f\xd7",
     b"\x22\x04\x05": b"\x62\x04\x05\x00",
+    b"\x22\x06\x00": bytes.fromhex("620600091900122426000e3004"),
+    b"\x31\x01\x02\x03": b"\x71\x01\x02\x03",
+    b"\x3e\x00": b"\x7e\x00",
     b"\x04": b"\x04",
 }
 

lib/flash_uds.py

@@ -330,7 +330,7 @@ def __len__(self):
     if callback:
         callback(
             flasher_step="SETUP",
-            flasher_status="In Flasher util ",
+            flasher_status="Starting...",
             flasher_progress=100,
         )
     else:
@@ -368,7 +368,9 @@ def send_obd(data):
 
     if callback:
         callback(
-            flasher_step="SETUP", flasher_status="Clearing DTCs ", flasher_progress=100
+            flasher_step="SETUP",
+            flasher_status="Clearing DTCs...",
+            flasher_progress=100,
         )
 
     detailedLogger.info("Sending 0x4 Clear Emissions DTCs over OBD-2")
@@ -409,7 +411,7 @@ def volkswagen_security_algo(level: int, seed: bytes, params=None) -> bytes:
 
             if callback:
                 callback(
-                    flasher_step="SETUP",
+                    flasher_step="CONNECTING",
                     flasher_status="Entering extended diagnostic session... ",
                     flasher_progress=0,
                 )
@@ -426,7 +428,7 @@ def volkswagen_security_algo(level: int, seed: bytes, params=None) -> bytes:
                 callback(
                     flasher_step="SETUP",
                     flasher_status="Connected to vehicle with VIN: " + vin,
-                    flasher_progress=100,
+                    flasher_progress=20,
                 )
 
             detailedLogger.info(
@@ -443,7 +445,7 @@ def volkswagen_security_algo(level: int, seed: bytes, params=None) -> bytes:
                 callback(
                     flasher_step="SETUP",
                     flasher_status="Checking programming precondition",
-                    flasher_progress=100,
+                    flasher_progress=40,
                 )
 
             detailedLogger.info("Checking programming precondition, routine 0x0203...")
@@ -456,7 +458,7 @@ def volkswagen_security_algo(level: int, seed: bytes, params=None) -> bytes:
                 callback(
                     flasher_step="SETUP",
                     flasher_status="Upgrading to programming session...",
-                    flasher_progress=100,
+                    flasher_progress=60,
                 )
 
             detailedLogger.info("Upgrading to programming session...")
@@ -488,7 +490,7 @@ def switchpatch_programming_payload(payload):
                 callback(
                     flasher_step="SETUP",
                     flasher_status="Performing Seed/Key authentication...",
-                    flasher_progress=100,
+                    flasher_progress=80,
                 )
 
             # Perform Seed/Key Security Level 17. This will call volkswagen_security_algo above to perform the Seed/Key auth against the SA2 script.
@@ -501,7 +503,7 @@ def switchpatch_programming_payload(payload):
                 callback(
                     flasher_step="SETUP",
                     flasher_status="Writing Workshop data...",
-                    flasher_progress=100,
+                    flasher_progress=50,
                 )
 
             detailedLogger.info("Writing flash tool log to LocalIdentifier 0xF15A...")
@@ -536,7 +538,7 @@ def switchpatch_programming_payload(payload):
 
             if callback:
                 callback(
-                    flasher_step="SETUP",
+                    flasher_step="PROGRAMMING",
                     flasher_status="Verifying reprogramming dependencies...",
                     flasher_progress=100,
                 )
@@ -547,32 +549,33 @@ def switchpatch_programming_payload(payload):
 
             client.tester_present()
 
-            # If a periodic task was patched or altered as part of the process, let's give it a few seconds to run
-            time.sleep(5)
             if callback:
                 callback(
-                    flasher_step="SETUP",
+                    flasher_step="FINALIZING",
                     flasher_status="Finalizing...",
                     flasher_progress=100,
                 )
+            # If a periodic task was patched or altered as part of the process, let's give it a few seconds to run
+            time.sleep(5)
 
             detailedLogger.info("Rebooting ECU...")
             # Reboot
-            client.ecu_reset(services.ECUReset.ResetType.hardReset)
-
-            conn.close()
-
-            detailedLogger.info("Sending 0x4 Clear Emissions DTCs over OBD-2")
-            send_obd(bytes([0x4]))
-
-            if callback:
-                callback(
-                    flasher_step="SETUP",
-                    flasher_status="DONE!...",
-                    flasher_progress=100,
-                )
+            try:
+                client.ecu_reset(services.ECUReset.ResetType.hardReset)
+
+                conn.close()
+
+                detailedLogger.info("Sending 0x4 Clear Emissions DTCs over OBD-2")
+                send_obd(bytes([0x4]))
+            finally:
+                if callback:
+                    callback(
+                        flasher_step="DONE",
+                        flasher_status="DONE!...",
+                        flasher_progress=100,
+                    )
 
-            detailedLogger.info("Done!")
+                detailedLogger.info("Done!")
         except exceptions.NegativeResponseException as e:
             logger.error(
                 'Server refused our request for service %s with code "%s" (0x%02x)'