[all] PPM_UNIT instead of PPM_LIMITS_UNIT and DECIMALS Makefile options

[sky9x] Aurora gimbals support (untested)
[arm] Start of implementation for sounds associated to Mix/FP/Switches in SD directories
This commit is contained in:
bsongis
2012-12-16 13:30:59 +00:00
parent 7329d8b728
commit bc52f7077f
26 changed files with 256 additions and 95 deletions
+59 -12
View File
@@ -64,9 +64,12 @@ const char * audioFilenames[] = {
"timer30"
};
uint32_t sdAvailableAudioFiles = 0;
void retrieveAvailableAudioFiles()
uint32_t sdAvailableSystemAudioFiles = 0;
uint8_t sdAvailablePhaseAudioFiles[MAX_PHASES] = { 0 };
uint8_t sdAvailableMixerAudioFiles[MAX_MIXERS] = { 0 };
void refreshSystemAudioFiles()
{
FILINFO info;
#if _USE_LFN
@@ -78,7 +81,7 @@ void retrieveAvailableAudioFiles()
char filename[32] = SYSTEM_SOUNDS_PATH "/";
assert(sizeof(audioFilenames)==AU_FRSKY_FIRST*sizeof(char *));
assert(sizeof(sdAvailableAudioFiles)*8 > AU_FRSKY_FIRST);
assert(sizeof(sdAvailableSystemAudioFiles)*8 > AU_FRSKY_FIRST);
uint32_t availableAudioFiles = 0;
@@ -89,18 +92,62 @@ void retrieveAvailableAudioFiles()
availableAudioFiles |= ((uint32_t)1 << i);
}
sdAvailableAudioFiles = availableAudioFiles;
sdAvailableSystemAudioFiles = availableAudioFiles;
}
inline bool isAudioFileAvailable(uint8_t i, char * filename)
inline uint8_t getAvailableFiles(char *prefix, FILINFO &info, char *filename)
{
if (sdAvailableAudioFiles & ((uint32_t)1 << i)) {
strcpy(filename+sizeof(SYSTEM_SOUNDS_PATH), audioFilenames[i]);
strcat(filename+sizeof(SYSTEM_SOUNDS_PATH), SOUNDS_EXT);
return true;
const char * suffixes[] = { "-ON", "-OFF", NULL };
uint8_t result = 0;
for (uint8_t i=0; suffixes[i]; i++) {
strcpy(prefix, suffixes[i]);
strcat(prefix, SOUNDS_EXT);
if (f_stat(filename, &info) == FR_OK)
result |= ((uint8_t)1 << i);
}
else {
return false;
return result;
}
void refreshModelAudioFiles()
{
FILINFO info;
#if _USE_LFN
TCHAR lfn[_MAX_LFN + 1];
info.lfname = lfn;
info.lfsize = sizeof(lfn);
#endif
char filename[32] = SOUNDS_PATH "/";
char *buf = strcat_modelname(&filename[sizeof(SOUNDS_PATH)], g_eeGeneral.currModel);
*buf++ = '/';
for (uint32_t i=0; i<MAX_PHASES; i++)
sdAvailablePhaseAudioFiles[i] = getAvailableFiles(strcat_phasename(buf, i), info, filename);
for (uint32_t i=0; i<MAX_MIXERS; i++)
sdAvailableMixerAudioFiles[i] = getAvailableFiles(strcat_mixername(buf, i), info, filename);
}
#define SYSTEM_AUDIO_CATEGORY 0
#define MODEL_AUDIO_CATEGORY 1
#define PHASE_AUDIO_CATEGORY 2
#define MIXER_AUDIO_CATEGORY 3
inline bool isAudioFileAvailable(uint32_t i, char * filename)
{
uint8_t category = (i >> 24);
if (category == SYSTEM_AUDIO_CATEGORY) {
if (sdAvailableSystemAudioFiles & ((uint32_t)1 << i)) {
strcpy(filename+sizeof(SYSTEM_SOUNDS_PATH), audioFilenames[i]);
strcat(filename+sizeof(SYSTEM_SOUNDS_PATH), SOUNDS_EXT);
return true;
}
else {
return false;
}
}
}
#else
@@ -561,7 +608,7 @@ void AudioQueue::stopPlay(uint8_t id)
void AudioQueue::stopSD()
{
sdAvailableAudioFiles = 0;
sdAvailableSystemAudioFiles = 0;
reset();
play(0, 0, 100, PLAY_NOW); // insert a 100ms pause
}
+3
View File
@@ -182,4 +182,7 @@ extern void pushPrompt(uint16_t prompt, uint8_t id=0);
#define STOP_PLAY(id) audioQueue.stopPlay((id))
#define AUDIO_RESET() audioQueue.reset()
extern void refreshSystemAudioFiles();
extern void refreshModelAudioFiles();
#endif
+2 -4
View File
@@ -954,8 +954,6 @@ void sdInit()
uint8_t sdErrorCount = 0;
FATFS g_FATFS_Obj = { 0 };
extern void retrieveAvailableAudioFiles();
void sdMountPoll()
{
if (!Card_initialized)
@@ -1012,7 +1010,7 @@ void sdMountPoll()
case SD_ST_DATA:
if (!usbPlugged() && f_mount(0, &g_FATFS_Obj) == FR_OK) {
retrieveAvailableAudioFiles();
refreshSystemAudioFiles();
Card_state = SD_ST_MOUNTED;
}
break;
@@ -1079,7 +1077,7 @@ void sdInit()
Card_state = SD_ST_DATA;
if (f_mount(0, &g_FATFS_Obj) == FR_OK) {
retrieveAvailableAudioFiles();
refreshSystemAudioFiles();
Card_state = SD_ST_MOUNTED;
}