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

Reorder macro menu functions 

Swapped brightness and tone increase and decrease to be more intuitive.
pull/116/head
Niccolò Izzo 2022-09-27 22:28:57 +02:00
rodzic 28408fbdf8
commit 25d6c20ef0
2 zmienionych plików z 9 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -749,7 +749,7 @@ void _ui_fsm_menuMacro(kbd_msg_t msg, bool *sync_rtx)
case 1: case 1:
if(state.channel.mode == OPMODE_FM) if(state.channel.mode == OPMODE_FM)
{ {
state.channel.fm.txTone++; state.channel.fm.txTone--;
state.channel.fm.txTone %= MAX_TONE_INDEX; state.channel.fm.txTone %= MAX_TONE_INDEX;
state.channel.fm.rxTone = state.channel.fm.txTone; state.channel.fm.rxTone = state.channel.fm.txTone;
*sync_rtx = true; *sync_rtx = true;
@ -758,7 +758,7 @@ void _ui_fsm_menuMacro(kbd_msg_t msg, bool *sync_rtx)
case 2: case 2:
if(state.channel.mode == OPMODE_FM) if(state.channel.mode == OPMODE_FM)
{ {
state.channel.fm.txTone--; state.channel.fm.txTone++;
state.channel.fm.txTone %= MAX_TONE_INDEX; state.channel.fm.txTone %= MAX_TONE_INDEX;
state.channel.fm.rxTone = state.channel.fm.txTone; state.channel.fm.rxTone = state.channel.fm.txTone;
*sync_rtx = true; *sync_rtx = true;
@ -791,6 +791,7 @@ void _ui_fsm_menuMacro(kbd_msg_t msg, bool *sync_rtx)
else if(state.channel.mode == OPMODE_M17) else if(state.channel.mode == OPMODE_M17)
state.channel.mode = OPMODE_FM; state.channel.mode = OPMODE_FM;
*sync_rtx = true; *sync_rtx = true;
break;
case 6: case 6:
if (state.channel.power == 100) if (state.channel.power == 100)
state.channel.power = 135; state.channel.power = 135;
@ -800,10 +801,10 @@ void _ui_fsm_menuMacro(kbd_msg_t msg, bool *sync_rtx)
break; break;
break; break;
case 7: case 7:
_ui_changeBrightness(+5); _ui_changeBrightness(-5);
break; break;
case 8: case 8:
_ui_changeBrightness(-5); _ui_changeBrightness(+5);
break; break;
} }

8
openrtx/src/ui/ui_menu.c
Wyświetl plik

@ -673,14 +673,14 @@ bool _ui_drawMacroMenu()
gfx_print(layout.line1_pos, layout.top_font, TEXT_ALIGN_LEFT, gfx_print(layout.line1_pos, layout.top_font, TEXT_ALIGN_LEFT,
yellow_fab413, "1"); yellow_fab413, "1");
gfx_print(layout.line1_pos, layout.top_font, TEXT_ALIGN_LEFT, gfx_print(layout.line1_pos, layout.top_font, TEXT_ALIGN_LEFT,
color_white, " T+"); color_white, " T-");
gfx_print(layout.line1_pos, layout.top_font, TEXT_ALIGN_LEFT, gfx_print(layout.line1_pos, layout.top_font, TEXT_ALIGN_LEFT,
color_white, " %7.1f", color_white, " %7.1f",
ctcss_tone[last_state.channel.fm.txTone]/10.0f); ctcss_tone[last_state.channel.fm.txTone]/10.0f);
gfx_print(layout.line1_pos, layout.top_font, TEXT_ALIGN_CENTER, gfx_print(layout.line1_pos, layout.top_font, TEXT_ALIGN_CENTER,
yellow_fab413, "2"); yellow_fab413, "2");
gfx_print(layout.line1_pos, layout.top_font, TEXT_ALIGN_CENTER, gfx_print(layout.line1_pos, layout.top_font, TEXT_ALIGN_CENTER,
color_white, " T-"); color_white, " T+");
} }
else if (last_state.channel.mode == OPMODE_M17) else if (last_state.channel.mode == OPMODE_M17)
{ {
@ -770,14 +770,14 @@ bool _ui_drawMacroMenu()
gfx_print(layout.line3_pos, layout.top_font, TEXT_ALIGN_LEFT, gfx_print(layout.line3_pos, layout.top_font, TEXT_ALIGN_LEFT,
yellow_fab413, "7"); yellow_fab413, "7");
gfx_print(layout.line3_pos, layout.top_font, TEXT_ALIGN_LEFT, gfx_print(layout.line3_pos, layout.top_font, TEXT_ALIGN_LEFT,
color_white, " B+"); color_white, " B-");
gfx_print(layout.line3_pos, layout.top_font, TEXT_ALIGN_LEFT, gfx_print(layout.line3_pos, layout.top_font, TEXT_ALIGN_LEFT,
color_white, " %5d", color_white, " %5d",
state.settings.brightness); state.settings.brightness);
gfx_print(layout.line3_pos, layout.top_font, TEXT_ALIGN_CENTER, gfx_print(layout.line3_pos, layout.top_font, TEXT_ALIGN_CENTER,
yellow_fab413, "8"); yellow_fab413, "8");
gfx_print(layout.line3_pos, layout.top_font, TEXT_ALIGN_CENTER, gfx_print(layout.line3_pos, layout.top_font, TEXT_ALIGN_CENTER,
color_white, " B-"); color_white, " B+");
gfx_print(layout.line3_pos, layout.top_font, TEXT_ALIGN_RIGHT, gfx_print(layout.line3_pos, layout.top_font, TEXT_ALIGN_RIGHT,
yellow_fab413, "9 "); yellow_fab413, "9 ");
gfx_print(layout.line3_pos, layout.top_font, TEXT_ALIGN_RIGHT, gfx_print(layout.line3_pos, layout.top_font, TEXT_ALIGN_RIGHT,