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

Rover: move scripting up to AP_Vehicle

This commit is contained in:
Peter Barker 2024-01-30 14:53:43 +11:00 committed by Andrew Tridgell
parent 78e3719835
commit b315192dcf
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Rover/Parameters.cpp
View File

@ -601,11 +601,7 @@ const AP_Param::GroupInfo ParametersG2::var_info[] = {
// @User: Standard // @User: Standard
AP_GROUPINFO("BAL_PITCH_TRIM", 40, ParametersG2, bal_pitch_trim, 0), AP_GROUPINFO("BAL_PITCH_TRIM", 40, ParametersG2, bal_pitch_trim, 0),
#if AP_SCRIPTING_ENABLED // 41 was Scripting
// @Group: SCR_
// @Path: ../libraries/AP_Scripting/AP_Scripting.cpp
AP_SUBGROUPINFO(scripting, "SCR_", 41, ParametersG2, AP_Scripting),
#endif
// @Param: STICK_MIXING // @Param: STICK_MIXING
// @DisplayName: Stick Mixing // @DisplayName: Stick Mixing
@ -933,5 +929,19 @@ void Rover::load_parameters(void)
AP_Param::convert_class(stats_info.old_key, &stats, stats.var_info, stats_old_index, stats_old_top_element, false); AP_Param::convert_class(stats_info.old_key, &stats, stats.var_info, stats_old_index, stats_old_top_element, false);
} }
#endif #endif
// PARAMETER_CONVERSION - Added: Jan-2024 for Rover-4.6
#if AP_SCRIPTING_ENABLED
{
// Find G2's Top Level Key
AP_Param::ConversionInfo scripting_info;
if (!AP_Param::find_top_level_key_by_pointer(&g2, scripting_info.old_key)) {
return;
}
const uint16_t scripting_old_index = 41; // Old parameter index in g2
const uint16_t scripting_old_top_element = 105; // Old group element in the tree for the first subgroup element (see AP_PARAM_KEY_DUMP)
AP_Param::convert_class(scripting_info.old_key, &scripting, scripting.var_info, scripting_old_index, scripting_old_top_element, false);
}
#endif
} }

4
Rover/Parameters.h
View File

@ -396,10 +396,6 @@ public:
// stick mixing for auto modes // stick mixing for auto modes
AP_Int8 stick_mixing; AP_Int8 stick_mixing;
#if AP_SCRIPTING_ENABLED
AP_Scripting scripting;
#endif // AP_SCRIPTING_ENABLED
// waypoint navigation // waypoint navigation
AR_WPNav_OA wp_nav; AR_WPNav_OA wp_nav;

4
Rover/system.cpp
View File

@ -174,10 +174,6 @@ void Rover::startup_ground(void)
FUNCTOR_BIND(&rover, &Rover::Log_Write_Vehicle_Startup_Messages, void) FUNCTOR_BIND(&rover, &Rover::Log_Write_Vehicle_Startup_Messages, void)
); );
#endif #endif
#if AP_SCRIPTING_ENABLED
g2.scripting.init();
#endif // AP_SCRIPTING_ENABLED
} }
// update the ahrs flyforward setting which can allow // update the ahrs flyforward setting which can allow