mirror of https://github.com/ArduPilot/ardupilot
Blimp: move from ENABLE_SCRIPTING to AP_SCRIPTING_ENABLED
This commit is contained in:
parent
bc39b8d74c
commit
60932e04d5
|
@ -816,7 +816,7 @@ const AP_Param::GroupInfo ParametersG2::var_info[] = {
|
||||||
// @User: Standard
|
// @User: Standard
|
||||||
AP_GROUPINFO("PILOT_SPEED_DN", 24, ParametersG2, pilot_speed_dn, 0),
|
AP_GROUPINFO("PILOT_SPEED_DN", 24, ParametersG2, pilot_speed_dn, 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_", 30, ParametersG2, AP_Scripting),
|
AP_SUBGROUPINFO(scripting, "SCR_", 30, ParametersG2, AP_Scripting),
|
||||||
|
|
|
@ -309,9 +309,9 @@ public:
|
||||||
AP_Int16 land_alt_low;
|
AP_Int16 land_alt_low;
|
||||||
|
|
||||||
|
|
||||||
#if ENABLE_SCRIPTING
|
#if AP_SCRIPTING_ENABLED
|
||||||
AP_Scripting scripting;
|
AP_Scripting scripting;
|
||||||
#endif // ENABLE_SCRIPTING
|
#endif // AP_SCRIPTING_ENABLED
|
||||||
|
|
||||||
AP_Float tuning_min;
|
AP_Float tuning_min;
|
||||||
AP_Float tuning_max;
|
AP_Float tuning_max;
|
||||||
|
|
|
@ -83,9 +83,9 @@ void Blimp::init_ardupilot()
|
||||||
|
|
||||||
startup_INS_ground();
|
startup_INS_ground();
|
||||||
|
|
||||||
#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
|
||||||
// mid-flight, so set the serial ports non-blocking once we are
|
// mid-flight, so set the serial ports non-blocking once we are
|
||||||
|
|
Loading…
Reference in New Issue