aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_OSD: convert APM_BUILD_COPTER_OR_HELI() to APM_BUILD_COPTER_OR_HELI

Browse Source
This commit is contained in:
Andy Piper 2021-10-25 18:11:25 +01:00 committed by Andrew Tridgell
parent 6a00819b2d
commit 97b57519bf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_OSD/AP_OSD_ParamScreen.cpp
View File

@ -125,7 +125,7 @@ static const char* event_names[5] = {
#endif #endif
static const AP_OSD_ParamSetting::Initializer PARAM_DEFAULTS[AP_OSD_NUM_PARAM_SCREENS][AP_OSD_ParamScreen::NUM_PARAMS] { static const AP_OSD_ParamSetting::Initializer PARAM_DEFAULTS[AP_OSD_NUM_PARAM_SCREENS][AP_OSD_ParamScreen::NUM_PARAMS] {
#if APM_BUILD_COPTER_OR_HELI() #if APM_BUILD_COPTER_OR_HELI
{ {
{ 1, { 102, 0, 4033 }, OSD_PARAM_NONE }, // ATC_RAT_RLL_P { 1, { 102, 0, 4033 }, OSD_PARAM_NONE }, // ATC_RAT_RLL_P
{ 2, { 102, 0, 129 }, OSD_PARAM_NONE }, // ATC_RAT_RLL_D { 2, { 102, 0, 129 }, OSD_PARAM_NONE }, // ATC_RAT_RLL_D

4
libraries/AP_OSD/AP_OSD_ParamSetting.cpp
View File

@ -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 // 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 // common labels - all strings must be upper case
#if APM_BUILD_TYPE(APM_BUILD_ArduPlane) || APM_BUILD_COPTER_OR_HELI() #if APM_BUILD_TYPE(APM_BUILD_ArduPlane) || APM_BUILD_COPTER_OR_HELI
static const char* SERIAL_PROTOCOL_VALUES[] = { static const char* SERIAL_PROTOCOL_VALUES[] = {
"", "MAV", "MAV2", "FSKY_D", "FSKY_S", "GPS", "", "ALEX", "STORM", "RNG", "", "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 { 0, 3, 1, ARRAY_SIZE(FS_LNG_ACTNS), FS_LNG_ACTNS }, // OSD_PARAM_FAILSAFE_ACTION_2
}; };
#elif APM_BUILD_COPTER_OR_HELI() #elif APM_BUILD_COPTER_OR_HELI
static const char* AUX_OPTIONS[] = { static const char* AUX_OPTIONS[] = {
"NONE", "", "FLIP", "SIMP", "RTL", "SAV_TRM", "", "SAV_WP", "", "CAM_TRG", "NONE", "", "FLIP", "SIMP", "RTL", "SAV_TRM", "", "SAV_WP", "", "CAM_TRG",