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

P25 and P26 automatic prompts were not played

Browse source
This commit is contained in:
Bertrand Songis 2014-02-21 12:16:05 +01:00
parent f2f9579b77
commit bb774648ff
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/audio_arm.cpp
View file

@ -118,12 +118,12 @@ const char * audioFilenames[] = {
uint64_t sdAvailableSystemAudioFiles = 0; uint64_t sdAvailableSystemAudioFiles = 0;
uint32_t sdAvailablePhaseAudioFiles = 0; uint32_t sdAvailablePhaseAudioFiles = 0;
uint32_t sdAvailableSwitchAudioFiles = 0; uint64_t sdAvailableSwitchAudioFiles = 0;
uint64_t sdAvailableLogicalSwitchAudioFiles = 0; uint64_t sdAvailableLogicalSwitchAudioFiles = 0;
#define MASK_SYSTEM_AUDIO_FILE(index) ((uint64_t)1 << index) #define MASK_SYSTEM_AUDIO_FILE(index) ((uint64_t)1 << index)
#define MASK_PHASE_AUDIO_FILE(index, event) ((uint32_t)1 << (2*index+event)) #define MASK_PHASE_AUDIO_FILE(index, event) ((uint32_t)1 << (2*index+event))
#define MASK_SWITCH_AUDIO_FILE(index) ((uint32_t)1 << index) #define MASK_SWITCH_AUDIO_FILE(index) ((uint64_t)1 << index)
#define MASK_LOGICAL_SWITCH_AUDIO_FILE(index, event) ((uint64_t)1 << (2*index+event)) #define MASK_LOGICAL_SWITCH_AUDIO_FILE(index, event) ((uint64_t)1 << (2*index+event))
bool isFileAvailable(const char * filename) bool isFileAvailable(const char * filename)

3
radio/src/opentx.cpp
View file

@ -1309,7 +1309,6 @@ getvalue_t getValue(uint8_t i)
volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_used = 0; volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_used = 0;
volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_value = 0; volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_value = 0;
/* recursive function. stack as of today (16/03/2012) grows by 8bytes at each call, which is ok! */
#if defined(CPUARM) #if defined(CPUARM)
uint32_t cswDelays[NUM_CSW]; uint32_t cswDelays[NUM_CSW];
@ -1425,6 +1424,8 @@ void getSwitchesPosition(bool play)
int16_t csLastValue[NUM_CSW]; int16_t csLastValue[NUM_CSW];
#define CS_LAST_VALUE_INIT -32768 #define CS_LAST_VALUE_INIT -32768
/* recursive function. stack as of today (16/03/2012) grows by 8bytes at each call, which is ok! */
bool getSwitch(int8_t swtch) bool getSwitch(int8_t swtch)
{ {
bool result; bool result;