diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-05 04:06:01 -0700 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-05 04:06:01 -0700 |
| commit | fa63609da33cbbf7b3c57d5044af3f8972c73647 (patch) | |
| tree | 7fd496002a11682ea816936a51e41c050733eb5c /src | |
| parent | fe73adbf68aa0e5101bc74c340d82731f7c139b1 (diff) | |
| parent | f1f9f452c0225b7ebf65007505e6d74e57216cc1 (diff) | |
| download | px4-firmware-fa63609da33cbbf7b3c57d5044af3f8972c73647.tar.gz px4-firmware-fa63609da33cbbf7b3c57d5044af3f8972c73647.tar.bz2 px4-firmware-fa63609da33cbbf7b3c57d5044af3f8972c73647.zip | |
Merge pull request #802 from PX4/arming_fail_tune
tone_alarm: Added arming failure tone
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/drv_tone_alarm.h | 1 | ||||
| -rw-r--r-- | src/drivers/stm32/tone_alarm/tone_alarm.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/drivers/drv_tone_alarm.h b/src/drivers/drv_tone_alarm.h index cb5fd53a5..147d7123a 100644 --- a/src/drivers/drv_tone_alarm.h +++ b/src/drivers/drv_tone_alarm.h @@ -147,6 +147,7 @@ enum { TONE_BATTERY_WARNING_SLOW_TUNE, TONE_BATTERY_WARNING_FAST_TUNE, TONE_GPS_WARNING_TUNE, + TONE_ARMING_FAILURE_TUNE, TONE_NUMBER_OF_TUNES }; diff --git a/src/drivers/stm32/tone_alarm/tone_alarm.cpp b/src/drivers/stm32/tone_alarm/tone_alarm.cpp index f36f2091e..8ed0de58c 100644 --- a/src/drivers/stm32/tone_alarm/tone_alarm.cpp +++ b/src/drivers/stm32/tone_alarm/tone_alarm.cpp @@ -334,6 +334,7 @@ ToneAlarm::ToneAlarm() : _default_tunes[TONE_BATTERY_WARNING_SLOW_TUNE] = "MBNT100a8"; //battery warning slow _default_tunes[TONE_BATTERY_WARNING_FAST_TUNE] = "MBNT255a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8a8"; //battery warning fast _default_tunes[TONE_GPS_WARNING_TUNE] = "MFT255L4AAAL1F#"; //gps warning slow + _default_tunes[TONE_ARMING_FAILURE_TUNE] = "MFT255L4<<<BAP"; _tune_names[TONE_STARTUP_TUNE] = "startup"; // startup tune _tune_names[TONE_ERROR_TUNE] = "error"; // ERROR tone @@ -344,6 +345,7 @@ ToneAlarm::ToneAlarm() : _tune_names[TONE_BATTERY_WARNING_SLOW_TUNE] = "slow_bat"; // battery warning slow _tune_names[TONE_BATTERY_WARNING_FAST_TUNE] = "fast_bat"; // battery warning fast _tune_names[TONE_GPS_WARNING_TUNE] = "gps_warning"; // gps warning + _tune_names[TONE_ARMING_FAILURE_TUNE] = "arming_failure"; //fail to arm } ToneAlarm::~ToneAlarm() |