Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 22:49:53 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

Fix px4 fbw flash problem, related to #2040 (#2057)

Browse Source
This commit is contained in:
kevindehecker
2017-04-26 03:24:37 +02:00
committed by Michal Podhradsky
parent 2f020745f9
commit 677d0af0bd
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/modules/px4_flash/px4_flash.c
+1 -1
View File
@@ -72,7 +72,7 @@ void px4flash_init(void)
setToBootloaderMode = false;
#ifdef INTER_MCU_AP
px4ioRebootTimeout = false;
px4iobl_tid = sys_time_register_timer(15.0, NULL); //20 (fbw pprz bl timeout)-5 (px4 fmu bl timeout)
px4iobl_tid = sys_time_register_timer(12.0, NULL); //20 (fbw pprz bl timeout)-5 (px4 fmu bl timeout) - 3 (uncertainty and random delays)
#endif
}
sw/airborne/subsystems/intermcu/intermcu_fbw.c
+2 -2
View File
@@ -89,7 +89,7 @@ void intermcu_init(void)
#endif
#ifdef BOARD_PX4IO
px4bl_tid = sys_time_register_timer(10.0, NULL);
px4bl_tid = sys_time_register_timer(20.0, NULL); //bootloader time out. After this intermcu will be set to slow baud.
#endif
}
@@ -266,7 +266,7 @@ static void checkPx4RebootCommand(uint8_t b)
sys_time_cancel_timer(px4bl_tid);
//for unknown reasons, 1500000 baud does not work reliably after prolonged times.
//I suspect a temperature related issue, combined with the fbw f1 crystal which is out of specs
//After a initial period on 1500000, revert to 230400
//After an initial period on 1500000, revert to 230400
//We still start at 1500000 to remain compatible with original PX4 firmware. (which always runs at 1500000)
uart_periph_set_baudrate(intermcu.device->periph, B230400);
intermcu.stable_px4_baud = CHANGING_BAUD;
sw/tools/px4/set_target.py
+2 -2
View File
@@ -41,11 +41,11 @@ if mode == 1:
print ("AP responded with: " + c)
if c == "TIMEOUT":
print(
"Error: FBW bootloader TIMEOUT. Power cycle the board and wait between 5 seconds to 20 seconds to retry.")
"Error: FBW bootloader TIMEOUT. Power cycle the board and wait between 10 seconds to 20 seconds to retry.")
sys.exit(1)
elif c != "FBWOKOK":
print(
"Error: unknown error. Power cycle the board and wait between 5 seconds to 20 seconds to retry.")
"Error: unknown error. Power cycle the board and wait between 10 seconds to 20 seconds to retry.")
sys.exit(1)
except serial.serialutil.SerialException:
pass