wip

Author: Williangalvani

core/frontend/src/components/autopilot/FirmwareManager.vue

@@ -552,7 +552,7 @@ export default Vue.extend({
                 const log = JSON.parse(line)
 
                 // Check if backend sent "done" signal to close connection
-                if (log.stream === 'done' || log.stream.includes('Started autopilot')) {
+                if (log.stream.includes('Started autopilot')) {
                   // Close the progress dialog immediately
                   this.install_status = InstallStatus.Succeeded
                   this.install_result_message = 'Installation completed'
@@ -569,13 +569,10 @@ export default Vue.extend({
 
         // Check if there were any error messages in the logs
         const hasErrors = this.install_logs.some((log) => log.stream === 'stderr')
-
-        if (hasErrors) {
+        const lastError = this.install_logs.filter((log) => log.stream === 'stderr').pop()
+        // edge case. the re-plug message is not an error, but is thrown to stderr to get user's attention
+        if (hasErrors && !lastError?.data.includes('re-plug the USB connector')) {
           this.install_status = InstallStatus.Failed
-          // Get the last error message
-          const lastError = this.install_logs
-            .filter((log) => log.stream === 'stderr')
-            .pop()
           this.install_result_message = lastError?.data || 'Installation failed'
           const message = `Could not install firmware: ${this.install_result_message}.`
           notifier.pushError('FILE_FIRMWARE_INSTALL_FAIL', message)

core/services/ardupilot_manager/flight_controller_detector/mavlink_board_id.py

@@ -88,7 +88,7 @@ def _get_board_id_sync(port_path: str, baudrate: int = 115200) -> Optional[int]:
     """
     try:
         # Set a short timeout for individual reads
-        with serial.Serial(port_path, baudrate, timeout=0.2, exclusive=True) as ser:
+        with serial.Serial(port_path, baudrate, timeout=0.2, exclusive=True, write_timeout=0.2) as ser:
             # Clear any existing data
             ser.reset_input_buffer()