ArduPilot · tridge · Dec 27, 2024 · Dec 26, 2024 · Dec 26, 2024
diff --git a/Tools/AP_Bootloader/can.cpp b/Tools/AP_Bootloader/can.cpp
@@ -276,7 +276,8 @@ static void handle_file_read_response(CanardInstance* ins, CanardRxTransfer* tra
         }
     }
     if (!found) {
-        // not a current transfer
+        // not a current transfer, we may be getting long delays
+        fw_update.rtt_ms = MIN(3000, fw_update.rtt_ms+250);
         return;
     }
     if (uavcan_protocol_file_ReadResponse_decode(transfer, &fw_update.reads[idx].pkt)) {

diff --git a/Tools/bootloaders/AR-F407SmartBat_bl.bin b/Tools/bootloaders/AR-F407SmartBat_bl.bin
diff --git a/Tools/bootloaders/AR-F407SmartBat_bl.elf b/Tools/bootloaders/AR-F407SmartBat_bl.elf
diff --git a/Tools/bootloaders/AR-F407SmartBat_bl.hex b/Tools/bootloaders/AR-F407SmartBat_bl.hex
diff --git a/Tools/bootloaders/ARK_CANNODE_bl.bin b/Tools/bootloaders/ARK_CANNODE_bl.bin
diff --git a/Tools/bootloaders/ARK_CANNODE_bl.hex b/Tools/bootloaders/ARK_CANNODE_bl.hex
diff --git a/Tools/bootloaders/ARK_GPS_bl.bin b/Tools/bootloaders/ARK_GPS_bl.bin
diff --git a/Tools/bootloaders/ARK_GPS_bl.hex b/Tools/bootloaders/ARK_GPS_bl.hex
diff --git a/Tools/bootloaders/ARK_RTK_GPS_bl.bin b/Tools/bootloaders/ARK_RTK_GPS_bl.bin
diff --git a/Tools/bootloaders/ARK_RTK_GPS_bl.hex b/Tools/bootloaders/ARK_RTK_GPS_bl.hex
diff --git a/Tools/bootloaders/AeroFox-Airspeed-DLVR_bl.bin b/Tools/bootloaders/AeroFox-Airspeed-DLVR_bl.bin
diff --git a/Tools/bootloaders/AeroFox-Airspeed_bl.bin b/Tools/bootloaders/AeroFox-Airspeed_bl.bin
diff --git a/Tools/bootloaders/AeroFox-GNSS_F9P_bl.bin b/Tools/bootloaders/AeroFox-GNSS_F9P_bl.bin
diff --git a/Tools/bootloaders/AeroFox-PMU_bl.bin b/Tools/bootloaders/AeroFox-PMU_bl.bin
diff --git a/Tools/bootloaders/BirdCANdy_bl.bin b/Tools/bootloaders/BirdCANdy_bl.bin
diff --git a/Tools/bootloaders/BirdCANdy_bl.elf b/Tools/bootloaders/BirdCANdy_bl.elf
diff --git a/Tools/bootloaders/BirdCANdy_bl.hex b/Tools/bootloaders/BirdCANdy_bl.hex
diff --git a/Tools/bootloaders/BotBloxDroneNet_bl.bin b/Tools/bootloaders/BotBloxDroneNet_bl.bin
diff --git a/Tools/bootloaders/C-RTK2-HP_bl.bin b/Tools/bootloaders/C-RTK2-HP_bl.bin
diff --git a/Tools/bootloaders/CUAV_GPS_bl.bin b/Tools/bootloaders/CUAV_GPS_bl.bin
diff --git a/Tools/bootloaders/CUAV_GPS_bl.elf b/Tools/bootloaders/CUAV_GPS_bl.elf
diff --git a/Tools/bootloaders/CUAV_GPS_bl.hex b/Tools/bootloaders/CUAV_GPS_bl.hex
diff --git a/Tools/bootloaders/CarbonixF405_bl.bin b/Tools/bootloaders/CarbonixF405_bl.bin
diff --git a/Tools/bootloaders/CarbonixL496_bl.bin b/Tools/bootloaders/CarbonixL496_bl.bin
diff --git a/Tools/bootloaders/CubeNode-ETH_bl.bin b/Tools/bootloaders/CubeNode-ETH_bl.bin
diff --git a/Tools/bootloaders/CubeNode-ETH_bl.hex b/Tools/bootloaders/CubeNode-ETH_bl.hex
diff --git a/Tools/bootloaders/CubeNode_bl.bin b/Tools/bootloaders/CubeNode_bl.bin
diff --git a/Tools/bootloaders/CubeNode_bl.hex b/Tools/bootloaders/CubeNode_bl.hex
diff --git a/Tools/bootloaders/CubeOrange-periph-heavy_bl.bin b/Tools/bootloaders/CubeOrange-periph-heavy_bl.bin
diff --git a/Tools/bootloaders/CubeOrange-periph-heavy_bl.hex b/Tools/bootloaders/CubeOrange-periph-heavy_bl.hex
diff --git a/Tools/bootloaders/CubeOrange-periph_bl.bin b/Tools/bootloaders/CubeOrange-periph_bl.bin
diff --git a/Tools/bootloaders/CubeOrange-periph_bl.hex b/Tools/bootloaders/CubeOrange-periph_bl.hex
diff --git a/Tools/bootloaders/CubeRedPrimary-PPPGW_bl.bin b/Tools/bootloaders/CubeRedPrimary-PPPGW_bl.bin
diff --git a/Tools/bootloaders/FreeflyRTK_bl.bin b/Tools/bootloaders/FreeflyRTK_bl.bin
diff --git a/Tools/bootloaders/FreeflyRTK_bl.elf b/Tools/bootloaders/FreeflyRTK_bl.elf
diff --git a/Tools/bootloaders/FreeflyRTK_bl.hex b/Tools/bootloaders/FreeflyRTK_bl.hex
diff --git a/Tools/bootloaders/G4-ESC_bl.bin b/Tools/bootloaders/G4-ESC_bl.bin
diff --git a/Tools/bootloaders/Here4AP_bl.bin b/Tools/bootloaders/Here4AP_bl.bin
diff --git a/Tools/bootloaders/Here4FC_bl.bin b/Tools/bootloaders/Here4FC_bl.bin
diff --git a/Tools/bootloaders/Here4FC_bl.hex b/Tools/bootloaders/Here4FC_bl.hex
diff --git a/Tools/bootloaders/Hitec-Airspeed_bl.bin b/Tools/bootloaders/Hitec-Airspeed_bl.bin
diff --git a/Tools/bootloaders/Hitec-Airspeed_bl.elf b/Tools/bootloaders/Hitec-Airspeed_bl.elf
diff --git a/Tools/bootloaders/Hitec-Airspeed_bl.hex b/Tools/bootloaders/Hitec-Airspeed_bl.hex
diff --git a/Tools/bootloaders/HitecMosaic_bl.bin b/Tools/bootloaders/HitecMosaic_bl.bin
diff --git a/Tools/bootloaders/HitecMosaic_bl.elf b/Tools/bootloaders/HitecMosaic_bl.elf
diff --git a/Tools/bootloaders/HitecMosaic_bl.hex b/Tools/bootloaders/HitecMosaic_bl.hex
diff --git a/Tools/bootloaders/HolybroF4_PMU_bl.bin b/Tools/bootloaders/HolybroF4_PMU_bl.bin
diff --git a/Tools/bootloaders/HolybroG4_Airspeed_bl.bin b/Tools/bootloaders/HolybroG4_Airspeed_bl.bin
diff --git a/Tools/bootloaders/HolybroG4_Compass_bl.bin b/Tools/bootloaders/HolybroG4_Compass_bl.bin
diff --git a/Tools/bootloaders/HolybroG4_GPS_bl.bin b/Tools/bootloaders/HolybroG4_GPS_bl.bin
diff --git a/Tools/bootloaders/HolybroG4_GPS_bl.elf b/Tools/bootloaders/HolybroG4_GPS_bl.elf
diff --git a/Tools/bootloaders/HolybroG4_GPS_bl.hex b/Tools/bootloaders/HolybroG4_GPS_bl.hex
diff --git a/Tools/bootloaders/HolybroGPS_bl.bin b/Tools/bootloaders/HolybroGPS_bl.bin
diff --git a/Tools/bootloaders/HolybroGPS_bl.elf b/Tools/bootloaders/HolybroGPS_bl.elf
diff --git a/Tools/bootloaders/HolybroGPS_bl.hex b/Tools/bootloaders/HolybroGPS_bl.hex
diff --git a/Tools/bootloaders/MFE_POS3_CAN_bl.bin b/Tools/bootloaders/MFE_POS3_CAN_bl.bin
diff --git a/Tools/bootloaders/MatekG474-DShot_bl.bin b/Tools/bootloaders/MatekG474-DShot_bl.bin
diff --git a/Tools/bootloaders/MatekG474-DShot_bl.hex b/Tools/bootloaders/MatekG474-DShot_bl.hex
diff --git a/Tools/bootloaders/MatekG474-Periph_bl.bin b/Tools/bootloaders/MatekG474-Periph_bl.bin
diff --git a/Tools/bootloaders/MatekG474-Periph_bl.hex b/Tools/bootloaders/MatekG474-Periph_bl.hex
diff --git a/Tools/bootloaders/MatekL431-ADSB_bl.bin b/Tools/bootloaders/MatekL431-ADSB_bl.bin
diff --git a/Tools/bootloaders/MatekL431-ADSB_bl.hex b/Tools/bootloaders/MatekL431-ADSB_bl.hex
diff --git a/Tools/bootloaders/MatekL431-APDTelem_bl.bin b/Tools/bootloaders/MatekL431-APDTelem_bl.bin
diff --git a/Tools/bootloaders/MatekL431-Airspeed_bl.bin b/Tools/bootloaders/MatekL431-Airspeed_bl.bin
diff --git a/Tools/bootloaders/MatekL431-Airspeed_bl.hex b/Tools/bootloaders/MatekL431-Airspeed_bl.hex
diff --git a/Tools/bootloaders/MatekL431-BattMon_bl.bin b/Tools/bootloaders/MatekL431-BattMon_bl.bin
diff --git a/Tools/bootloaders/MatekL431-DShot_bl.bin b/Tools/bootloaders/MatekL431-DShot_bl.bin
diff --git a/Tools/bootloaders/MatekL431-EFI_bl.bin b/Tools/bootloaders/MatekL431-EFI_bl.bin
diff --git a/Tools/bootloaders/MatekL431-GPS_bl.bin b/Tools/bootloaders/MatekL431-GPS_bl.bin
diff --git a/Tools/bootloaders/MatekL431-MagHiRes_bl.bin b/Tools/bootloaders/MatekL431-MagHiRes_bl.bin
diff --git a/Tools/bootloaders/MatekL431-Periph_bl.bin b/Tools/bootloaders/MatekL431-Periph_bl.bin
diff --git a/Tools/bootloaders/MatekL431-Periph_bl.hex b/Tools/bootloaders/MatekL431-Periph_bl.hex
diff --git a/Tools/bootloaders/MatekL431-Proximity_bl.bin b/Tools/bootloaders/MatekL431-Proximity_bl.bin
diff --git a/Tools/bootloaders/MatekL431-RC_bl.bin b/Tools/bootloaders/MatekL431-RC_bl.bin
diff --git a/Tools/bootloaders/MatekL431-Rangefinder_bl.bin b/Tools/bootloaders/MatekL431-Rangefinder_bl.bin
diff --git a/Tools/bootloaders/MatekL431-Serial_bl.bin b/Tools/bootloaders/MatekL431-Serial_bl.bin
diff --git a/Tools/bootloaders/MatekL431-bdshot_bl.bin b/Tools/bootloaders/MatekL431-bdshot_bl.bin
diff --git a/Tools/bootloaders/Nucleo-G491_bl.bin b/Tools/bootloaders/Nucleo-G491_bl.bin
diff --git a/Tools/bootloaders/Nucleo-G491_bl.elf b/Tools/bootloaders/Nucleo-G491_bl.elf
diff --git a/Tools/bootloaders/Nucleo-G491_bl.hex b/Tools/bootloaders/Nucleo-G491_bl.hex
diff --git a/Tools/bootloaders/Nucleo-L496_bl.bin b/Tools/bootloaders/Nucleo-L496_bl.bin
diff --git a/Tools/bootloaders/Nucleo-L496_bl.hex b/Tools/bootloaders/Nucleo-L496_bl.hex
diff --git a/Tools/bootloaders/Pixhawk6X-PPPGW_bl.bin b/Tools/bootloaders/Pixhawk6X-PPPGW_bl.bin
diff --git a/Tools/bootloaders/Pixracer-periph_bl.bin b/Tools/bootloaders/Pixracer-periph_bl.bin
diff --git a/Tools/bootloaders/Pixracer-periph_bl.hex b/Tools/bootloaders/Pixracer-periph_bl.hex
diff --git a/Tools/bootloaders/Sierra-L431_bl.bin b/Tools/bootloaders/Sierra-L431_bl.bin
diff --git a/Tools/bootloaders/Sierra-PrecisionPoint_bl.bin b/Tools/bootloaders/Sierra-PrecisionPoint_bl.bin
diff --git a/Tools/bootloaders/Sierra-PrecisionPoint_bl.hex b/Tools/bootloaders/Sierra-PrecisionPoint_bl.hex
diff --git a/Tools/bootloaders/Sierra-TrueNavIC_bl.bin b/Tools/bootloaders/Sierra-TrueNavIC_bl.bin
diff --git a/Tools/bootloaders/Sierra-TrueNavIC_bl.hex b/Tools/bootloaders/Sierra-TrueNavIC_bl.hex
diff --git a/Tools/bootloaders/Sierra-TrueNavPro-G4_bl.bin b/Tools/bootloaders/Sierra-TrueNavPro-G4_bl.bin
diff --git a/Tools/bootloaders/Sierra-TrueNavPro-G4_bl.hex b/Tools/bootloaders/Sierra-TrueNavPro-G4_bl.hex
diff --git a/Tools/bootloaders/Sierra-TrueNavPro_bl.bin b/Tools/bootloaders/Sierra-TrueNavPro_bl.bin
diff --git a/Tools/bootloaders/Sierra-TrueNorth_bl.bin b/Tools/bootloaders/Sierra-TrueNorth_bl.bin
diff --git a/Tools/bootloaders/Sierra-TrueSpeed_bl.bin b/Tools/bootloaders/Sierra-TrueSpeed_bl.bin
diff --git a/Tools/bootloaders/ZubaxGNSS_bl.bin b/Tools/bootloaders/ZubaxGNSS_bl.bin
diff --git a/Tools/bootloaders/ZubaxGNSS_bl.elf b/Tools/bootloaders/ZubaxGNSS_bl.elf
diff --git a/Tools/bootloaders/ZubaxGNSS_bl.hex b/Tools/bootloaders/ZubaxGNSS_bl.hex
diff --git a/Tools/bootloaders/f103-ADSB_bl.bin b/Tools/bootloaders/f103-ADSB_bl.bin
diff --git a/Tools/bootloaders/f103-ADSB_bl.elf b/Tools/bootloaders/f103-ADSB_bl.elf
diff --git a/Tools/bootloaders/f103-ADSB_bl.hex b/Tools/bootloaders/f103-ADSB_bl.hex
diff --git a/Tools/bootloaders/f103-Airspeed_bl.bin b/Tools/bootloaders/f103-Airspeed_bl.bin
diff --git a/Tools/bootloaders/f103-Airspeed_bl.elf b/Tools/bootloaders/f103-Airspeed_bl.elf
diff --git a/Tools/bootloaders/f103-Airspeed_bl.hex b/Tools/bootloaders/f103-Airspeed_bl.hex
diff --git a/Tools/bootloaders/f103-GPS_bl.bin b/Tools/bootloaders/f103-GPS_bl.bin
diff --git a/Tools/bootloaders/f103-GPS_bl.hex b/Tools/bootloaders/f103-GPS_bl.hex
diff --git a/Tools/bootloaders/f103-HWESC_bl.bin b/Tools/bootloaders/f103-HWESC_bl.bin
diff --git a/Tools/bootloaders/f103-HWESC_bl.hex b/Tools/bootloaders/f103-HWESC_bl.hex
diff --git a/Tools/bootloaders/f103-QiotekPeriph_bl.bin b/Tools/bootloaders/f103-QiotekPeriph_bl.bin
diff --git a/Tools/bootloaders/f103-QiotekPeriph_bl.hex b/Tools/bootloaders/f103-QiotekPeriph_bl.hex
diff --git a/Tools/bootloaders/f103-RangeFinder_bl.bin b/Tools/bootloaders/f103-RangeFinder_bl.bin
diff --git a/Tools/bootloaders/f103-RangeFinder_bl.elf b/Tools/bootloaders/f103-RangeFinder_bl.elf
diff --git a/Tools/bootloaders/f103-RangeFinder_bl.hex b/Tools/bootloaders/f103-RangeFinder_bl.hex
diff --git a/Tools/bootloaders/f103-Trigger_bl.bin b/Tools/bootloaders/f103-Trigger_bl.bin
diff --git a/Tools/bootloaders/f103-Trigger_bl.elf b/Tools/bootloaders/f103-Trigger_bl.elf
diff --git a/Tools/bootloaders/f103-Trigger_bl.hex b/Tools/bootloaders/f103-Trigger_bl.hex
diff --git a/Tools/bootloaders/f303-GPS_bl.bin b/Tools/bootloaders/f303-GPS_bl.bin
diff --git a/Tools/bootloaders/f303-GPS_bl.hex b/Tools/bootloaders/f303-GPS_bl.hex
diff --git a/Tools/bootloaders/f303-HWESC_bl.bin b/Tools/bootloaders/f303-HWESC_bl.bin
diff --git a/Tools/bootloaders/f303-HWESC_bl.hex b/Tools/bootloaders/f303-HWESC_bl.hex
diff --git a/Tools/bootloaders/f303-M10025_bl.bin b/Tools/bootloaders/f303-M10025_bl.bin
diff --git a/Tools/bootloaders/f303-M10025_bl.hex b/Tools/bootloaders/f303-M10025_bl.hex
diff --git a/Tools/bootloaders/f303-M10070_bl.bin b/Tools/bootloaders/f303-M10070_bl.bin
diff --git a/Tools/bootloaders/f303-M10070_bl.elf b/Tools/bootloaders/f303-M10070_bl.elf
diff --git a/Tools/bootloaders/f303-M10070_bl.hex b/Tools/bootloaders/f303-M10070_bl.hex
diff --git a/Tools/bootloaders/f303-MatekGPS_bl.bin b/Tools/bootloaders/f303-MatekGPS_bl.bin
diff --git a/Tools/bootloaders/f303-MatekGPS_bl.elf b/Tools/bootloaders/f303-MatekGPS_bl.elf
diff --git a/Tools/bootloaders/f303-MatekGPS_bl.hex b/Tools/bootloaders/f303-MatekGPS_bl.hex
diff --git a/Tools/bootloaders/f303-PWM_bl.bin b/Tools/bootloaders/f303-PWM_bl.bin
diff --git a/Tools/bootloaders/f303-TempSensor_bl.bin b/Tools/bootloaders/f303-TempSensor_bl.bin
diff --git a/Tools/bootloaders/f303-Universal_bl.bin b/Tools/bootloaders/f303-Universal_bl.bin
diff --git a/Tools/bootloaders/f303-Universal_bl.elf b/Tools/bootloaders/f303-Universal_bl.elf
diff --git a/Tools/bootloaders/f303-Universal_bl.hex b/Tools/bootloaders/f303-Universal_bl.hex
diff --git a/Tools/bootloaders/f405-MatekAirspeed_bl.bin b/Tools/bootloaders/f405-MatekAirspeed_bl.bin
diff --git a/Tools/bootloaders/f405-MatekAirspeed_bl.hex b/Tools/bootloaders/f405-MatekAirspeed_bl.hex
diff --git a/Tools/bootloaders/f405-MatekGPS_bl.bin b/Tools/bootloaders/f405-MatekGPS_bl.bin
diff --git a/Tools/bootloaders/f405-MatekGPS_bl.hex b/Tools/bootloaders/f405-MatekGPS_bl.hex
diff --git a/Tools/bootloaders/mRo-M10095_bl.bin b/Tools/bootloaders/mRo-M10095_bl.bin
diff --git a/Tools/bootloaders/mRo-M10095_bl.elf b/Tools/bootloaders/mRo-M10095_bl.elf
diff --git a/Tools/bootloaders/mRo-M10095_bl.hex b/Tools/bootloaders/mRo-M10095_bl.hex
diff --git a/Tools/bootloaders/mRoCANPWM-M10126_bl.bin b/Tools/bootloaders/mRoCANPWM-M10126_bl.bin
diff --git a/Tools/bootloaders/mRoKitCANrevC_bl.bin b/Tools/bootloaders/mRoKitCANrevC_bl.bin
diff --git a/Tools/bootloaders/mRoKitCANrevC_bl.hex b/Tools/bootloaders/mRoKitCANrevC_bl.hex
diff --git a/Tools/bootloaders/rGNSS_bl.bin b/Tools/bootloaders/rGNSS_bl.bin
diff --git a/Tools/bootloaders/sw-boom-f407_bl.bin b/Tools/bootloaders/sw-boom-f407_bl.bin
diff --git a/Tools/bootloaders/sw-boom-f407_bl.hex b/Tools/bootloaders/sw-boom-f407_bl.hex
diff --git a/Tools/bootloaders/sw-nav-f405_bl.bin b/Tools/bootloaders/sw-nav-f405_bl.bin
diff --git a/Tools/bootloaders/sw-nav-f405_bl.hex b/Tools/bootloaders/sw-nav-f405_bl.hex
diff --git a/Tools/bootloaders/sw-spar-f407_bl.bin b/Tools/bootloaders/sw-spar-f407_bl.bin
diff --git a/Tools/bootloaders/sw-spar-f407_bl.hex b/Tools/bootloaders/sw-spar-f407_bl.hex