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

UI: renamed "Voice Prompts" menu to "Accessibility"

pull/227/head
Silvano Seva 2024-01-10 18:06:48 +01:00
rodzic c4b7b7a337
commit b1fa154ad9
3 zmienionych plików z 36 dodań i 36 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
openrtx/include/ui/ui_default.h
Wyświetl plik

@ -62,7 +62,7 @@ enum uiScreen
SETTINGS_GPS,
SETTINGS_RADIO,
SETTINGS_M17,
SETTINGS_VOICE,
SETTINGS_ACCESSIBILITY,
SETTINGS_RESET2DEFAULTS,
LOW_BAT
};
@ -99,7 +99,7 @@ enum settingsItems
#endif
S_RADIO,
S_M17,
S_VOICE,
S_ACCESSIBILITY,
S_RESET2DEFAULTS,
};
@ -129,10 +129,10 @@ enum settingsGPSItems
};
#endif
enum settingsVoicePromptItems
enum settingsAccessibilityItems
{
VP_LEVEL = 0,
VP_PHONETIC,
A_LEVEL,
A_PHONETIC,
};
enum settingsRadioItems
@ -241,7 +241,7 @@ extern const char *display_items[];
extern const char *settings_gps_items[];
extern const char *settings_radio_items[];
extern const char *settings_m17_items[];
extern const char * settings_voice_items[];
extern const char * settings_accessibility_items[];
extern const char *backup_restore_items[];
extern const char *info_items[];
@ -252,7 +252,7 @@ extern const uint8_t display_num;
extern const uint8_t settings_gps_num;
extern const uint8_t settings_radio_num;
extern const uint8_t settings_m17_num;
extern const uint8_t settings_voice_num;
extern const uint8_t settings_accessibility_num;
extern const uint8_t backup_restore_num;
extern const uint8_t info_num;
extern const uint8_t author_num;

32
openrtx/src/ui/default/ui.c
Wyświetl plik

