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

Plane: correct compilation when parachute disabled

Browse Source
This commit is contained in:
Peter Barker 2017-01-03 14:58:07 +11:00 committed by Tom Pittenger
parent a233024e05
commit af9729c126
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduPlane/Plane.h
View File

@ -1092,10 +1092,12 @@ private:
void init_capabilities(void);
void dataflash_periodic(void);
uint16_t throttle_min(void) const;
void do_parachute(const AP_Mission::Mission_Command& cmd);
void parachute_check();
#if PARACHUTE == ENABLED
void do_parachute(const AP_Mission::Mission_Command& cmd);
void parachute_release();
bool parachute_manual_release();
#endif
void accel_cal_update(void);
void update_soft_armed();

6
ArduPlane/parachute.cpp
View File

@ -6,9 +6,13 @@
*/
void Plane::parachute_check()
{
#if PARACHUTE == ENABLED
parachute.update();
#endif
}
#if PARACHUTE == ENABLED
/*
parachute_release - trigger the release of the parachute
*/
@ -49,3 +53,5 @@ bool Plane::parachute_manual_release()
return true;
}
#endif