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

AP_Arming: move scripting checks to scripting

This commit is contained in:
Iampete1 2022-08-28 20:22:50 +01:00 committed by Andrew Tridgell
parent d0508189e1
commit c5c09860da
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AP_Arming/AP_Arming.cpp
View File

@ -951,6 +951,8 @@ bool AP_Arming::heater_min_temperature_checks(bool report)
*/ */
bool AP_Arming::system_checks(bool report) bool AP_Arming::system_checks(bool report)
{ {
char buffer[MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN+1] {};
if (check_enabled(ARMING_CHECK_SYSTEM)) { if (check_enabled(ARMING_CHECK_SYSTEM)) {
if (!hal.storage->healthy()) { if (!hal.storage->healthy()) {
check_failed(ARMING_CHECK_SYSTEM, report, "Param storage failed"); check_failed(ARMING_CHECK_SYSTEM, report, "Param storage failed");
@ -965,8 +967,8 @@ bool AP_Arming::system_checks(bool report)
#endif #endif
#if AP_SCRIPTING_ENABLED #if AP_SCRIPTING_ENABLED
const AP_Scripting *scripting = AP_Scripting::get_singleton(); const AP_Scripting *scripting = AP_Scripting::get_singleton();
if ((scripting != nullptr) && scripting->enabled() && scripting->init_failed()) { if ((scripting != nullptr) && !scripting->arming_checks(sizeof(buffer), buffer)) {
check_failed(ARMING_CHECK_SYSTEM, report, "Scripting out of memory"); check_failed(ARMING_CHECK_SYSTEM, report, "%s", buffer);
return false; return false;
} }
#endif #endif
@ -979,15 +981,13 @@ bool AP_Arming::system_checks(bool report)
#endif #endif
} }
if (AP::internalerror().errors() != 0) { if (AP::internalerror().errors() != 0) {
uint8_t buffer[32]; AP::internalerror().errors_as_string((uint8_t*)buffer, ARRAY_SIZE(buffer));
AP::internalerror().errors_as_string(buffer, ARRAY_SIZE(buffer));
check_failed(report, "Internal errors 0x%x l:%u %s", (unsigned int)AP::internalerror().errors(), AP::internalerror().last_error_line(), buffer); check_failed(report, "Internal errors 0x%x l:%u %s", (unsigned int)AP::internalerror().errors(), AP::internalerror().last_error_line(), buffer);
return false; return false;
} }
if (check_enabled(ARMING_CHECK_PARAMETERS)) { if (check_enabled(ARMING_CHECK_PARAMETERS)) {
auto *rpm = AP::rpm(); auto *rpm = AP::rpm();
char buffer[MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN+1] {};
if (rpm && !rpm->arming_checks(sizeof(buffer), buffer)) { if (rpm && !rpm->arming_checks(sizeof(buffer), buffer)) {
check_failed(ARMING_CHECK_PARAMETERS, report, "%s", buffer); check_failed(ARMING_CHECK_PARAMETERS, report, "%s", buffer);
return false; return false;