aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LandingGear: command_mode becomes enum

Browse Source
This commit is contained in:
Randy Mackay 2015-01-07 11:52:59 +09:00
parent 5f3c2bcd11
commit ed7e176c61
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_LandingGear/AP_LandingGear.cpp
View File

@ -72,15 +72,15 @@ void AP_LandingGear::update()
// force deployment if retract is not enabled // force deployment if retract is not enabled
deploy(); deploy();
// retract is disabled until switch is placed into deploy position to prevent accidental retraction on bootup if switch was left in retract position // retract is disabled until switch is placed into deploy position to prevent accidental retraction on bootup if switch was left in retract position
enable(_command_mode == COMMAND_MODE_DEPLOY); enable(_command_mode == LandingGear_Deploy);
return; return;
} }
if (_command_mode == COMMAND_MODE_DEPLOY){ if (_command_mode == LandingGear_Deploy){
deploy(); deploy();
} }
if (_command_mode == COMMAND_MODE_RETRACT){ if (_command_mode == LandingGear_Retract){
retract(); retract();
} }
} }

19
libraries/AP_LandingGear/AP_LandingGear.h
View File

@ -12,9 +12,12 @@
#define AP_LANDINGGEAR_SERVO_RETRACT_PWM_DEFAULT 1250 // default PWM value to move servo to when landing gear is up #define AP_LANDINGGEAR_SERVO_RETRACT_PWM_DEFAULT 1250 // default PWM value to move servo to when landing gear is up
#define AP_LANDINGGEAR_SERVO_DEPLOY_PWM_DEFAULT 1750 // default PWM value to move servo to when landing gear is down #define AP_LANDINGGEAR_SERVO_DEPLOY_PWM_DEFAULT 1750 // default PWM value to move servo to when landing gear is down
#define COMMAND_MODE_DEPLOY 0 // command gear to deploy // Gear command modes
#define COMMAND_MODE_AUTO 1 // command gear to actuate automatically enum LandingGearCommandMode {
#define COMMAND_MODE_RETRACT 2 // command gear to retract LandingGear_Deploy,
LandingGear_Auto,
LandingGear_Retract
};
/// @class AP_LandingGear /// @class AP_LandingGear
/// @brief Class managing the control of landing gear /// @brief Class managing the control of landing gear
@ -24,8 +27,10 @@ public:
/// Constructor /// Constructor
AP_LandingGear() : AP_LandingGear() :
_retract_enabled(false),
_deployed(false), _deployed(false),
_retract_enabled(false) _force_deploy(false),
_command_mode(LandingGear_Deploy)
{ {
// setup parameter defaults // setup parameter defaults
AP_Param::setup_object_defaults(this, var_info); AP_Param::setup_object_defaults(this, var_info);
@ -40,8 +45,10 @@ public:
/// update - should be called at 10hz /// update - should be called at 10hz
void update(); void update();
void set_cmd_mode(int8_t cmd) { _command_mode = cmd; } /// set_cmd_mode - set command mode to deploy, auto or retract
void set_cmd_mode(LandingGearCommandMode cmd) { _command_mode = cmd; }
/// force_deploy - set to true to force gear to deploy
void force_deploy(bool force) { _force_deploy = force;} void force_deploy(bool force) { _force_deploy = force;}
static const struct AP_Param::GroupInfo var_info[]; static const struct AP_Param::GroupInfo var_info[];
@ -57,7 +64,7 @@ private:
// internal variables // internal variables
bool _deployed; // true if the landing gear has been deployed, initialized false bool _deployed; // true if the landing gear has been deployed, initialized false
bool _force_deploy; // used by main code to force landing gear to deploy, such as in Land mode bool _force_deploy; // used by main code to force landing gear to deploy, such as in Land mode
int8_t _command_mode; // pilots commanded control mode: Manual Deploy, Auto, or Manual Retract LandingGearCommandMode _command_mode; // pilots commanded control mode: Manual Deploy, Auto, or Manual Retract
/// enable - enable landing gear retraction /// enable - enable landing gear retraction
void enable(bool on_off); void enable(bool on_off);