mirror
/
OpenRTX
kopia lustrzana https://github.com/OpenRTX/OpenRTX
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Added voice feedback for setting the time and date.

md1702
vk7js 2022-09-05 23:03:41 +10:00 zatwierdzone przez Silvano Seva
rodzic ac7a2b94a9
commit 0452bd0f10
2 zmienionych plików z 18 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
openrtx/src/core/voicePromptUtils.c
Wyświetl plik

@ -664,6 +664,9 @@ void vp_announceSettingsTimeDate()
vp_queueString(buffer, vpAnnounceCommonSymbols | vp_queueString(buffer, vpAnnounceCommonSymbols |
vpAnnounceLessCommonSymbols); vpAnnounceLessCommonSymbols);
vp_queuePrompt(PROMPT_SILENCE);
vp_queuePrompt(PROMPT_SILENCE);
snprintf(buffer, 16, "%02d:%02d:%02d", local_time.hour, local_time.minute, snprintf(buffer, 16, "%02d:%02d:%02d", local_time.hour, local_time.minute,
local_time.second); local_time.second);
vp_queueString(buffer, vpAnnounceCommonSymbols | vp_queueString(buffer, vpAnnounceCommonSymbols |

24
openrtx/src/ui/ui.c
Wyświetl plik

@ -481,6 +481,17 @@ static freq_t _ui_freq_add_digit(freq_t freq, uint8_t pos, uint8_t number)
static void _ui_timedate_add_digit(datetime_t *timedate, uint8_t pos, static void _ui_timedate_add_digit(datetime_t *timedate, uint8_t pos,
uint8_t number) uint8_t number)
{ {
vp_flush();
if (pos==3 || pos==5)
vp_queuePrompt(PROMPT_SLASH);
// just indicates separation of date and time.
if (pos==7) // start of time.
vp_queuePrompt(PROMPT_SPACE);
if (pos==9 || pos==11)
vp_queuePrompt(PROMPT_COLON);
vp_queueInteger(number);
vp_play();
switch(pos) switch(pos)
{ {
// Set date // Set date
@ -1684,21 +1695,15 @@ void ui_updateFSM(bool *sync_rtx)
#ifdef RTC_PRESENT #ifdef RTC_PRESENT
// Time&Date settings screen // Time&Date settings screen
case SETTINGS_TIMEDATE: case SETTINGS_TIMEDATE:
if ((msg.keys & KEY_F1) && (state.settings.vpLevel > vpBeep)) if(msg.keys & KEY_ENTER)
{// quick press repeat vp, long press summary.
if (msg.long_press)
vp_announceSettingsTimeDate();
else
vp_replayLastPrompt();
f1Handled = true;
}
else if(msg.keys & KEY_ENTER)
{ {
// Switch to set Time&Date mode // Switch to set Time&Date mode
state.ui_screen = SETTINGS_TIMEDATE_SET; state.ui_screen = SETTINGS_TIMEDATE_SET;
// Reset input position and selection // Reset input position and selection
ui_state.input_position = 0; ui_state.input_position = 0;
memset(&ui_state.new_timedate, 0, sizeof(datetime_t)); memset(&ui_state.new_timedate, 0, sizeof(datetime_t));
vp_announceBuffer(&currentLanguage->timeAndDate,
true, false, "");
} }
else if(msg.keys & KEY_ESC) else if(msg.keys & KEY_ESC)
_ui_menuBack(MENU_SETTINGS); _ui_menuBack(MENU_SETTINGS);
@ -1716,6 +1721,7 @@ void ui_updateFSM(bool *sync_rtx)
state.settings.utc_timezone); state.settings.utc_timezone);
rtc_setTime(utc_time); rtc_setTime(utc_time);
state.time = utc_time; state.time = utc_time;
vp_announceSettingsTimeDate();
state.ui_screen = SETTINGS_TIMEDATE; state.ui_screen = SETTINGS_TIMEDATE;
} }
else if(msg.keys & KEY_ESC) else if(msg.keys & KEY_ESC)