Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-20 15:48:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Copter: move #if within case statement in switches.cpp

Browse Source 
This removes some compile warnings when features are disabled
This commit is contained in:
Randy Mackay 2016-12-19 16:08:43 +09:00
parent 70feff487e
commit 2365036e5c
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ArduCopter/switches.cpp
View File

@ -291,13 +291,13 @@ void Copter::do_aux_switch_function(int8_t ch_function, uint8_t ch_flag)
} }
break; break;
#if CAMERA == ENABLED
case AUXSW_CAMERA_TRIGGER: case AUXSW_CAMERA_TRIGGER:
#if CAMERA == ENABLED
if (ch_flag == AUX_SWITCH_HIGH) { if (ch_flag == AUX_SWITCH_HIGH) {
do_take_picture(); do_take_picture();
} }
break;
#endif #endif
break;
case AUXSW_RANGEFINDER: case AUXSW_RANGEFINDER:
// enable or disable the rangefinder // enable or disable the rangefinder
@ -310,8 +310,8 @@ void Copter::do_aux_switch_function(int8_t ch_function, uint8_t ch_flag)
#endif #endif
break; break;
#if AC_FENCE == ENABLED
case AUXSW_FENCE: case AUXSW_FENCE:
#if AC_FENCE == ENABLED
// enable or disable the fence // enable or disable the fence
if (ch_flag == AUX_SWITCH_HIGH) { if (ch_flag == AUX_SWITCH_HIGH) {
fence.enable(true); fence.enable(true);
@ -320,8 +320,8 @@ void Copter::do_aux_switch_function(int8_t ch_function, uint8_t ch_flag)
fence.enable(false); fence.enable(false);
Log_Write_Event(DATA_FENCE_DISABLE); Log_Write_Event(DATA_FENCE_DISABLE);
} }
break;
#endif #endif
break;
case AUXSW_ACRO_TRAINER: case AUXSW_ACRO_TRAINER:
switch(ch_flag) { switch(ch_flag) {
@ -339,8 +339,9 @@ void Copter::do_aux_switch_function(int8_t ch_function, uint8_t ch_flag)
break; break;
} }
break; break;
#if GRIPPER_ENABLED == ENABLED
case AUXSW_GRIPPER: case AUXSW_GRIPPER:
#if GRIPPER_ENABLED == ENABLED
switch(ch_flag) { switch(ch_flag) {
case AUX_SWITCH_LOW: case AUX_SWITCH_LOW:
g2.gripper.release(); g2.gripper.release();
@ -351,15 +352,16 @@ void Copter::do_aux_switch_function(int8_t ch_function, uint8_t ch_flag)
Log_Write_Event(DATA_GRIPPER_GRAB); Log_Write_Event(DATA_GRIPPER_GRAB);
break; break;
} }
break;
#endif #endif
#if SPRAYER == ENABLED break;
case AUXSW_SPRAYER: case AUXSW_SPRAYER:
#if SPRAYER == ENABLED
sprayer.run(ch_flag == AUX_SWITCH_HIGH); sprayer.run(ch_flag == AUX_SWITCH_HIGH);
// if we are disarmed the pilot must want to test the pump // if we are disarmed the pilot must want to test the pump
sprayer.test_pump((ch_flag == AUX_SWITCH_HIGH) && !motors.armed()); sprayer.test_pump((ch_flag == AUX_SWITCH_HIGH) && !motors.armed());
break;
#endif #endif
break;
case AUXSW_AUTO: case AUXSW_AUTO:
if (ch_flag == AUX_SWITCH_HIGH) { if (ch_flag == AUX_SWITCH_HIGH) {
@ -372,8 +374,8 @@ void Copter::do_aux_switch_function(int8_t ch_function, uint8_t ch_flag)
} }
break; break;
#if AUTOTUNE_ENABLED == ENABLED
case AUXSW_AUTOTUNE: case AUXSW_AUTOTUNE:
#if AUTOTUNE_ENABLED == ENABLED
// turn on auto tuner // turn on auto tuner
switch(ch_flag) { switch(ch_flag) {
case AUX_SWITCH_LOW: case AUX_SWITCH_LOW:
@ -388,8 +390,8 @@ void Copter::do_aux_switch_function(int8_t ch_function, uint8_t ch_flag)
set_mode(AUTOTUNE, MODE_REASON_TX_COMMAND); set_mode(AUTOTUNE, MODE_REASON_TX_COMMAND);
break; break;
} }
break;
#endif #endif
break;
case AUXSW_LAND: case AUXSW_LAND:
if (ch_flag == AUX_SWITCH_HIGH) { if (ch_flag == AUX_SWITCH_HIGH) {
@ -402,19 +404,23 @@ void Copter::do_aux_switch_function(int8_t ch_function, uint8_t ch_flag)
} }
break; break;
#if PARACHUTE == ENABLED
case AUXSW_PARACHUTE_ENABLE: case AUXSW_PARACHUTE_ENABLE:
#if PARACHUTE == ENABLED
// Parachute enable/disable // Parachute enable/disable
parachute.enabled(ch_flag == AUX_SWITCH_HIGH); parachute.enabled(ch_flag == AUX_SWITCH_HIGH);
#endif
break; break;
case AUXSW_PARACHUTE_RELEASE: case AUXSW_PARACHUTE_RELEASE:
#if PARACHUTE == ENABLED
if (ch_flag == AUX_SWITCH_HIGH) { if (ch_flag == AUX_SWITCH_HIGH) {
parachute_manual_release(); parachute_manual_release();
} }
#endif
break; break;
case AUXSW_PARACHUTE_3POS: case AUXSW_PARACHUTE_3POS:
#if PARACHUTE == ENABLED
// Parachute disable, enable, release with 3 position switch // Parachute disable, enable, release with 3 position switch
switch (ch_flag) { switch (ch_flag) {
case AUX_SWITCH_LOW: case AUX_SWITCH_LOW:
@ -430,8 +436,8 @@ void Copter::do_aux_switch_function(int8_t ch_function, uint8_t ch_flag)
parachute_manual_release(); parachute_manual_release();
break; break;
} }
break;
#endif #endif
break;
case AUXSW_MISSION_RESET: case AUXSW_MISSION_RESET:
if (ch_flag == AUX_SWITCH_HIGH) { if (ch_flag == AUX_SWITCH_HIGH) {
@ -449,8 +455,8 @@ void Copter::do_aux_switch_function(int8_t ch_function, uint8_t ch_flag)
attitude_control.accel_limiting(ch_flag == AUX_SWITCH_HIGH); attitude_control.accel_limiting(ch_flag == AUX_SWITCH_HIGH);
break; break;
#if MOUNT == ENABLE
case AUXSW_RETRACT_MOUNT: case AUXSW_RETRACT_MOUNT:
#if MOUNT == ENABLE
switch (ch_flag) { switch (ch_flag) {
case AUX_SWITCH_HIGH: case AUX_SWITCH_HIGH:
camera_mount.set_mode(MAV_MOUNT_MODE_RETRACT); camera_mount.set_mode(MAV_MOUNT_MODE_RETRACT);
@ -459,8 +465,8 @@ void Copter::do_aux_switch_function(int8_t ch_function, uint8_t ch_flag)
camera_mount.set_mode_to_default(); camera_mount.set_mode_to_default();
break; break;
} }
break;
#endif #endif
break;
case AUXSW_RELAY: case AUXSW_RELAY:
ServoRelayEvents.do_set_relay(0, ch_flag == AUX_SWITCH_HIGH); ServoRelayEvents.do_set_relay(0, ch_flag == AUX_SWITCH_HIGH);