Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-26 17:53:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Copter: fix USER_PARAMS_ENABLED includes

Browse Source
This commit is contained in:
Pierre Kancir 2023-11-16 11:49:58 +01:00 committed by Peter Barker
parent e9fc99b1bf
commit d5584fe703
6 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ArduCopter/Copter.h
View File

@ -174,15 +174,14 @@
#error AP_OAPathPlanner relies on AP_FENCE_ENABLED which is disabled #error AP_OAPathPlanner relies on AP_FENCE_ENABLED which is disabled
#endif #endif
// Local modules
#ifdef USER_PARAMS_ENABLED
#include "UserParameters.h"
#endif
#include "Parameters.h"
#if HAL_ADSB_ENABLED #if HAL_ADSB_ENABLED
#include "avoidance_adsb.h" #include "avoidance_adsb.h"
#endif #endif
// Local modules
#include "Parameters.h"
#if USER_PARAMS_ENABLED
#include "UserParameters.h"
#endif
#include "mode.h" #include "mode.h"
class Copter : public AP_Vehicle { class Copter : public AP_Vehicle {

4
ArduCopter/Parameters.cpp
View File

@ -894,7 +894,7 @@ const AP_Param::GroupInfo ParametersG2::var_info[] = {
AP_SUBGROUPINFO(follow, "FOLL", 27, ParametersG2, AP_Follow), AP_SUBGROUPINFO(follow, "FOLL", 27, ParametersG2, AP_Follow),
#endif #endif
#ifdef USER_PARAMS_ENABLED #if USER_PARAMS_ENABLED == ENABLED
AP_SUBGROUPINFO(user_parameters, "USR", 28, ParametersG2, UserParameters), AP_SUBGROUPINFO(user_parameters, "USR", 28, ParametersG2, UserParameters),
#endif #endif
@ -1260,7 +1260,7 @@ ParametersG2::ParametersG2(void)
#if MODE_FOLLOW_ENABLED == ENABLED #if MODE_FOLLOW_ENABLED == ENABLED
,follow() ,follow()
#endif #endif
#ifdef USER_PARAMS_ENABLED #if USER_PARAMS_ENABLED == ENABLED
,user_parameters() ,user_parameters()
#endif #endif
#if AUTOTUNE_ENABLED == ENABLED #if AUTOTUNE_ENABLED == ENABLED

2
ArduCopter/Parameters.h
View File

@ -591,7 +591,7 @@ public:
AP_Follow follow; AP_Follow follow;
#endif #endif
#ifdef USER_PARAMS_ENABLED #if USER_PARAMS_ENABLED == ENABLED
// User custom parameters // User custom parameters
UserParameters user_parameters; UserParameters user_parameters;
#endif #endif

3
ArduCopter/UserParameters.cpp
View File

@ -1,5 +1,7 @@
#include "UserParameters.h" #include "UserParameters.h"
#include "config.h"
#if USER_PARAMS_ENABLED == ENABLED
// "USR" + 13 chars remaining for param name // "USR" + 13 chars remaining for param name
const AP_Param::GroupInfo UserParameters::var_info[] = { const AP_Param::GroupInfo UserParameters::var_info[] = {
@ -16,3 +18,4 @@ UserParameters::UserParameters()
{ {
AP_Param::setup_object_defaults(this, var_info); AP_Param::setup_object_defaults(this, var_info);
} }
#endif // USER_PARAMS_ENABLED

5
ArduCopter/config.h
View File

@ -27,6 +27,7 @@
/// change in your local copy of APM_Config.h. /// change in your local copy of APM_Config.h.
/// ///
#include "APM_Config.h" #include "APM_Config.h"
#include <AP_ADSB/AP_ADSB_config.h>
#include <AP_Follow/AP_Follow_config.h> #include <AP_Follow/AP_Follow_config.h>
@ -642,3 +643,7 @@
#ifndef AC_PAYLOAD_PLACE_ENABLED #ifndef AC_PAYLOAD_PLACE_ENABLED
#define AC_PAYLOAD_PLACE_ENABLED 1 #define AC_PAYLOAD_PLACE_ENABLED 1
#endif #endif
#ifndef USER_PARAMS_ENABLED
#define USER_PARAMS_ENABLED DISABLED
#endif

4
ArduCopter/toy_mode.h
View File

@ -1,5 +1,9 @@
#pragma once #pragma once
#include <stdint.h>
#include <AP_Param/AP_Param.h>
#include "mode.h"
/* /*
class to support "toy" mode for simplified user interaction for class to support "toy" mode for simplified user interaction for
large volume consumer vehicles large volume consumer vehicles