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

ONm on stock board fixed

Browse Source 
2s initialization time for voice module on stock board
This commit is contained in:
bsongis
2012-08-28 12:38:35 +00:00
parent 642b3bf2a9
commit fbc95a04da
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/open9x.cpp
+18 -5
View File
@@ -1878,7 +1878,10 @@ void evalFunctions()
#if defined(PCBARM) && defined(SDCARD)
else if (sd->func == FUNC_PLAY_TRACK) {
if (!IS_PLAYING(i+1)) {
if (IS_PLAYING(i+1)) {
switch_mask = 0;
}
else {
char lfn[] = SOUNDS_PATH "/xxxxxx.wav";
strncpy(lfn+sizeof(SOUNDS_PATH), sd->param, sizeof(sd->param));
lfn[sizeof(SOUNDS_PATH)+sizeof(sd->param)] = '\0';
@@ -1887,7 +1890,10 @@ void evalFunctions()
}
}
else if (sd->func == FUNC_PLAY_VALUE) {
if (!IS_PLAYING(i+1)) {
if (IS_PLAYING(i+1)) {
switch_mask = 0;
}
else {
PLAY_VALUE(FSW_PARAM(sd), i+1);
}
}
@@ -1896,12 +1902,18 @@ void evalFunctions()
}
#elif defined(VOICE)
else if (sd->func == FUNC_PLAY_TRACK) {
if (!IS_PLAYING(i+1)) {
if (IS_PLAYING(i+1)) {
switch_mask = 0;
}
else {
PUSH_CUSTOM_PROMPT(sd->param, i+1);
}
}
else if (sd->func == FUNC_PLAY_VALUE) {
if (!IS_PLAYING(i+1)) {
if (IS_PLAYING(i+1)) {
switch_mask = 0;
}
else {
PLAY_VALUE(FSW_PARAM(sd), i+1);
}
}
@@ -3113,7 +3125,8 @@ inline void open9xInit(OPEN9X_INIT_ARGS)
lcd_clear();
refreshDisplay();
sdInit();
#elif defined(PCBSTD) && defined(VOICE) && !defined(SPLASH)
#elif 0
// defined(PCBSTD) && defined(VOICE) && !defined(SPLASH)
lcd_clear();
lcd_putsAtt(20, 28, PSTR("Open9x..."), DBLSIZE);
refreshDisplay();
src/stock/voice.cpp
+2 -2
View File
@@ -124,8 +124,8 @@ void t_voice::voice_process(void)
}
}
else if (VoiceState == V_STARTUP) {
if (g_blinkTmr10ms > 120) // Give module 1.2 secs to initialise
{
if (g_blinkTmr10ms > 200) // Give module 2 secs to initialise
{
VoiceState = V_IDLE;
}
}