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

Rover: move from ENABLE_SCRIPTING to AP_SCRIPTING_ENABLED

Browse Source
This commit is contained in:
Peter Barker 2021-11-15 16:08:35 +11:00 committed by Peter Barker
parent 60932e04d5
commit 9a5520a811
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Rover/Parameters.cpp
View File

@ -600,7 +600,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 ENABLE_SCRIPTING #if AP_SCRIPTING_ENABLED
// @Group: SCR_ // @Group: SCR_
// @Path: ../libraries/AP_Scripting/AP_Scripting.cpp // @Path: ../libraries/AP_Scripting/AP_Scripting.cpp
AP_SUBGROUPINFO(scripting, "SCR_", 41, ParametersG2, AP_Scripting), AP_SUBGROUPINFO(scripting, "SCR_", 41, ParametersG2, AP_Scripting),

4
Rover/Parameters.h
View File

@ -383,9 +383,9 @@ public:
// stick mixing for auto modes // stick mixing for auto modes
AP_Int8 stick_mixing; AP_Int8 stick_mixing;
#if ENABLE_SCRIPTING #if AP_SCRIPTING_ENABLED
AP_Scripting scripting; AP_Scripting scripting;
#endif // ENABLE_SCRIPTING #endif // AP_SCRIPTING_ENABLED
// waypoint navigation // waypoint navigation
AR_WPNav wp_nav; AR_WPNav wp_nav;

4
Rover/Rover.cpp
View File

@ -139,7 +139,7 @@ Rover::Rover(void) :
{ {
} }
#if ENABLE_SCRIPTING #if AP_SCRIPTING_ENABLED
// set target location (for use by scripting) // set target location (for use by scripting)
bool Rover::set_target_location(const Location& target_loc) bool Rover::set_target_location(const Location& target_loc)
{ {
@ -218,7 +218,7 @@ bool Rover::get_control_output(AP_Vehicle::ControlOutput control_output, float &
} }
return false; return false;
} }
#endif // ENABLE_SCRIPTING #endif // AP_SCRIPTING_ENABLED
#if STATS_ENABLED == ENABLED #if STATS_ENABLED == ENABLED
/* /*

6
Rover/Rover.h
View File

@ -72,7 +72,7 @@
#include <AP_Torqeedo/AP_Torqeedo.h> #include <AP_Torqeedo/AP_Torqeedo.h>
#include <AP_AIS/AP_AIS.h> #include <AP_AIS/AP_AIS.h>
#if ENABLE_SCRIPTING #if AP_SCRIPTING_ENABLED
#include <AP_Scripting/AP_Scripting.h> #include <AP_Scripting/AP_Scripting.h>
#endif #endif
@ -266,12 +266,12 @@ private:
private: private:
// Rover.cpp // Rover.cpp
#if ENABLE_SCRIPTING #if AP_SCRIPTING_ENABLED
bool set_target_location(const Location& target_loc) override; bool set_target_location(const Location& target_loc) override;
bool set_target_velocity_NED(const Vector3f& vel_ned) override; bool set_target_velocity_NED(const Vector3f& vel_ned) override;
bool set_steering_and_throttle(float steering, float throttle) override; bool set_steering_and_throttle(float steering, float throttle) override;
bool get_control_output(AP_Vehicle::ControlOutput control_output, float &control_value) override; bool get_control_output(AP_Vehicle::ControlOutput control_output, float &control_value) override;
#endif // ENABLE_SCRIPTING #endif // AP_SCRIPTING_ENABLED
void stats_update(); void stats_update();
void ahrs_update(); void ahrs_update();
void gcs_failsafe_check(void); void gcs_failsafe_check(void);

4
Rover/system.cpp
View File

@ -163,9 +163,9 @@ void Rover::startup_ground(void)
); );
#endif #endif
#if ENABLE_SCRIPTING #if AP_SCRIPTING_ENABLED
g2.scripting.init(); g2.scripting.init();
#endif // ENABLE_SCRIPTING #endif // AP_SCRIPTING_ENABLED
// we don't want writes to the serial port to cause us to pause // we don't want writes to the serial port to cause us to pause
// so set serial ports non-blocking once we are ready to drive // so set serial ports non-blocking once we are ready to drive