diff options
| author | Julian Oes <julian@oes.ch> | 2014-02-12 17:10:20 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-02-12 17:10:20 +0100 |
| commit | 3462054f73dda9303fcb1b2b5ba0a6f0882ddbd9 (patch) | |
| tree | 511c63dcc6aae5222c6685e3f1648b2d8f5b2c6b /src/modules/commander/commander_helper.cpp | |
| parent | 76ae004e5c6c1dcc05f1eb784f6dc14cff2a3671 (diff) | |
| parent | 03cfb79b29a81443665208396ba8fc0ab67a021a (diff) | |
| download | px4-firmware-3462054f73dda9303fcb1b2b5ba0a6f0882ddbd9.tar.gz px4-firmware-3462054f73dda9303fcb1b2b5ba0a6f0882ddbd9.tar.bz2 px4-firmware-3462054f73dda9303fcb1b2b5ba0a6f0882ddbd9.zip | |
Merge remote-tracking branch 'px4/beta' into beta_mavlink
Conflicts:
src/modules/mavlink/mavlink.c
src/modules/mavlink/mavlink_receiver.h
src/modules/mavlink/orb_listener.c
Diffstat (limited to 'src/modules/commander/commander_helper.cpp')
| -rw-r--r-- | src/modules/commander/commander_helper.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/modules/commander/commander_helper.cpp b/src/modules/commander/commander_helper.cpp index 21a1c4c2c..033e7dc88 100644 --- a/src/modules/commander/commander_helper.cpp +++ b/src/modules/commander/commander_helper.cpp @@ -124,10 +124,15 @@ void tune_neutral() void tune_negative() { + led_negative(); + ioctl(buzzer, TONE_SET_ALARM, TONE_NOTIFY_NEGATIVE_TUNE); +} + +void led_negative() +{ blink_msg_end = hrt_absolute_time() + BLINK_MSG_TIME; rgbled_set_color(RGBLED_COLOR_RED); rgbled_set_mode(RGBLED_MODE_BLINK_FAST); - ioctl(buzzer, TONE_SET_ALARM, TONE_NOTIFY_NEGATIVE_TUNE); } int tune_arm() |