fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-03 12:48:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

astyle src/drivers/bootloaders

Browse Source
This commit is contained in:
Daniel Agar
2017-01-29 01:18:32 +01:00
committed by Lorenz Meier
parent 8ab79a2c90
commit 32da3381f7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/bootloaders/src/sched/timer.c
+1 -1
View File
@@ -72,7 +72,7 @@ typedef enum {
Repeating = modeRepeating, Repeating = modeRepeating,
Timeout = modeTimeout, Timeout = modeTimeout,
modeMsk = 0x3 , modeMsk = 0x3,
running = modeStarted, running = modeStarted,
inuse = 0x80, inuse = 0x80,
src/drivers/bootloaders/src/uavcan/main.c
+2 -2
View File
@@ -890,7 +890,7 @@ static flash_error_t file_read_and_program(const uavcan_Path_t *fw_path,
*(uint32_t *)data = 0xffffffff; *(uint32_t *)data = 0xffffffff;
} }
flash_status = bl_flash_write(flash_address + request.offset , flash_status = bl_flash_write(flash_address + request.offset,
data, data,
length + (length & 1)); length + (length & 1));
@@ -1413,7 +1413,7 @@ failure:
bootloader.health = HEALTH_CRITICAL; bootloader.health = HEALTH_CRITICAL;
bl_timer_id tmr = timer_allocate(modeTimeout | modeStarted , OPT_RESTART_TIMEOUT_MS, 0); bl_timer_id tmr = timer_allocate(modeTimeout | modeStarted, OPT_RESTART_TIMEOUT_MS, 0);
while (!timer_expired(tmr)) { while (!timer_expired(tmr)) {
; ;