Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-21 15:23:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

ArduSub: move from ENABLE_SCRIPTING to AP_SCRIPTING_ENABLED

Browse Source
This commit is contained in:
Peter Barker 2021-11-15 16:08:34 +11:00 committed by Peter Barker
parent 70562021ac
commit bc39b8d74c
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduSub/Parameters.cpp
View File

@ -651,7 +651,7 @@ const AP_Param::GroupInfo ParametersG2::var_info[] = {
// @Path: ../libraries/RC_Channel/RC_Channels_VarInfo.h
AP_SUBGROUPINFO(rc_channels, "RC", 17, ParametersG2, RC_Channels),
#if ENABLE_SCRIPTING
#if AP_SCRIPTING_ENABLED
// @Group: SCR_
// @Path: ../libraries/AP_Scripting/AP_Scripting.cpp
AP_SUBGROUPINFO(scripting, "SCR_", 18, ParametersG2, AP_Scripting),

6
ArduSub/Parameters.h
View File

@ -4,7 +4,7 @@
#include <AP_Gripper/AP_Gripper.h>
#if ENABLE_SCRIPTING
#if AP_SCRIPTING_ENABLED
#include <AP_Scripting/AP_Scripting.h>
#endif
@ -335,9 +335,9 @@ public:
// control over servo output ranges
SRV_Channels servo_channels;
#if ENABLE_SCRIPTING
#if AP_SCRIPTING_ENABLED
AP_Scripting scripting;
#endif // ENABLE_SCRIPTING
#endif // AP_SCRIPTING_ENABLED
// Airspeed
AP_Airspeed airspeed;

2
ArduSub/Sub.h
View File

@ -106,7 +106,7 @@
#include <AP_Camera/AP_Camera.h> // Photo or video camera
#endif
#if ENABLE_SCRIPTING
#if AP_SCRIPTING_ENABLED
#include <AP_Scripting/AP_Scripting.h>
#endif

4
ArduSub/system.cpp
View File

@ -151,9 +151,9 @@ void Sub::init_ardupilot()
startup_INS_ground();
#if ENABLE_SCRIPTING
#if AP_SCRIPTING_ENABLED
g2.scripting.init();
#endif // ENABLE_SCRIPTING
#endif // AP_SCRIPTING_ENABLED
g2.airspeed.init();