Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Copter: rename SPRAYER-enabled-define to SPRAYER_ENABLED

Browse Source
This commit is contained in:
Peter Barker 2018-04-14 12:16:11 +10:00 committed by Randy Mackay
parent fb99ea0446
commit e3ddf7dadd
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduCopter/APM_Config.h
View File

@ -22,7 +22,7 @@
//#define ADSB_ENABLED DISABLED // disable ADSB support
//#define PRECISION_LANDING DISABLED // disable precision landing using companion computer or IRLock sensor
//#define BEACON_ENABLED DISABLED // disable beacon support
//#define SPRAYER DISABLED // disable the crop sprayer feature (two ESC controlled pumps the speed of which depends upon the vehicle's horizontal velocity)
//#define SPRAYER_ENABLED DISABLED // disable the crop sprayer feature (two ESC controlled pumps the speed of which depends upon the vehicle's horizontal velocity)
//#define WINCH_ENABLED DISABLED // disable winch support
//#define GRIPPER_ENABLED DISABLED // disable gripper support
//#define RPM_ENABLED DISABLED // disable rotations per minute sensor support

2
ArduCopter/ArduCopter.cpp
View File

@ -402,7 +402,7 @@ void Copter::three_hz_loop()
fence_check();
#endif // AC_FENCE_ENABLED
#if SPRAYER == ENABLED
#if SPRAYER_ENABLED == ENABLED
sprayer.update();
#endif

4
ArduCopter/Copter.h
View File

@ -101,7 +101,7 @@
#if AC_AVOID_ENABLED == ENABLED
#include <AC_Avoidance/AC_Avoid.h>
#endif
#if SPRAYER == ENABLED
#if SPRAYER_ENABLED == ENABLED
# include <AC_Sprayer/AC_Sprayer.h>
#endif
#if GRIPPER_ENABLED == ENABLED
@ -544,7 +544,7 @@ private:
AP_RSSI rssi;
// Crop Sprayer
#if SPRAYER == ENABLED
#if SPRAYER_ENABLED == ENABLED
AC_Sprayer sprayer;
#endif

2
ArduCopter/Parameters.cpp
View File

@ -644,7 +644,7 @@ const AP_Param::Info Copter::var_info[] = {
GOBJECT(BoardConfig_CAN, "CAN_", AP_BoardConfig_CAN),
#endif
#if SPRAYER == ENABLED
#if SPRAYER_ENABLED == ENABLED
// @Group: SPRAY_
// @Path: ../libraries/AC_Sprayer/AC_Sprayer.cpp
GOBJECT(sprayer, "SPRAY_", AC_Sprayer),

4
ArduCopter/config.h
View File

@ -219,8 +219,8 @@
//////////////////////////////////////////////////////////////////////////////
// Crop Sprayer - enabled only on larger firmwares
#ifndef SPRAYER
# define SPRAYER !HAL_MINIMIZE_FEATURES
#ifndef SPRAYER_ENABLED
# define SPRAYER_ENABLED !HAL_MINIMIZE_FEATURES
#endif
//////////////////////////////////////////////////////////////////////////////

2
ArduCopter/motors.cpp
View File

@ -198,7 +198,7 @@ bool Copter::init_arm_motors(bool arming_from_gcs)
ahrs.set_correct_centrifugal(true);
hal.util->set_soft_armed(true);
#if SPRAYER == ENABLED
#if SPRAYER_ENABLED == ENABLED
// turn off sprayer's test if on
sprayer.test_pump(false);
#endif