Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AntennaTracker: move serial_manager parameters up to base class

This commit is contained in:
Peter Barker 2024-02-28 15:51:15 +11:00 committed by Peter Barker
parent 4027b32b07
commit 894860880d
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
AntennaTracker/Parameters.cpp
View File

@ -309,9 +309,7 @@ const AP_Param::Info Tracker::var_info[] = {
// @Path: ../libraries/SRV_Channel/SRV_Channels.cpp // @Path: ../libraries/SRV_Channel/SRV_Channels.cpp
GOBJECT(servo_channels, "SERVO", SRV_Channels), GOBJECT(servo_channels, "SERVO", SRV_Channels),
// @Group: SERIAL // AP_SerialManager was here
// @Path: ../libraries/AP_SerialManager/AP_SerialManager.cpp
GOBJECT(serial_manager, "SERIAL", AP_SerialManager),
// @Param: PITCH2SRV_P // @Param: PITCH2SRV_P
// @DisplayName: Pitch axis controller P gain // @DisplayName: Pitch axis controller P gain
@ -601,6 +599,15 @@ void Tracker::load_parameters(void)
AP_Param::convert_class(g.k_param_logger, &logger, logger.var_info, 0, true); AP_Param::convert_class(g.k_param_logger, &logger, logger.var_info, 0, true);
#endif #endif
static const AP_Param::TopLevelObjectConversion toplevel_conversions[] {
#if AP_SERIALMANAGER_ENABLED
// PARAMETER_CONVERSION - Added: Feb-2024 for Tracker-4.6
{ &serial_manager, serial_manager.var_info, Parameters::k_param_serial_manager_old },
#endif
};
AP_Param::convert_toplevel_objects(toplevel_conversions, ARRAY_SIZE(toplevel_conversions));
#if HAL_HAVE_SAFETY_SWITCH #if HAL_HAVE_SAFETY_SWITCH
// configure safety switch to allow stopping the motors while armed // configure safety switch to allow stopping the motors while armed
AP_Param::set_default_by_name("BRD_SAFETYOPTION", AP_BoardConfig::BOARD_SAFETY_OPTION_BUTTON_ACTIVE_SAFETY_OFF| AP_Param::set_default_by_name("BRD_SAFETYOPTION", AP_BoardConfig::BOARD_SAFETY_OPTION_BUTTON_ACTIVE_SAFETY_OFF|

5
AntennaTracker/Parameters.h
View File

@ -91,10 +91,7 @@ public:
k_param_can_mgr, k_param_can_mgr,
k_param_battery, k_param_battery,
// k_param_serial_manager_old = 144, // serial manager library
// 150: Telemetry control
//
k_param_serial_manager, // serial manager library
k_param_servo_yaw_type, k_param_servo_yaw_type,
k_param_alt_source, k_param_alt_source,
k_param_mavlink_update_rate, k_param_mavlink_update_rate,