zrzk
/
zr-v4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Copter: canonicalize on STANDBY rather than STANDY_BY

master
Peter Barker 5 years ago committed by Randy Mackay
parent
3bec1c7d4f
commit
f7ba79e493
1 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      ArduCopter/RC_Channel.cpp

8
ArduCopter/RC_Channel.cpp
Unescape View File

@ -77,7 +77,7 @@ void RC_Channel_Copter::init_aux_function(const aux_func_t ch_option, const aux_
case AUX_FUNC::PRECISION_LOITER: case AUX_FUNC::PRECISION_LOITER:
case AUX_FUNC::INVERTED: case AUX_FUNC::INVERTED:
case AUX_FUNC::WINCH_ENABLE: case AUX_FUNC::WINCH_ENABLE:
case AUX_FUNC::STAND_BY: case AUX_FUNC::STANDBY:
case AUX_FUNC::SURFACE_TRACKING: case AUX_FUNC::SURFACE_TRACKING:
do_aux_function(ch_option, ch_flag); do_aux_function(ch_option, ch_flag);
break; break;
@ -543,16 +543,16 @@ void RC_Channel_Copter::do_aux_function(const aux_func_t ch_option, const aux_sw
#endif #endif
break; break;
case AUX_FUNC::STAND_BY: { case AUX_FUNC::STANDBY: {
switch (ch_flag) { switch (ch_flag) {
case HIGH: case HIGH:
copter.standby_active = true; copter.standby_active = true;
copter.Log_Write_Event(DATA_STAND_BY_ENABLE); copter.Log_Write_Event(DATA_STANDBY_ENABLE);
gcs().send_text(MAV_SEVERITY_INFO, "Stand By Enabled"); gcs().send_text(MAV_SEVERITY_INFO, "Stand By Enabled");
break; break;
default: default:
copter.standby_active = false; copter.standby_active = false;
copter.Log_Write_Event(DATA_STAND_BY_DISABLE); copter.Log_Write_Event(DATA_STANDBY_DISABLE);
gcs().send_text(MAV_SEVERITY_INFO, "Stand By Disabled"); gcs().send_text(MAV_SEVERITY_INFO, "Stand By Disabled");
break; break;
} }

Write Preview
Loading…
Cancel
Save