mirror of
https://github.com/ArduPilot/ardupilot
synced 2025-01-03 06:28:27 -04:00
AP_Bootloader: fix stuck in bl on reboot from firmware with network and CAN bootlaoders
This commit is contained in:
parent
3ab3388752
commit
e499c2d39f
@ -747,7 +747,7 @@ bool can_check_update(void)
|
|||||||
bool ret = false;
|
bool ret = false;
|
||||||
#if HAL_RAM_RESERVE_START >= 256
|
#if HAL_RAM_RESERVE_START >= 256
|
||||||
struct app_bootloader_comms *comms = (struct app_bootloader_comms *)HAL_RAM0_START;
|
struct app_bootloader_comms *comms = (struct app_bootloader_comms *)HAL_RAM0_START;
|
||||||
if (comms->magic == APP_BOOTLOADER_COMMS_MAGIC) {
|
if (comms->magic == APP_BOOTLOADER_COMMS_MAGIC && comms->my_node_id != 0) {
|
||||||
can_set_node_id(comms->my_node_id);
|
can_set_node_id(comms->my_node_id);
|
||||||
fw_update.node_id = comms->server_node_id;
|
fw_update.node_id = comms->server_node_id;
|
||||||
for (uint8_t i=0; i<FW_UPDATE_PIPELINE_LEN; i++) {
|
for (uint8_t i=0; i<FW_UPDATE_PIPELINE_LEN; i++) {
|
||||||
|
Loading…
Reference in New Issue
Block a user