From 214463c2bb2aa3c7642b2753be6e26ac5ddca665 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Mon, 9 Oct 2023 09:13:46 +0900 Subject: [PATCH 1/3] AP_OpenDroneID: fix comment typo --- libraries/AP_OpenDroneID/AP_OpenDroneID.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/AP_OpenDroneID/AP_OpenDroneID.cpp b/libraries/AP_OpenDroneID/AP_OpenDroneID.cpp index f43289d248380..5c7ab0ced375c 100644 --- a/libraries/AP_OpenDroneID/AP_OpenDroneID.cpp +++ b/libraries/AP_OpenDroneID/AP_OpenDroneID.cpp @@ -554,7 +554,7 @@ void AP_OpenDroneID::send_operator_id_message() */ MAV_ODID_HOR_ACC AP_OpenDroneID::create_enum_horizontal_accuracy(float accuracy) const { - // Out of bounds return UKNOWN flag + // Out of bounds return UNKNOWN flag if (accuracy < 0.0 || accuracy >= 18520.0) { return MAV_ODID_HOR_ACC_UNKNOWN; } @@ -595,7 +595,7 @@ MAV_ODID_HOR_ACC AP_OpenDroneID::create_enum_horizontal_accuracy(float accuracy) */ MAV_ODID_VER_ACC AP_OpenDroneID::create_enum_vertical_accuracy(float accuracy) const { - // Out of bounds return UKNOWN flag + // Out of bounds return UNKNOWN flag if (accuracy < 0.0 || accuracy >= 150.0) { return MAV_ODID_VER_ACC_UNKNOWN; } @@ -630,7 +630,7 @@ MAV_ODID_VER_ACC AP_OpenDroneID::create_enum_vertical_accuracy(float accuracy) c */ MAV_ODID_SPEED_ACC AP_OpenDroneID::create_enum_speed_accuracy(float accuracy) const { - // Out of bounds return UKNOWN flag + // Out of bounds return UNKNOWN flag if (accuracy < 0.0 || accuracy >= 10.0) { return MAV_ODID_SPEED_ACC_UNKNOWN; } @@ -657,7 +657,7 @@ MAV_ODID_SPEED_ACC AP_OpenDroneID::create_enum_speed_accuracy(float accuracy) co */ MAV_ODID_TIME_ACC AP_OpenDroneID::create_enum_timestamp_accuracy(float accuracy) const { - // Out of bounds return UKNOWN flag + // Out of bounds return UNKNOWN flag if (accuracy < 0.0 || accuracy >= 1.5) { return MAV_ODID_TIME_ACC_UNKNOWN; } From a3b7b748f75e696a67f57a2dcaf81baae8a52f20 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Mon, 9 Oct 2023 09:14:24 +0900 Subject: [PATCH 2/3] AP_Winch: fix daiwa unknown spelling --- libraries/AP_Winch/AP_Winch_Daiwa.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_Winch/AP_Winch_Daiwa.cpp b/libraries/AP_Winch/AP_Winch_Daiwa.cpp index ab1f5ac8e09d4..e0c8aab3cab85 100644 --- a/libraries/AP_Winch/AP_Winch_Daiwa.cpp +++ b/libraries/AP_Winch/AP_Winch_Daiwa.cpp @@ -344,7 +344,7 @@ void AP_Winch_Daiwa::update_user() if (latest.moving < ARRAY_SIZE(moving_str)) { GCS_SEND_TEXT(MAV_SEVERITY_INFO, "%s %s", send_text_prefix, moving_str[latest.moving]); } else { - GCS_SEND_TEXT(MAV_SEVERITY_INFO, "%s move state uknown", send_text_prefix); + GCS_SEND_TEXT(MAV_SEVERITY_INFO, "%s move state unknown", send_text_prefix); } update_sent = true; } @@ -357,7 +357,7 @@ void AP_Winch_Daiwa::update_user() if (user_update.clutch < ARRAY_SIZE(clutch_str)) { GCS_SEND_TEXT(MAV_SEVERITY_INFO, "%s clutch %s", send_text_prefix, clutch_str[latest.moving]); } else { - GCS_SEND_TEXT(MAV_SEVERITY_INFO, "%s clutch state uknown", send_text_prefix); + GCS_SEND_TEXT(MAV_SEVERITY_INFO, "%s clutch state unknown", send_text_prefix); } update_sent = true; } From 296de864e5de4e9eec2ab5736d9d813983e1e853 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Mon, 9 Oct 2023 09:21:31 +0900 Subject: [PATCH 3/3] AP_Winch: pos control user output fix --- libraries/AP_Winch/AP_Winch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/AP_Winch/AP_Winch.cpp b/libraries/AP_Winch/AP_Winch.cpp index 5a5a7bc9b9074..4a3a41db4021e 100644 --- a/libraries/AP_Winch/AP_Winch.cpp +++ b/libraries/AP_Winch/AP_Winch.cpp @@ -110,7 +110,7 @@ void AP_Winch::release_length(float length) // display verbose output to user if (backend->option_enabled(Options::VerboseOutput)) { - GCS_SEND_TEXT(MAV_SEVERITY_INFO, "Winch: lowering %4.1fm to %4.1fm", (double)length, (double)config.length_desired); + GCS_SEND_TEXT(MAV_SEVERITY_INFO, "Winch: %s %4.1fm to %4.1fm", is_negative(length) ? "raising" : "lowering", (double)fabsf(length), (double)config.length_desired); } }