@ -98,7 +98,7 @@ extern void _ui_drawMenuContacts(ui_state_t* ui_state);
extern void _ui_drawMenuGPS();
extern void _ui_drawSettingsGPS(ui_state_t* ui_state);
#endif
extern void _ui_drawSettingsVoicePrompts(ui_state_t* ui_state);
extern void _ui_drawSettingsAccessibility(ui_state_t* ui_state);
extern void _ui_drawMenuSettings(ui_state_t* ui_state);
extern void _ui_drawMenuBackupRestore(ui_state_t* ui_state);
extern void _ui_drawMenuBackup(ui_state_t* ui_state);
@ -179,7 +179,7 @@ const char * settings_m17_items[] =
"CAN RX Check"
};
const char * settings_voice_items[] =
const char * settings_accessibility_items[] =
{
"Voice",
"Phonetic"
@ -257,7 +257,7 @@ const uint8_t settings_gps_num = sizeof(settings_gps_items)/sizeof(settings_gps_
#endif
const uint8_t settings_radio_num = sizeof(settings_radio_items)/sizeof(settings_radio_items[0]);
const uint8_t settings_m17_num = sizeof(settings_m17_items)/sizeof(settings_m17_items[0]);
const uint8_t settings_voice_num = sizeof(settings_voice_items)/sizeof(settings_voice_items[0]);
const uint8_t settings_accessibility_num = sizeof(settings_accessibility_items)/sizeof(settings_accessibility_items[0]);
const uint8_t backup_restore_num = sizeof(backup_restore_items)/sizeof(backup_restore_items[0]);
const uint8_t info_num = sizeof(info_items)/sizeof(info_items[0]);
const uint8_t author_num = sizeof(authors)/sizeof(authors[0]);
@ -1900,8 +1900,8 @@ void ui_updateFSM(bool *sync_rtx)
case S_M17:
state.ui_screen = SETTINGS_M17;
break;
case S_VOICE:
state.ui_screen = SETTINGS_VOICE;
case S_ACCESSIBILITY:
state.ui_screen = SETTINGS_ACCESSIBILITY;
break;
case S_RESET2DEFAULTS:
state.ui_screen = SETTINGS_RESET2DEFAULTS;
@ -2311,20 +2311,20 @@ void ui_updateFSM(bool *sync_rtx)
}
}
break;
case SETTINGS_VOICE:
case SETTINGS_ACCESSIBILITY:
if(msg.keys & KEY_LEFT || (ui_state.edit_mode &&
(msg.keys & KEY_DOWN || msg.keys & KNOB_LEFT)))
{
switch(ui_state.menu_selected)
{
case VP_LEVEL:
case A_LEVEL:
_ui_changeVoiceLevel(-1);
break;
case VP_PHONETIC:
case A_PHONETIC:
_ui_changePhoneticSpell(false);
break;
default:
state.ui_screen = SETTINGS_VOICE;
state.ui_screen = SETTINGS_ACCESSIBILITY;
}
}
else if(msg.keys & KEY_RIGHT || (ui_state.edit_mode &&
@ -2332,20 +2332,20 @@ void ui_updateFSM(bool *sync_rtx)
{
switch(ui_state.menu_selected)
{
case VP_LEVEL:
case A_LEVEL:
_ui_changeVoiceLevel(1);
break;
case VP_PHONETIC:
case A_PHONETIC:
_ui_changePhoneticSpell(true);
break;
default:
state.ui_screen = SETTINGS_VOICE;
state.ui_screen = SETTINGS_ACCESSIBILITY;
}
}
else if(msg.keys & KEY_UP || msg.keys & KNOB_LEFT)
_ui_menuUp(settings_voice_num);
_ui_menuUp(settings_accessibility_num);
else if(msg.keys & KEY_DOWN || msg.keys & KNOB_RIGHT)
_ui_menuDown(settings_voice_num);
_ui_menuDown(settings_accessibility_num);
else if(msg.keys & KEY_ENTER)
ui_state.edit_mode = !ui_state.edit_mode;
else if(msg.keys & KEY_ESC)
@ -2530,8 +2530,8 @@ bool ui_updateGUI()
case SETTINGS_M17:
_ui_drawSettingsM17(&ui_state);
break;
case SETTINGS_VOICE:
_ui_drawSettingsVoicePrompts(&ui_state);
case SETTINGS_ACCESSIBILITY:
_ui_drawSettingsAccessibility(&ui_state);
break;
// Screen to support resetting Settings and VFO to defaults
case SETTINGS_RESET2DEFAULTS:

26
openrtx/src/ui/default/ui_menu.c
Wyświetl plik

@ -406,20 +406,20 @@ int _ui_getM17ValueName(char *buf, uint8_t max_len, uint8_t index)
return 0;
}
int _ui_getVoiceEntryName(char *buf, uint8_t max_len, uint8_t index)
int _ui_getAccessibilityEntryName(char *buf, uint8_t max_len, uint8_t index)
{
if(index >= settings_voice_num) return -1;
snprintf(buf, max_len, "%s", settings_voice_items[index]);
if(index >= settings_accessibility_num) return -1;
snprintf(buf, max_len, "%s", settings_accessibility_items[index]);
return 0;
}
int _ui_getVoiceValueName(char *buf, uint8_t max_len, uint8_t index)
int _ui_getAccessibilityValueName(char *buf, uint8_t max_len, uint8_t index)
{
if(index >= settings_voice_num) return -1;
if(index >= settings_accessibility_num) return -1;
uint8_t value = 0;
switch(index)
{
case VP_LEVEL:
case A_LEVEL:
{
value = last_state.settings.vpLevel;
switch (value)
@ -436,7 +436,7 @@ int _ui_getVoiceValueName(char *buf, uint8_t max_len, uint8_t index)
}
break;
}
case VP_PHONETIC:
case A_PHONETIC:
snprintf(buf, max_len, "%s", last_state.settings.vpPhoneticSpell ? currentLanguage->on : currentLanguage->off);
break;
}
@ -906,15 +906,15 @@ void _ui_drawSettingsM17(ui_state_t* ui_state)
}
}
void _ui_drawSettingsVoicePrompts(ui_state_t* ui_state)
void _ui_drawSettingsAccessibility(ui_state_t* ui_state)
{
gfx_clearScreen();
// Print "Voice" on top bar
// Print "Accessibility" on top bar
gfx_print(layout.top_pos, layout.top_font, TEXT_ALIGN_CENTER,
color_white, currentLanguage->voice);
// Print voice settings entries
_ui_drawMenuListValue(ui_state, ui_state->menu_selected, _ui_getVoiceEntryName,
_ui_getVoiceValueName);
color_white, currentLanguage->accessibility);
// Print accessibility settings entries
_ui_drawMenuListValue(ui_state, ui_state->menu_selected, _ui_getAccessibilityEntryName,
_ui_getAccessibilityValueName);
}
void _ui_drawSettingsReset2Defaults(ui_state_t* ui_state)