fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If voice prompts can't be loaded then set vpLevel to vpNone.

This commit is contained in:
vk7js 2022-05-10 23:04:54 +10:00 committed by Silvano Seva
parent ad07a517bc
commit af74978600
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openrtx/include/core/voicePrompts.h
View File

@ -181,7 +181,7 @@ typedef enum
vpHigh vpHigh
} VoicePromptVerbosity_T; } VoicePromptVerbosity_T;
extern bool voicePromptDataIsLoaded; extern bool vpDataIsLoaded;
extern const uint32_t VOICE_PROMPTS_FLASH_HEADER_ADDRESS; extern const uint32_t VOICE_PROMPTS_FLASH_HEADER_ADDRESS;
extern VoicePromptVerbosity_T vpLevel; extern VoicePromptVerbosity_T vpLevel;
// Loads just the TOC from Flash and stores in RAM for fast access. // Loads just the TOC from Flash and stores in RAM for fast access.

7
openrtx/src/core/voicePrompts.c
View File

@ -48,7 +48,7 @@ static uint32_t vpFlashDataAddress;// = VOICE_PROMPTS_FLASH_HEADER_ADDRESS + siz
// 76 x 27 byte Codec2 frames // 76 x 27 byte Codec2 frames
#define Codec2DataBufferSize 2052 #define Codec2DataBufferSize 2052
bool voicePromptDataIsLoaded = false; bool vpDataIsLoaded = false;
VoicePromptVerbosity_T vpLevel = vpHigh; VoicePromptVerbosity_T vpLevel = vpHigh;
static bool voicePromptIsActive = false; static bool voicePromptIsActive = false;
@ -87,10 +87,11 @@ void vpCacheInit(void)
if (vpCheckHeader((uint32_t *)&header)) if (vpCheckHeader((uint32_t *)&header))
{// ToDo see above {// ToDo see above
voicePromptDataIsLoaded = false; //SPI_Flash_read(VOICE_PROMPTS_FLASH_HEADER_ADDRESS + sizeof(voicePromptsDataHeader_t), (uint8_t *)&tableOfContents, sizeof(uint32_t) * VOICE_PROMPTS_TOC_SIZE); vpDataIsLoaded = false; //SPI_Flash_read(VOICE_PROMPTS_FLASH_HEADER_ADDRESS + sizeof(voicePromptsDataHeader_t), (uint8_t *)&tableOfContents, sizeof(uint32_t) * VOICE_PROMPTS_TOC_SIZE);
vpFlashDataAddress = VOICE_PROMPTS_FLASH_HEADER_ADDRESS + sizeof(voicePromptsDataHeader_t) + sizeof(uint32_t)*VOICE_PROMPTS_TOC_SIZE ; vpFlashDataAddress = VOICE_PROMPTS_FLASH_HEADER_ADDRESS + sizeof(voicePromptsDataHeader_t) + sizeof(uint32_t)*VOICE_PROMPTS_TOC_SIZE ;
} }
if (!vpDataIsLoaded)
vpLevel = vpNone;
} }
bool vpCheckHeader(uint32_t *bufferAddress) bool vpCheckHeader(uint32_t *bufferAddress)