before default_reset , after no_reset

Author: PaulZC

RTK_Firmware_Uploader/RTK_Firmware_Uploader.py

@@ -468,6 +468,7 @@ def on_upload_btn_pressed(self) -> None:
         command.extend(["--chip","esp32"])
         command.extend(["--port",self.port])
         command.extend(["--baud",self.baudRate])
+        command.extend(["--before","default_reset","--after","no_reset"])
         command.extend(["flash_id"])
 
         # Create a job and add it to the job queue. The worker thread will pick this up and
@@ -489,6 +490,7 @@ def do_upload(self) -> None:
                 portAvailable = True
         if (portAvailable == False):
             self.writeMessage("Port No Longer Available")
+            self.disable_interface(False)
             return
 
         fileExists = False
@@ -500,6 +502,7 @@ def do_upload(self) -> None:
         finally:
             if (fileExists == False):
                 self.writeMessage("File Not Found")
+                self.disable_interface(False)
                 return
             f.close()
 
@@ -540,16 +543,19 @@ def do_upload(self) -> None:
         if firmwareSizeCorrect == False:
             reply = QMessageBox.warning(self, "Firmware size mismatch", "Do you want to continue?", QMessageBox.Yes | QMessageBox.No, QMessageBox.No)
             if reply == QMessageBox.No:
+                self.disable_interface(False)
                 return
 
+        sleep(1.0);
         self.writeMessage("Uploading firmware\n")
 
         command = []
         #command.extend(["--trace"]) # Useful for debugging
         command.extend(["--chip","esp32"])
         command.extend(["--port",self.port])
         command.extend(["--baud",self.baudRate])
-        command.extend(["--before","default_reset","--after","hard_reset","write_flash","-z","--flash_mode","dio","--flash_freq","80m","--flash_size","detect"])
+        #command.extend(["--before","default_reset","--after","hard_reset","write_flash","-z","--flash_mode","dio","--flash_freq","80m","--flash_size","detect"])
+        command.extend(["--before","default_reset","--after","no_reset","write_flash","-z","--flash_mode","dio","--flash_freq","80m","--flash_size","detect"])
         command.extend(["0x1000",resource_path("RTK_Surveyor.ino.bootloader.bin")])
         command.extend(["0x8000",thePartitionFileName])
         command.extend(["0xe000",resource_path("boot_app0.bin")])
@@ -566,7 +572,7 @@ def do_upload(self) -> None:
         # Send the job to the worker to process
         self._worker.add_job(theJob)
 
-        self.disable_interface(True)
+        self.disable_interface(True) # Redundant... Interface is still disabled from flash detect
 
     def do_restart(self) -> None:
         """Tell the ESP32 to restart"""
@@ -576,21 +582,23 @@ def do_restart(self) -> None:
                 portAvailable = True
         if (portAvailable == False):
             self.writeMessage("Port No Longer Available")
+            self.disable_interface(False)
             return
 
         try:
             self._save_settings() # Save the settings in case the command fails
         except:
             pass
 
+        sleep(1.0);
         self.writeMessage("Restarting ESP32\n")
 
         # ---- The esptool method -----
 
         command = []
         command.extend(["--chip","esp32"])
         command.extend(["--port",self.port])
-        command.extend(["--before","no_reset","run"])
+        command.extend(["--before","default_reset","run"])
 
         # Create a job and add it to the job queue. The worker thread will pick this up and
         # process the job. Can set job values using dictionary syntax, or attribute assignments
@@ -601,7 +609,7 @@ def do_restart(self) -> None:
         # Send the job to the worker to process
         self._worker.add_job(theJob)
 
-        self.disable_interface(True)
+        self.disable_interface(True) # Redundant... Interface is still disabled from flash detect
 
 def startUploaderGUI():
     """Start the GUI"""

RTK_Firmware_Uploader/au_act_esptool.py

@@ -48,7 +48,7 @@ def run_job(self, job:AxJob):
 class AUxEsptoolResetESP32(AxAction):
 
     ACTION_ID = "esptool-reset-esp32"
-    NAME = "ESP32 Reset"
+    NAME = "ESP32 Restart"
 
     def __init__(self) -> None:
         super().__init__(self.ACTION_ID, self.NAME)