1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-26 15:54:15 +01:00

Merged in filnet/librepilot/LP-516_gps_jumptoapp_hangs_board (pull request #421)

LP-516 gps jumptoapp hangs board

Approved-by: Philippe Renon <philippe_renon@yahoo.fr>
Approved-by: Lalanne Laurent <f5soh@free.fr>
Approved-by: Alessio Morale <alessiomorale@gmail.com>
Approved-by: Brian Webb <webbbn@gmail.com>
This commit is contained in:
Philippe Renon 2017-05-15 20:18:18 +00:00 committed by Lalanne Laurent
commit 0a494a034f
2 changed files with 3 additions and 3 deletions

View File

@ -1,6 +1,6 @@
BOARD_TYPE := 0x0A
BOARD_REVISION := 0x01
BOOTLOADER_VERSION := 0x01
BOOTLOADER_VERSION := 0x02
HW_TYPE := 0x01
MCU := cortex-m0

View File

@ -161,10 +161,10 @@ int main()
}
led_pwm_step(period1, sweep_steps1, stopwatch, false);
led_pwm_step(period2, sweep_steps2, stopwatch, true);
JumpToApp |= (stopwatch > BL_WAIT_TIME) && ((DeviceState == BLidle) || (DeviceState == DFUidle));
JumpToApp |= !ssp_dfu && (stopwatch > BL_WAIT_TIME) && ((DeviceState == BLidle) || (DeviceState == DFUidle));
DataDownload(start);
if (JumpToApp == true && !ssp_dfu) {
if (JumpToApp == true) {
jump_to_app();
}
}