Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-03-11 17:13:56 -03:00
Code Issues Packages Projects Releases Wiki Activity

Rover: move serial_manager parameters up to base class

Browse Source
This commit is contained in:
Peter Barker 2024-02-28 15:57:47 +11:00 committed by Peter Barker
parent bd8fdd29d8
commit 0d43f93160
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Rover/Parameters.cpp
View File

@ -274,9 +274,7 @@ const AP_Param::Info Rover::var_info[] = {
GOBJECTN(_gcs.chan_parameters[6], gcs6, "SR6_", GCS_MAVLINK_Parameters), GOBJECTN(_gcs.chan_parameters[6], gcs6, "SR6_", GCS_MAVLINK_Parameters),
#endif #endif
// @Group: SERIAL // AP_SerialManager was here
// @Path: ../libraries/AP_SerialManager/AP_SerialManager.cpp
GOBJECT(serial_manager, "SERIAL", AP_SerialManager),
// @Group: RNGFND // @Group: RNGFND
// @Path: ../libraries/AP_RangeFinder/AP_RangeFinder.cpp // @Path: ../libraries/AP_RangeFinder/AP_RangeFinder.cpp
@ -909,4 +907,13 @@ void Rover::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 Rover-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));
} }

2
Rover/Parameters.h
View File

@ -89,7 +89,7 @@ public:
k_param_gcs2, // stream rates for SERIAL2 k_param_gcs2, // stream rates for SERIAL2
k_param_serial2_baud_old, // unused k_param_serial2_baud_old, // unused
k_param_serial2_protocol, // deprecated, can be deleted k_param_serial2_protocol, // deprecated, can be deleted
k_param_serial_manager, // serial manager library k_param_serial_manager_old, // serial manager library
k_param_cli_enabled_old, // unused k_param_cli_enabled_old, // unused
k_param_gcs3, k_param_gcs3,
k_param_gcs_pid_mask, k_param_gcs_pid_mask,