From e5488e1869454c652139796114792968fa897a34 Mon Sep 17 00:00:00 2001 From: Gone4Dirt Date: Tue, 28 Sep 2021 10:17:43 +0100 Subject: [PATCH] AP_OSD: Add APM_BUILD_Heli --- libraries/AP_OSD/AP_OSD_ParamScreen.cpp | 2 +- libraries/AP_OSD/AP_OSD_ParamSetting.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AP_OSD/AP_OSD_ParamScreen.cpp b/libraries/AP_OSD/AP_OSD_ParamScreen.cpp index 288e8dde16..29d8d8d0f8 100644 --- a/libraries/AP_OSD/AP_OSD_ParamScreen.cpp +++ b/libraries/AP_OSD/AP_OSD_ParamScreen.cpp @@ -125,7 +125,7 @@ static const char* event_names[5] = { #endif static const AP_OSD_ParamSetting::Initializer PARAM_DEFAULTS[AP_OSD_NUM_PARAM_SCREENS][AP_OSD_ParamScreen::NUM_PARAMS] { -#if APM_BUILD_TYPE(APM_BUILD_ArduCopter) +#if APM_BUILD_COPTER_OR_HELI() { { 1, { 102, 0, 4033 }, OSD_PARAM_NONE }, // ATC_RAT_RLL_P { 2, { 102, 0, 129 }, OSD_PARAM_NONE }, // ATC_RAT_RLL_D diff --git a/libraries/AP_OSD/AP_OSD_ParamSetting.cpp b/libraries/AP_OSD/AP_OSD_ParamSetting.cpp index 8c30b3c02b..0bf02dc8ed 100644 --- a/libraries/AP_OSD/AP_OSD_ParamSetting.cpp +++ b/libraries/AP_OSD/AP_OSD_ParamSetting.cpp @@ -109,7 +109,7 @@ const AP_Param::GroupInfo AP_OSD_ParamSetting::var_info[] = { // at the cost of a little flash, we can create much better ranges and values for certain important settings // common labels - all strings must be upper case -#if APM_BUILD_TYPE(APM_BUILD_ArduPlane) || APM_BUILD_TYPE(APM_BUILD_ArduCopter) +#if APM_BUILD_TYPE(APM_BUILD_ArduPlane) || APM_BUILD_COPTER_OR_HELI() static const char* SERIAL_PROTOCOL_VALUES[] = { "", "MAV", "MAV2", "FSKY_D", "FSKY_S", "GPS", "", "ALEX", "STORM", "RNG", @@ -182,7 +182,7 @@ const AP_OSD_ParamSetting::ParamMetadata AP_OSD_ParamSetting::_param_metadata[OS { 0, 3, 1, ARRAY_SIZE(FS_LNG_ACTNS), FS_LNG_ACTNS }, // OSD_PARAM_FAILSAFE_ACTION_2 }; -#elif APM_BUILD_TYPE(APM_BUILD_ArduCopter) +#elif APM_BUILD_COPTER_OR_HELI() static const char* AUX_OPTIONS[] = { "NONE", "", "FLIP", "SIMP", "RTL", "SAV_TRM", "", "SAV_WP", "", "CAM_TRG",