Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues Wiki Activity

Audio sound removed (for EEPROM format)

Browse source
This commit is contained in:
Bertrand Songis 2016-03-10 18:51:02 +01:00
parent c521fce20b
commit 75e613331b
4 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
radio/src/audio_arm.cpp
View file

@ -137,7 +137,6 @@ const char * const audioFilenames[] = {
"thralert", "thralert",
"swalert", "swalert",
"baddata", "baddata",
"format",
"lowbatt", "lowbatt",
"inactiv", "inactiv",
"a1_org", "a1_org",
@ -155,6 +154,7 @@ const char * const audioFilenames[] = {
"telemok", "telemok",
"trainko", "trainko",
"trainok", "trainok",
"sensorko",
#if defined(PCBSKY9X) #if defined(PCBSKY9X)
"highmah", "highmah",
"hightemp", "hightemp",
@ -992,9 +992,9 @@ void audioEvent(unsigned int index, unsigned int freq)
#endif #endif
if (index <= AU_ERROR || (index >= AU_WARNING1 && index < AU_FRSKY_FIRST)) { if (index <= AU_ERROR || (index >= AU_WARNING1 && index < AU_FRSKY_FIRST)) {
if (g_eeGeneral.alarmsFlash) { if (g_eeGeneral.alarmsFlash) {
flashCounter = FLASH_DURATION; flashCounter = FLASH_DURATION;
} }
} }
if (g_eeGeneral.beepMode>0 || (g_eeGeneral.beepMode==0 && index>=AU_TRIM_MOVE) || (g_eeGeneral.beepMode>=-1 && index<=AU_ERROR)) { if (g_eeGeneral.beepMode>0 || (g_eeGeneral.beepMode==0 && index>=AU_TRIM_MOVE) || (g_eeGeneral.beepMode>=-1 && index<=AU_ERROR)) {
@ -1013,21 +1013,13 @@ void audioEvent(unsigned int index, unsigned int freq)
break; break;
// low battery in tx // low battery in tx
case AU_TX_BATTERY_LOW: case AU_TX_BATTERY_LOW:
audioQueue.playTone(1950, 160, 20, PLAY_REPEAT(2), 1);
audioQueue.playTone(2550, 160, 20, PLAY_REPEAT(2), -1);
break;
#if defined(PCBSKY9X) #if defined(PCBSKY9X)
case AU_TX_MAH_HIGH: case AU_TX_MAH_HIGH:
// TODO Rob something better here?
audioQueue.playTone(1950, 160, 20, PLAY_REPEAT(2), 1);
audioQueue.playTone(2550, 160, 20, PLAY_REPEAT(2), -1);
break;
case AU_TX_TEMP_HIGH: case AU_TX_TEMP_HIGH:
// TODO Rob something better here? #endif
audioQueue.playTone(1950, 160, 20, PLAY_REPEAT(2), 1); audioQueue.playTone(1950, 160, 20, PLAY_REPEAT(2), 1);
audioQueue.playTone(2550, 160, 20, PLAY_REPEAT(2), -1); audioQueue.playTone(2550, 160, 20, PLAY_REPEAT(2), -1);
break; break;
#endif
#if defined(VOICE) #if defined(VOICE)
case AU_THROTTLE_ALERT: case AU_THROTTLE_ALERT:
case AU_SWITCH_ALERT: case AU_SWITCH_ALERT:

4
radio/src/storage/eeprom_common.cpp
View file

@ -2,7 +2,7 @@
* Copyright (C) OpenTX * Copyright (C) OpenTX
* *
* Based on code named * Based on code named
* th9x - http://code.google.com/p/th9x * th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x * er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x * gruvin9x - http://code.google.com/p/gruvin9x
* *
@ -122,7 +122,7 @@ void storageEraseAll(bool warn)
ALERT(STR_STORAGE_WARNING, STR_BAD_RADIO_DATA, AU_BAD_RADIODATA); ALERT(STR_STORAGE_WARNING, STR_BAD_RADIO_DATA, AU_BAD_RADIODATA);
} }
MESSAGE(STR_STORAGE_WARNING, STR_STORAGE_FORMAT, NULL, AU_STORAGE_FORMAT); MESSAGE(STR_STORAGE_WARNING, STR_STORAGE_FORMAT, NULL, AU_NONE);
storageFormat(); storageFormat();
storageDirty(EE_GENERAL|EE_MODEL); storageDirty(EE_GENERAL|EE_MODEL);

2
radio/src/storage/eeprom_conversions.cpp
View file

@ -1087,7 +1087,7 @@ bool eeConvert()
ALERT(STR_STORAGE_WARNING, msg, AU_BAD_RADIODATA); ALERT(STR_STORAGE_WARNING, msg, AU_BAD_RADIODATA);
// Message // Message
MESSAGE(STR_STORAGE_WARNING, STR_EEPROM_CONVERTING, NULL, AU_STORAGE_FORMAT); // TODO translations MESSAGE(STR_STORAGE_WARNING, STR_EEPROM_CONVERTING, NULL, AU_NONE); // TODO translations
// General Settings conversion // General Settings conversion
eeLoadGeneralSettingsData(); eeLoadGeneralSettingsData();

2
radio/src/storage/sdcard_raw.cpp
View file

@ -241,7 +241,7 @@ void storageEraseAll(bool warn)
ALERT(STR_STORAGE_WARNING, STR_BAD_RADIO_DATA, AU_BAD_RADIODATA); ALERT(STR_STORAGE_WARNING, STR_BAD_RADIO_DATA, AU_BAD_RADIODATA);
} }
MESSAGE(STR_STORAGE_WARNING, STR_STORAGE_FORMAT, NULL, AU_STORAGE_FORMAT); MESSAGE(STR_STORAGE_WARNING, STR_STORAGE_FORMAT, NULL, AU_NONE);
storageFormat(); storageFormat();
storageDirty(EE_GENERAL|EE_MODEL); storageDirty(EE_GENERAL|EE_MODEL);