Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Plane: added FENCE_ACTION=3 behaviour 

this makes it safer to enable the geofence as a receiver failsafe
mode. It retains manual throttle control, so if it triggers on the
ground due to the receiver losing signal from the transmitter then the
throttle can be kept low, preventing an unexpected takeoff.
This commit is contained in:
Andrew Tridgell 2013-09-08 07:31:10 +10:00
parent 7328369b91
commit f6688582a6
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ArduPlane/ArduPlane.pde
View File

@ -268,6 +268,9 @@ SITL sitl;
static bool training_manual_roll; // user has manual roll control static bool training_manual_roll; // user has manual roll control
static bool training_manual_pitch; // user has manual pitch control static bool training_manual_pitch; // user has manual pitch control
// should throttle be pass-thru in guided?
static bool guided_throttle_passthru;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// GCS selection // GCS selection
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

4
ArduPlane/Attitude.pde
View File

@ -743,6 +743,10 @@ static void set_servos(void)
// manual pass through of throttle while in FBWA or // manual pass through of throttle while in FBWA or
// STABILIZE mode with THR_PASS_STAB set // STABILIZE mode with THR_PASS_STAB set
channel_throttle->radio_out = channel_throttle->radio_in; channel_throttle->radio_out = channel_throttle->radio_in;
} else if (control_mode == GUIDED &&
guided_throttle_passthru) {
// manual pass through of throttle while in GUIDED
channel_throttle->radio_out = channel_throttle->radio_in;
} else { } else {
// normal throttle calculation based on servo_out // normal throttle calculation based on servo_out
channel_throttle->calc_pwm(); channel_throttle->calc_pwm();

4
ArduPlane/Parameters.pde
View File

@ -207,8 +207,8 @@ const AP_Param::Info var_info[] PROGMEM = {
#if GEOFENCE_ENABLED == ENABLED #if GEOFENCE_ENABLED == ENABLED
// @Param: FENCE_ACTION // @Param: FENCE_ACTION
// @DisplayName: Action on geofence breach // @DisplayName: Action on geofence breach
// @Description: What to do on fence breach // @Description: What to do on fence breach. If this is set to 0 then no action is taken, and geofencing is disabled. If this is set to 1 then the plane will enter GUIDED mode, with the target waypoint as the fence return point. If this is set to 2 then the fence breach is reported to the ground station, but no other action is taken. If set to 3 then the plane enters guided mode but the pilot retains manual throttle control.
// @Values: 0:None,1:GuidedMode,2:ReportOnly // @Values: 0:None,1:GuidedMode,2:ReportOnly,3:GuidedModeThrPass
// @User: Standard // @User: Standard
GSCALAR(fence_action, "FENCE_ACTION", 0), GSCALAR(fence_action, "FENCE_ACTION", 0),

6
ArduPlane/geofence.pde
View File

@ -180,7 +180,7 @@ static void geofence_check(bool altitude_check_only)
// switch back to the chosen control mode if still in // switch back to the chosen control mode if still in
// GUIDED to the return point // GUIDED to the return point
if (geofence_state != NULL && if (geofence_state != NULL &&
g.fence_action == FENCE_ACTION_GUIDED && (g.fence_action == FENCE_ACTION_GUIDED || g.fence_action == FENCE_ACTION_GUIDED_THR_PASS) &&
g.fence_channel != 0 && g.fence_channel != 0 &&
control_mode == GUIDED && control_mode == GUIDED &&
g.fence_total >= 5 && g.fence_total >= 5 &&
@ -264,6 +264,7 @@ static void geofence_check(bool altitude_check_only)
break; break;
case FENCE_ACTION_GUIDED: case FENCE_ACTION_GUIDED:
case FENCE_ACTION_GUIDED_THR_PASS:
// fly to the return point, with an altitude half way between // fly to the return point, with an altitude half way between
// min and max // min and max
if (g.fence_minalt >= g.fence_maxalt) { if (g.fence_minalt >= g.fence_maxalt) {
@ -286,6 +287,9 @@ static void geofence_check(bool altitude_check_only)
} }
set_mode(GUIDED); set_mode(GUIDED);
if (g.fence_action == FENCE_ACTION_GUIDED_THR_PASS) {
guided_throttle_passthru = true;
}
break; break;
} }

1
ArduPlane/system.pde
View File

@ -343,6 +343,7 @@ static void set_mode(enum FlightMode mode)
break; break;
case GUIDED: case GUIDED:
guided_throttle_passthru = false;
set_guided_WP(); set_guided_WP();
break; break;