diff options
author | Randy Mackay <rmackay9@yahoo.com> | 2014-07-22 10:20:10 +0900 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-23 06:30:32 +0200 |
commit | e6594e519295ec081c6f962fca6b4fbdd190846f (patch) | |
tree | b31cec0bb0dda419b0ce6649e11e3f222dc30212 /src | |
parent | 1b5d4e5bd4fbee8f994c95d69be7660fd211d2f4 (diff) | |
download | px4-firmware-e6594e519295ec081c6f962fca6b4fbdd190846f.tar.gz px4-firmware-e6594e519295ec081c6f962fca6b4fbdd190846f.tar.bz2 px4-firmware-e6594e519295ec081c6f962fca6b4fbdd190846f.zip |
tone_alarm: add EKF_WARNING tune
Conflicts:
mavlink/include/mavlink/v1.0
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 b7981e9c4..19f792d19 100644 --- a/src/drivers/drv_tone_alarm.h +++ b/src/drivers/drv_tone_alarm.h @@ -149,6 +149,7 @@ enum { TONE_GPS_WARNING_TUNE, TONE_ARMING_FAILURE_TUNE, TONE_PARACHUTE_RELEASE_TUNE, + TONE_EKF_WARNING_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 810f4aacc..03c7bd399 100644 --- a/src/drivers/stm32/tone_alarm/tone_alarm.cpp +++ b/src/drivers/stm32/tone_alarm/tone_alarm.cpp @@ -336,6 +336,7 @@ ToneAlarm::ToneAlarm() : _default_tunes[TONE_GPS_WARNING_TUNE] = "MFT255L4AAAL1F#"; //gps warning slow _default_tunes[TONE_ARMING_FAILURE_TUNE] = "MFT255L4<<<BAP"; _default_tunes[TONE_PARACHUTE_RELEASE_TUNE] = "MFT255L16agagagag"; // parachute release + _default_tunes[TONE_EKF_WARNING_TUNE] = "MFT255L8ddd#d#eeff"; // ekf warning _tune_names[TONE_STARTUP_TUNE] = "startup"; // startup tune _tune_names[TONE_ERROR_TUNE] = "error"; // ERROR tone @@ -348,6 +349,7 @@ ToneAlarm::ToneAlarm() : _tune_names[TONE_GPS_WARNING_TUNE] = "gps_warning"; // gps warning _tune_names[TONE_ARMING_FAILURE_TUNE] = "arming_failure"; //fail to arm _tune_names[TONE_PARACHUTE_RELEASE_TUNE] = "parachute_release"; // parachute release + _tune_names[TONE_EKF_WARNING_TUNE] = "ekf_warning"; // ekf warning } ToneAlarm::~ToneAlarm() |