diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-05 14:30:57 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-05 14:30:57 +0200 |
| commit | 62c188408f794698ae804875d077e4f7ef8ac612 (patch) | |
| tree | 522192defabb3a9bfebf83f428105eaeaff92fda /src/drivers/stm32 | |
| parent | 06d5c6ad285a46cfb59ce07bc3cd49507305a997 (diff) | |
| parent | be38372be17925e14fa864ad26e8f487a402d46f (diff) | |
| download | px4-firmware-62c188408f794698ae804875d077e4f7ef8ac612.tar.gz px4-firmware-62c188408f794698ae804875d077e4f7ef8ac612.tar.bz2 px4-firmware-62c188408f794698ae804875d077e4f7ef8ac612.zip | |
Merge branch 'airspeed_scaling' of github.com:PX4/Firmware into testtest
Diffstat (limited to 'src/drivers/stm32')
| -rw-r--r-- | src/drivers/stm32/tone_alarm/tone_alarm.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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() |