Browse Source

Blimp: move from ENABLE_SCRIPTING to AP_SCRIPTING_ENABLED

gps-1.3.1
Peter Barker 3 years ago committed by Peter Barker
parent
commit
60932e04d5
  1. 2
      Blimp/Parameters.cpp
  2. 4
      Blimp/Parameters.h
  3. 4
      Blimp/system.cpp

2
Blimp/Parameters.cpp

@ -816,7 +816,7 @@ const AP_Param::GroupInfo ParametersG2::var_info[] = { @@ -816,7 +816,7 @@ const AP_Param::GroupInfo ParametersG2::var_info[] = {
// @User: Standard
AP_GROUPINFO("PILOT_SPEED_DN", 24, ParametersG2, pilot_speed_dn, 0),
#if ENABLE_SCRIPTING
#if AP_SCRIPTING_ENABLED
// @Group: SCR_
// @Path: ../libraries/AP_Scripting/AP_Scripting.cpp
AP_SUBGROUPINFO(scripting, "SCR_", 30, ParametersG2, AP_Scripting),

4
Blimp/Parameters.h

@ -309,9 +309,9 @@ public: @@ -309,9 +309,9 @@ public:
AP_Int16 land_alt_low;
#if ENABLE_SCRIPTING
#if AP_SCRIPTING_ENABLED
AP_Scripting scripting;
#endif // ENABLE_SCRIPTING
#endif // AP_SCRIPTING_ENABLED
AP_Float tuning_min;
AP_Float tuning_max;

4
Blimp/system.cpp

@ -83,9 +83,9 @@ void Blimp::init_ardupilot() @@ -83,9 +83,9 @@ void Blimp::init_ardupilot()
startup_INS_ground();
#if ENABLE_SCRIPTING
#if AP_SCRIPTING_ENABLED
g2.scripting.init();
#endif // ENABLE_SCRIPTING
#endif // AP_SCRIPTING_ENABLED
// we don't want writes to the serial port to cause us to pause
// mid-flight, so set the serial ports non-blocking once we are

Loading…
Cancel
Save