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

Revert "Copter: Remove CH7 & CH8 Enable / Disable of GeoFence" 

This reverts commit e25b8933f3.
This commit is contained in:
Randy Mackay 2013-07-20 15:00:08 +09:00
parent 7ea971d948
commit c937fe45e1
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduCopter/Parameters.pde
View File

@ -405,14 +405,14 @@ const AP_Param::Info var_info[] PROGMEM = {
// @Param: CH7_OPT // @Param: CH7_OPT
// @DisplayName: Channel 7 option // @DisplayName: Channel 7 option
// @Description: Select which function if performed when CH7 is above 1800 pwm // @Description: Select which function if performed when CH7 is above 1800 pwm
// @Values: 0:Do Nothing, 2:Flip, 3:Simple Mode, 4:RTL, 5:Save Trim, 7:Save WP, 8:Multi Mode, 9:Camera Trigger, 10:Sonar, 12:ResetToArmedYaw // @Values: 0:Do Nothing, 2:Flip, 3:Simple Mode, 4:RTL, 5:Save Trim, 7:Save WP, 8:Multi Mode, 9:Camera Trigger, 10:Sonar, 11:Fence, 12:ResetToArmedYaw
// @User: Standard // @User: Standard
GSCALAR(ch7_option, "CH7_OPT", CH7_OPTION), GSCALAR(ch7_option, "CH7_OPT", CH7_OPTION),
// @Param: CH8_OPT // @Param: CH8_OPT
// @DisplayName: Channel 8 option // @DisplayName: Channel 8 option
// @Description: Select which function if performed when CH8 is above 1800 pwm // @Description: Select which function if performed when CH8 is above 1800 pwm
// @Values: 0:Do Nothing, 2:Flip, 3:Simple Mode, 4:RTL, 5:Save Trim, 7:Save WP, 8:Multi Mode, 9:Camera Trigger, 10:Sonar, 12:ResetToArmedYaw // @Values: 0:Do Nothing, 2:Flip, 3:Simple Mode, 4:RTL, 5:Save Trim, 7:Save WP, 8:Multi Mode, 9:Camera Trigger, 10:Sonar, 11:Fence, 12:ResetToArmedYaw
// @User: Standard // @User: Standard
GSCALAR(ch8_option, "CH8_OPT", CH8_OPTION), GSCALAR(ch8_option, "CH8_OPT", CH8_OPTION),

8
ArduCopter/control_modes.pde
View File

@ -86,6 +86,7 @@ static void init_aux_switches()
switch(g.ch7_option) { switch(g.ch7_option) {
case AUX_SWITCH_SIMPLE_MODE: case AUX_SWITCH_SIMPLE_MODE:
case AUX_SWITCH_SONAR: case AUX_SWITCH_SONAR:
case AUX_SWITCH_FENCE:
case AUX_SWITCH_RESETTOARMEDYAW: case AUX_SWITCH_RESETTOARMEDYAW:
do_aux_switch_function(g.ch7_option, ap_system.CH7_flag); do_aux_switch_function(g.ch7_option, ap_system.CH7_flag);
break; break;
@ -100,6 +101,7 @@ static void init_aux_switches()
switch(g.ch8_option) { switch(g.ch8_option) {
case AUX_SWITCH_SIMPLE_MODE: case AUX_SWITCH_SIMPLE_MODE:
case AUX_SWITCH_SONAR: case AUX_SWITCH_SONAR:
case AUX_SWITCH_FENCE:
case AUX_SWITCH_RESETTOARMEDYAW: case AUX_SWITCH_RESETTOARMEDYAW:
do_aux_switch_function(g.ch8_option, ap_system.CH8_flag); do_aux_switch_function(g.ch8_option, ap_system.CH8_flag);
break; break;
@ -217,6 +219,12 @@ static void do_aux_switch_function(int8_t ch_function, bool ch_flag)
g.sonar_enabled = ch_flag; g.sonar_enabled = ch_flag;
break; break;
#if AC_FENCE == ENABLED
case AUX_SWITCH_FENCE:
// enable or disable the fence
fence.enable(ch_flag);
break;
#endif
case AUX_SWITCH_RESETTOARMEDYAW: case AUX_SWITCH_RESETTOARMEDYAW:
if (ch_flag) { if (ch_flag) {
set_yaw_mode(YAW_RESETTOARMEDYAW); set_yaw_mode(YAW_RESETTOARMEDYAW);

2
ArduCopter/defines.h
View File

@ -60,7 +60,7 @@
#define AUX_SWITCH_MULTI_MODE 8 // depending upon CH6 position Flip (if ch6 is low), RTL (if ch6 in middle) or Save WP (if ch6 is high) #define AUX_SWITCH_MULTI_MODE 8 // depending upon CH6 position Flip (if ch6 is low), RTL (if ch6 in middle) or Save WP (if ch6 is high)
#define AUX_SWITCH_CAMERA_TRIGGER 9 // trigger camera servo or relay #define AUX_SWITCH_CAMERA_TRIGGER 9 // trigger camera servo or relay
#define AUX_SWITCH_SONAR 10 // allow enabling or disabling sonar in flight which helps avoid surface tracking when you are far above the ground #define AUX_SWITCH_SONAR 10 // allow enabling or disabling sonar in flight which helps avoid surface tracking when you are far above the ground
#define AUX_SWITCH_UNUSED_RFU 11 // unused reserved for future use #define AUX_SWITCH_FENCE 11 // allow enabling or disabling fence in flight
#define AUX_SWITCH_RESETTOARMEDYAW 12 // changes yaw to be same as when quad was armed #define AUX_SWITCH_RESETTOARMEDYAW 12 // changes yaw to be same as when quad was armed