aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Torqeedo: pre-arm does not provide prefix

Browse Source
This commit is contained in:
Randy Mackay 2021-08-09 13:46:17 +09:00
parent b147d59ab7
commit 4c7f23bb67
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Torqeedo/AP_Torqeedo.cpp
View File

@ -208,6 +208,7 @@ bool AP_Torqeedo::healthy()
} }
// run pre-arm check. returns false on failure and fills in failure_msg // run pre-arm check. returns false on failure and fills in failure_msg
// any failure_msg returned will not include a prefix
bool AP_Torqeedo::pre_arm_checks(char *failure_msg, uint8_t failure_msg_len) bool AP_Torqeedo::pre_arm_checks(char *failure_msg, uint8_t failure_msg_len)
{ {
// exit immediately if not enabled // exit immediately if not enabled
@ -215,13 +216,12 @@ bool AP_Torqeedo::pre_arm_checks(char *failure_msg, uint8_t failure_msg_len)
return true; return true;
} }
const char *failure_prefix = "Torqeedo:";
if (!_initialised) { if (!_initialised) {
hal.util->snprintf(failure_msg, failure_msg_len, "%s not initialised", failure_prefix); strncpy(failure_msg, "not initialised", failure_msg_len);
return false; return false;
} }
if (!healthy()) { if (!healthy()) {
hal.util->snprintf(failure_msg, failure_msg_len, "%s not healthy", failure_prefix); strncpy(failure_msg, "not healthy", failure_msg_len);
return false; return false;
} }
return true; return true;

1
libraries/AP_Torqeedo/AP_Torqeedo.h
View File

@ -47,6 +47,7 @@ public:
bool healthy(); bool healthy();
// run pre-arm check. returns false on failure and fills in failure_msg // run pre-arm check. returns false on failure and fills in failure_msg
// any failure_msg returned will not include a prefix
bool pre_arm_checks(char *failure_msg, uint8_t failure_msg_len); bool pre_arm_checks(char *failure_msg, uint8_t failure_msg_len);
static const struct AP_Param::GroupInfo var_info[]; static const struct AP_Param::GroupInfo var_info[];