aboutsummaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-05-08 23:21:22 -0700
committerLorenz Meier <lm@inf.ethz.ch>2014-05-08 23:21:22 -0700
commite18bdfdf65a0e9a948b5f25c3f56930192f83f93 (patch)
treefff671787141d88ec0702a3238448be0952478f3 /src/drivers
parentfc54cc2d1f0e46434a455b477a5a6a4540b6e318 (diff)
parent9173b8bc769a87eff3b2babb434701ebef87190c (diff)
downloadpx4-firmware-e18bdfdf65a0e9a948b5f25c3f56930192f83f93.tar.gz
px4-firmware-e18bdfdf65a0e9a948b5f25c3f56930192f83f93.tar.bz2
px4-firmware-e18bdfdf65a0e9a948b5f25c3f56930192f83f93.zip
Merge pull request #858 from TickTock-/rc_merged
Rc merged
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/blinkm/blinkm.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/blinkm/blinkm.cpp b/src/drivers/blinkm/blinkm.cpp
index b75c2297f..974e20ca2 100644
--- a/src/drivers/blinkm/blinkm.cpp
+++ b/src/drivers/blinkm/blinkm.cpp
@@ -638,11 +638,11 @@ BlinkM::led()
if(new_data_vehicle_control_mode || no_data_vehicle_control_mode < 3) {
/* indicate main control state */
- if (vehicle_status_raw.main_state == MAIN_STATE_EASY)
+ if (vehicle_status_raw.main_state == MAIN_STATE_POSCTRL)
led_color_4 = LED_GREEN;
else if (vehicle_status_raw.main_state == MAIN_STATE_AUTO)
led_color_4 = LED_BLUE;
- else if (vehicle_status_raw.main_state == MAIN_STATE_SEATBELT)
+ else if (vehicle_status_raw.main_state == MAIN_STATE_ALTCTRL)
led_color_4 = LED_YELLOW;
else if (vehicle_status_raw.main_state == MAIN_STATE_MANUAL)
led_color_4 = LED_WHITE;