From 2e79c28ffd100b5eaae936dd4647ee6091d4d519 Mon Sep 17 00:00:00 2001 From: Huibean Date: Sun, 23 Nov 2025 15:43:52 +0800 Subject: [PATCH] Tools:AP_Bootloader: fix check good firmware define --- Tools/AP_Bootloader/can.cpp | 8 ++++++++ Tools/AP_Bootloader/network.cpp | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/Tools/AP_Bootloader/can.cpp b/Tools/AP_Bootloader/can.cpp index 77dd82225f6..3c9a4b933a5 100644 --- a/Tools/AP_Bootloader/can.cpp +++ b/Tools/AP_Bootloader/can.cpp @@ -336,7 +336,11 @@ static void handle_file_read_response(CanardInstance* ins, CanardRxTransfer* tra fw_update.node_id = 0; flash_write_flush(); flash_set_keep_unlocked(false); +#if AP_CHECK_FIRMWARE_ENABLED const auto ok = check_good_firmware(); +#else + const auto ok = check_fw_result_t::CHECK_FW_OK; +#endif node_status.vendor_specific_status_code = uint8_t(ok); if (ok == check_fw_result_t::CHECK_FW_OK) { jump_to_app(); @@ -805,7 +809,11 @@ bool can_check_update(void) void can_start() { +#if AP_CHECK_FIRMWARE_ENABLED node_status.vendor_specific_status_code = uint8_t(check_good_firmware()); +#else + node_status.vendor_specific_status_code = uint8_t(check_fw_result_t::CHECK_FW_OK); +#endif node_status.mode = UAVCAN_PROTOCOL_NODESTATUS_MODE_MAINTENANCE; #if HAL_USE_CAN diff --git a/Tools/AP_Bootloader/network.cpp b/Tools/AP_Bootloader/network.cpp index 1d7a312227b..4dcd585c9c7 100644 --- a/Tools/AP_Bootloader/network.cpp +++ b/Tools/AP_Bootloader/network.cpp @@ -463,7 +463,11 @@ void BL_Network::handle_post(SocketAPM *sock, uint32_t content_length) } flash_write_flush(); flash_set_keep_unlocked(false); +#if AP_CHECK_FIRMWARE_ENABLED const auto ok = check_good_firmware(); +#else + const auto ok = check_fw_result_t::CHECK_FW_OK; +#endif if (ok == check_fw_result_t::CHECK_FW_OK) { need_launch = true; status_printf("Flash done: OK");