piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

New UI merged

Browse Source
This commit is contained in:
Bertrand Songis
2019-08-28 20:50:14 +02:00
parent 1f41076b0e
commit f4f8893ae9
806 changed files with 30836 additions and 11704 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/audio.cpp
+5 -5
View File
@@ -207,7 +207,7 @@ const char * const audioFilenames[] = {
"midstck2",
"midstck3",
"midstck4",
#if defined(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBFRSKY)
"midpot1",
"midpot2",
#if defined(PCBX9E)
@@ -317,7 +317,7 @@ void getSwitchAudioFile(char * filename, swsrc_t index)
{
char * str = getModelAudioPath(filename);
#if defined(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBFRSKY)
if (index <= SWSRC_LAST_SWITCH) {
div_t swinfo = switchInfo(index);
*str++ = 'S';
@@ -345,7 +345,7 @@ void getLogicalSwitchAudioFile(char * filename, int index, unsigned int event)
{
char * str = getModelAudioPath(filename);
#if defined(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBFRSKY)
*str++ = 'L';
if (index >= 9) {
div_t qr = div(index+1, 10);
@@ -524,7 +524,7 @@ void audioTask(void * pdata)
setSampleRate(AUDIO_SAMPLE_RATE);
#if defined(PCBX12S)
#if defined(PCBX12S) || defined(PCBNV14)
// The audio amp needs ~2s to start
RTOS_WAIT_MS(1000); // 1s
#endif
@@ -1129,7 +1129,7 @@ void audioEvent(unsigned int index)
case AU_POT3_MIDDLE:
case AU_POT4_MIDDLE:
#endif
#if defined(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBFRSKY)
case AU_SLIDER1_MIDDLE:
case AU_SLIDER2_MIDDLE:
#if defined(PCBX9E)