Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Peter Barker 2020-05-01 15:19:59 +10:00 committed by Andrew Tridgell
parent a6246a6afa
commit 245b962d92
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_PiccoloCAN/AP_PiccoloCAN.cpp
View File

@ -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;
}
}