From ca1b5b1db2fc317e95bbb74d866b38fcb3bd3ccd Mon Sep 17 00:00:00 2001 From: Iampete1 Date: Sat, 1 Jan 2022 15:47:15 +0000 Subject: [PATCH] Plane: Quadplane: use get_frame_and_type_string --- ArduPlane/Log.cpp | 5 +++-- ArduPlane/quadplane.cpp | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ArduPlane/Log.cpp b/ArduPlane/Log.cpp index 154a8285c0..c2b9ec5370 100644 --- a/ArduPlane/Log.cpp +++ b/ArduPlane/Log.cpp @@ -534,8 +534,9 @@ void Plane::Log_Write_Vehicle_Startup_Messages() Log_Write_Startup(TYPE_GROUNDSTART_MSG); #if HAL_QUADPLANE_ENABLED if (quadplane.initialised) { - logger.Write_MessageF("QuadPlane Frame: %s/%s", quadplane.motors->get_frame_string(), - quadplane.motors->get_type_string()); + char frame_and_type_string[30]; + quadplane.motors->get_frame_and_type_string(frame_and_type_string, ARRAY_SIZE(frame_and_type_string)); + logger.Write_MessageF("QuadPlane %s", frame_and_type_string); } #endif logger.Write_Mode(control_mode->mode_number(), control_mode_reason); diff --git a/ArduPlane/quadplane.cpp b/ArduPlane/quadplane.cpp index d3c50175ee..152b89b642 100644 --- a/ArduPlane/quadplane.cpp +++ b/ArduPlane/quadplane.cpp @@ -727,7 +727,9 @@ bool QuadPlane::setup(void) // param count will have changed AP_Param::invalidate_count(); - gcs().send_text(MAV_SEVERITY_INFO, "QuadPlane initialised, class: %s, type: %s", motors->get_frame_string(), motors->get_type_string()); + char frame_and_type_string[30]; + motors->get_frame_and_type_string(frame_and_type_string, ARRAY_SIZE(frame_and_type_string)); + gcs().send_text(MAV_SEVERITY_INFO, "QuadPlane initialised, %s", frame_and_type_string); initialised = true; return true; }