ArduSub: ensure ENABLE_SCRIPTING is always defined

This commit is contained in:
Peter Barker 2021-11-15 12:16:28 +11:00 committed by Peter Barker
parent 203103bae5
commit 9bc9179d8d
4 changed files with 5 additions and 5 deletions

View File

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

View File

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

View File

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

View File

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