Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

ArduSub: 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 894860880d
commit bd8fdd29d8
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ArduSub/Parameters.cpp
View File

@ -63,9 +63,7 @@ const AP_Param::Info Sub::var_info[] = {
// @Increment: .5 // @Increment: .5
GSCALAR(throttle_filt, "PILOT_THR_FILT", 0), GSCALAR(throttle_filt, "PILOT_THR_FILT", 0),
// @Group: SERIAL // AP_SerialManager was here
// @Path: ../libraries/AP_SerialManager/AP_SerialManager.cpp
GOBJECT(serial_manager, "SERIAL", AP_SerialManager),
// @Param: GCS_PID_MASK // @Param: GCS_PID_MASK
// @DisplayName: GCS PID tuning mask // @DisplayName: GCS PID tuning mask
@ -775,6 +773,15 @@ void Sub::load_parameters()
#if HAL_LOGGING_ENABLED #if HAL_LOGGING_ENABLED
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
{ &serial_manager, serial_manager.var_info, Parameters::k_param_serial_manager_old },
#endif
};
AP_Param::convert_toplevel_objects(toplevel_conversions, ARRAY_SIZE(toplevel_conversions));
} }
void Sub::convert_old_parameters() void Sub::convert_old_parameters()

2
ArduSub/Parameters.h
View File

@ -61,7 +61,7 @@ public:
k_param_BoardConfig = 20, // Board configuration (Pixhawk/Linux/etc) k_param_BoardConfig = 20, // Board configuration (Pixhawk/Linux/etc)
k_param_scheduler, // Scheduler (for debugging/perf_info) k_param_scheduler, // Scheduler (for debugging/perf_info)
k_param_logger, // AP_Logger Logging k_param_logger, // AP_Logger Logging
k_param_serial_manager, // Serial ports, AP_SerialManager k_param_serial_manager_old, // Serial ports, AP_SerialManager
k_param_notify, // Notify Library, AP_Notify k_param_notify, // Notify Library, AP_Notify
k_param_arming = 26, // Arming checks k_param_arming = 26, // Arming checks
k_param_can_mgr, k_param_can_mgr,