aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Bootloader: respect HAL_BOOTLOADER_TIMEOUT when CAN and SERIAL/USB is enabled

Browse Source
This commit is contained in:
Tom Pittenger 2020-12-15 16:08:59 -08:00 committed by Andrew Tridgell
parent 5238f85091
commit 84e578b3df
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tools/AP_Bootloader/AP_Bootloader.cpp
View File

@ -90,11 +90,14 @@ int main(void)
// bad firmware CRC, don't try and boot
timeout = 0;
try_boot = false;
} else if (timeout != 0) {
}
#ifndef BOOTLOADER_DEV_LIST
else if (timeout != 0) {
// fast boot for good firmware
try_boot = true;
timeout = 1000;
}
#endif
if (was_watchdog && m != RTC_BOOT_FWOK) {
// we've had a watchdog within 30s of booting main CAN
// firmware. We will stay in bootloader to allow the user to