Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Copter: Set the message buffer size to twice the message size #28211

Merged
merged 2 commits into from
Sep 27, 2024
Merged

Copter: Set the message buffer size to twice the message size #28211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7513c62
Copter: Set the message buffer size to twice the message size
muramura Sep 24, 2024
a45a3c4
AP_Arming: Set the message buffer size to twice the message size
muramura Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ArduCopter/AP_Arming.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ bool AP_Arming_Copter::run_pre_arm_checks(bool display_failure)
}

// always check motors
char failure_msg[50] {};
char failure_msg[100] {};
if (!copter.motors->arming_checks(ARRAY_SIZE(failure_msg), failure_msg)) {
check_failed(display_failure, "Motors: %s", failure_msg);
passed = false;
Expand Down Expand Up @@ -224,7 +224,7 @@ bool AP_Arming_Copter::parameter_checks(bool display_failure)
}

#if FRAME_CONFIG == HELI_FRAME
char fail_msg[50];
char fail_msg[100]{};
// check input manager parameters
if (!copter.input_manager.parameter_check(fail_msg, ARRAY_SIZE(fail_msg))) {
check_failed(ARMING_CHECK_PARAMETERS, display_failure, "%s", fail_msg);
Expand Down Expand Up @@ -291,7 +291,7 @@ bool AP_Arming_Copter::parameter_checks(bool display_failure)
#endif

// ensure controllers are OK with us arming:
char failure_msg[50] = {};
char failure_msg[100] = {};
if (!copter.pos_control->pre_arm_checks("PSC", failure_msg, ARRAY_SIZE(failure_msg))) {
check_failed(ARMING_CHECK_PARAMETERS, display_failure, "Bad parameter: %s", failure_msg);
return false;
Expand All @@ -308,7 +308,7 @@ bool AP_Arming_Copter::parameter_checks(bool display_failure)
bool AP_Arming_Copter::oa_checks(bool display_failure)
{
#if AP_OAPATHPLANNER_ENABLED
char failure_msg[50] = {};
char failure_msg[100] = {};
if (copter.g2.oa.pre_arm_check(failure_msg, ARRAY_SIZE(failure_msg))) {
return true;
}
Expand Down Expand Up @@ -439,7 +439,7 @@ bool AP_Arming_Copter::mandatory_gps_checks(bool display_failure)

// always check if inertial nav has started and is ready
const auto &ahrs = AP::ahrs();
char failure_msg[50] = {};
char failure_msg[100] = {};
if (!ahrs.pre_arm_check(mode_requires_gps, failure_msg, sizeof(failure_msg))) {
check_failed(display_failure, "AHRS: %s", failure_msg);
return false;
Expand Down Expand Up @@ -528,7 +528,7 @@ bool AP_Arming_Copter::winch_checks(bool display_failure) const
if (winch == nullptr) {
return true;
}
char failure_msg[50] = {};
char failure_msg[100] = {};
if (!winch->pre_arm_check(failure_msg, sizeof(failure_msg))) {
check_failed(display_failure, "%s", failure_msg);
return false;
Expand Down
2 changes: 1 addition & 1 deletion ArduCopter/motor_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ bool Copter::mavlink_motor_control_check(const GCS_MAVLINK &gcs_chan, bool check
}

// Check Motor test is allowed
char failure_msg[50] {};
char failure_msg[100] {};
if (!motors->motor_test_checks(ARRAY_SIZE(failure_msg), failure_msg)) {
gcs_chan.send_text(MAV_SEVERITY_CRITICAL,"%s: %s", mode, failure_msg);
return false;
Expand Down
10 changes: 5 additions & 5 deletions libraries/AP_Arming/AP_Arming.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ bool AP_Arming::compass_checks(bool report)
if (!_compass.learn_offsets_enabled())
#endif
{
char failure_msg[50] = {};
char failure_msg[100] = {};
if (!_compass.configured(failure_msg, ARRAY_SIZE(failure_msg))) {
check_failed(ARMING_CHECK_COMPASS, report, "%s", failure_msg);
return false;
Expand Down Expand Up @@ -602,7 +602,7 @@ bool AP_Arming::gps_checks(bool report)
if (check_enabled(ARMING_CHECK_GPS)) {

// Any failure messages from GPS backends
char failure_msg[50] = {};
char failure_msg[100] = {};
if (!AP::gps().pre_arm_checks(failure_msg, ARRAY_SIZE(failure_msg))) {
if (failure_msg[0] != '\0') {
check_failed(ARMING_CHECK_GPS, report, "%s", failure_msg);
Expand Down Expand Up @@ -1205,7 +1205,7 @@ bool AP_Arming::proximity_checks(bool report) const
bool AP_Arming::can_checks(bool report)
{
if (check_enabled(ARMING_CHECK_SYSTEM)) {
char fail_msg[50] = {};
char fail_msg[100] = {};
(void)fail_msg; // might be left unused
uint8_t num_drivers = AP::can().get_num_drivers();

Expand Down Expand Up @@ -1494,7 +1494,7 @@ bool AP_Arming::generator_checks(bool display_failure) const
if (generator == nullptr) {
return true;
}
char failure_msg[50] = {};
char failure_msg[100] = {};
if (!generator->pre_arm_check(failure_msg, sizeof(failure_msg))) {
check_failed(display_failure, "Generator: %s", failure_msg);
return false;
Expand All @@ -1509,7 +1509,7 @@ bool AP_Arming::opendroneid_checks(bool display_failure)
{
auto &opendroneid = AP::opendroneid();

char failure_msg[50] {};
char failure_msg[100] {};
if (!opendroneid.pre_arm_check(failure_msg, sizeof(failure_msg))) {
check_failed(display_failure, "OpenDroneID: %s", failure_msg);
return false;
Expand Down
Loading