Fixes #1304 - A1, A2, A3, A4, RSSI, SWR and Telemetry State alarms are

now Critical alarms and are played in "Alarm" mode.
This commit is contained in:
bsongis
2014-06-19 15:09:09 +02:00
parent 2d5a5eccd6
commit a9ad37cab9
2 changed files with 29 additions and 29 deletions
+14 -14
View File
@@ -155,6 +155,19 @@ const char * audioFilenames[] = {
"eeformat",
"lowbatt",
"inactiv",
"a1_org",
"a1_red",
"a2_org",
"a2_red",
"a3_org",
"a3_red",
"a4_org",
"a4_red",
"rssi_org",
"rssi_red",
"swr_red",
"telemko",
"telemok",
#if defined(PCBSKY9X)
"highmah",
"hightemp",
@@ -189,20 +202,7 @@ const char * audioFilenames[] = {
"timer00",
"timer10",
"timer20",
"timer30",
"a1_org",
"a1_red",
"a2_org",
"a2_red",
"a3_org",
"a3_red",
"a4_org",
"a4_red",
"rssi_org",
"rssi_red",
"swr_red",
"telemko",
"telemok"
"timer30"
};
uint64_t sdAvailableSystemAudioFiles = 0;
+15 -15
View File
@@ -1318,6 +1318,21 @@ enum AUDIO_SOUNDS {
#endif
AU_TX_BATTERY_LOW,
AU_INACTIVITY,
#if defined(CPUARM)
AU_A1_ORANGE,
AU_A1_RED,
AU_A2_ORANGE,
AU_A2_RED,
AU_A3_ORANGE,
AU_A3_RED,
AU_A4_ORANGE,
AU_A4_RED,
AU_RSSI_ORANGE,
AU_RSSI_RED,
AU_SWR_RED,
AU_TELEMETRY_LOST,
AU_TELEMETRY_BACK,
#endif
#if defined(PCBSKY9X)
AU_TX_MAH_HIGH,
AU_TX_TEMP_HIGH,
@@ -1361,21 +1376,6 @@ enum AUDIO_SOUNDS {
AU_TIMER_LT10,
AU_TIMER_20,
AU_TIMER_30,
#if defined(CPUARM)
AU_A1_ORANGE,
AU_A1_RED,
AU_A2_ORANGE,
AU_A2_RED,
AU_A3_ORANGE,
AU_A3_RED,
AU_A4_ORANGE,
AU_A4_RED,
AU_RSSI_ORANGE,
AU_RSSI_RED,
AU_SWR_RED,
AU_TELEMETRY_LOST,
AU_TELEMETRY_BACK,
#endif
AU_FRSKY_FIRST,
AU_FRSKY_BEEP1 = AU_FRSKY_FIRST,
AU_FRSKY_BEEP2,