From 245b962d92a02092ff3540dd183f5e99a06afbe0 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 1 May 2020 15:19:59 +1000 Subject: [PATCH] AP_PiccoloCAN: regularise CAN pre-arm failure messages AP_Arming tacks on the sub-system bit. Remove PiccoloCAN's silly nullptr check Require the library to supply the failure message (no default message) Remove default cases so authors know to think about places they should add things. --- libraries/AP_PiccoloCAN/AP_PiccoloCAN.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_PiccoloCAN/AP_PiccoloCAN.cpp b/libraries/AP_PiccoloCAN/AP_PiccoloCAN.cpp index fd6b79bdbb..8d6bad46dc 100644 --- a/libraries/AP_PiccoloCAN/AP_PiccoloCAN.cpp +++ b/libraries/AP_PiccoloCAN/AP_PiccoloCAN.cpp @@ -536,14 +536,14 @@ bool AP_PiccoloCAN::pre_arm_check(char* reason, uint8_t reason_len) if (SRV_Channels::function_assigned(motor_function)) { if (!is_esc_present(ii)) { - snprintf(reason, reason_len, "PiccoloCAN: ESC %u not detected", ii + 1); + snprintf(reason, reason_len, "ESC %u not detected", ii + 1); return false; } PiccoloESC_Info_t &esc = _esc_info[ii]; if (esc.statusA.status.hwInhibit) { - snprintf(reason, reason_len, "PiccoloCAN: ESC %u is hardware inhibited", (ii + 1)); + snprintf(reason, reason_len, "ESC %u is hardware inhibited", (ii + 1)); return false; } }