From 575ac9224ece6127c37a0277e6dcf6202dc9a89c Mon Sep 17 00:00:00 2001 From: Siddharth Purohit Date: Sat, 7 Mar 2020 22:03:49 +0530 Subject: [PATCH] AP_Arming: fix error unannotated fall-through between switch labels --- libraries/AP_Arming/AP_Arming.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/AP_Arming/AP_Arming.cpp b/libraries/AP_Arming/AP_Arming.cpp index 206c089033..c352b34cdb 100644 --- a/libraries/AP_Arming/AP_Arming.cpp +++ b/libraries/AP_Arming/AP_Arming.cpp @@ -779,8 +779,8 @@ bool AP_Arming::can_checks(bool report) check_failed(ARMING_CHECK_SYSTEM, report, "%s", fail_msg); return false; } - break; #endif + break; } case AP_BoardConfig_CAN::Protocol_Type_PiccoloCAN: { #if HAL_PICCOLO_CAN_ENABLE @@ -796,11 +796,11 @@ bool AP_Arming::can_checks(bool report) return false; } - break; #else check_failed(ARMING_CHECK_SYSTEM, report, "PiccoloCAN not enabled"); return false; #endif + break; } case AP_BoardConfig_CAN::Protocol_Type_UAVCAN: { @@ -809,6 +809,7 @@ bool AP_Arming::can_checks(bool report) check_failed(ARMING_CHECK_SYSTEM, report, "%s", fail_msg); return false; } + break; } case AP_BoardConfig_CAN::Protocol_Type_None: default: