kopia lustrzana https://github.com/OpenRTX/OpenRTX
Improved indentation in _ui_drawMacroMenu()
rodzic
c3f1ec0ea1
commit
f771d4ec06
|
@ -1055,6 +1055,7 @@ bool _ui_drawMacroMenu(ui_state_t* ui_state)
|
||||||
#endif // UI_NO_KEYBOARD
|
#endif // UI_NO_KEYBOARD
|
||||||
gfx_print(layout.line1_pos, layout.top_font, TEXT_ALIGN_RIGHT,
|
gfx_print(layout.line1_pos, layout.top_font, TEXT_ALIGN_RIGHT,
|
||||||
yellow_fab413, "3 ");
|
yellow_fab413, "3 ");
|
||||||
|
|
||||||
if (last_state.channel.mode == OPMODE_FM)
|
if (last_state.channel.mode == OPMODE_FM)
|
||||||
{
|
{
|
||||||
char encdec_str[9] = { 0 };
|
char encdec_str[9] = { 0 };
|
||||||
|
@ -1077,15 +1078,18 @@ bool _ui_drawMacroMenu(ui_state_t* ui_state)
|
||||||
gfx_print(layout.line1_pos, layout.top_font, TEXT_ALIGN_CENTER,
|
gfx_print(layout.line1_pos, layout.top_font, TEXT_ALIGN_CENTER,
|
||||||
color_white, encdec_str);
|
color_white, encdec_str);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Second row
|
// Second row
|
||||||
// Calculate symmetric second row position, line2_pos is asymmetric like main screen
|
// Calculate symmetric second row position, line2_pos is asymmetric like main screen
|
||||||
point_t pos_2 = {layout.line1_pos.x, layout.line1_pos.y +
|
point_t pos_2 = {layout.line1_pos.x, layout.line1_pos.y +
|
||||||
(layout.line3_large_pos.y - layout.line1_pos.y)/2};
|
(layout.line3_large_pos.y - layout.line1_pos.y)/2};
|
||||||
|
|
||||||
#if defined(UI_NO_KEYBOARD)
|
#if defined(UI_NO_KEYBOARD)
|
||||||
if (ui_state->macro_menu_selected == 3)
|
if (ui_state->macro_menu_selected == 3)
|
||||||
#endif // UI_NO_KEYBOARD
|
#endif // UI_NO_KEYBOARD
|
||||||
gfx_print(pos_2, layout.top_font, TEXT_ALIGN_LEFT,
|
gfx_print(pos_2, layout.top_font, TEXT_ALIGN_LEFT,
|
||||||
yellow_fab413, "4");
|
yellow_fab413, "4");
|
||||||
|
|
||||||
if (last_state.channel.mode == OPMODE_FM)
|
if (last_state.channel.mode == OPMODE_FM)
|
||||||
{
|
{
|
||||||
char bw_str[12] = { 0 };
|
char bw_str[12] = { 0 };
|
||||||
|
@ -1101,6 +1105,7 @@ bool _ui_drawMacroMenu(ui_state_t* ui_state)
|
||||||
snprintf(bw_str, 12, " BW 25 ");
|
snprintf(bw_str, 12, " BW 25 ");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
gfx_print(pos_2, layout.top_font, TEXT_ALIGN_LEFT,
|
gfx_print(pos_2, layout.top_font, TEXT_ALIGN_LEFT,
|
||||||
color_white, bw_str);
|
color_white, bw_str);
|
||||||
}
|
}
|
||||||
|
@ -1110,11 +1115,13 @@ bool _ui_drawMacroMenu(ui_state_t* ui_state)
|
||||||
color_white, " ");
|
color_white, " ");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(UI_NO_KEYBOARD)
|
#if defined(UI_NO_KEYBOARD)
|
||||||
if (ui_state->macro_menu_selected == 4)
|
if (ui_state->macro_menu_selected == 4)
|
||||||
#endif // UI_NO_KEYBOARD
|
#endif // UI_NO_KEYBOARD
|
||||||
gfx_print(pos_2, layout.top_font, TEXT_ALIGN_CENTER,
|
gfx_print(pos_2, layout.top_font, TEXT_ALIGN_CENTER,
|
||||||
yellow_fab413, "5");
|
yellow_fab413, "5");
|
||||||
|
|
||||||
char mode_str[12] = "";
|
char mode_str[12] = "";
|
||||||
switch(last_state.channel.mode)
|
switch(last_state.channel.mode)
|
||||||
{
|
{
|
||||||
|
@ -1128,8 +1135,10 @@ bool _ui_drawMacroMenu(ui_state_t* ui_state)
|
||||||
snprintf(mode_str, 12," M17");
|
snprintf(mode_str, 12," M17");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
gfx_print(pos_2, layout.top_font, TEXT_ALIGN_CENTER,
|
gfx_print(pos_2, layout.top_font, TEXT_ALIGN_CENTER,
|
||||||
color_white, mode_str);
|
color_white, mode_str);
|
||||||
|
|
||||||
#if defined(UI_NO_KEYBOARD)
|
#if defined(UI_NO_KEYBOARD)
|
||||||
if (ui_state->macro_menu_selected == 5)
|
if (ui_state->macro_menu_selected == 5)
|
||||||
#endif // UI_NO_KEYBOARD
|
#endif // UI_NO_KEYBOARD
|
||||||
|
@ -1137,6 +1146,7 @@ bool _ui_drawMacroMenu(ui_state_t* ui_state)
|
||||||
yellow_fab413, "6 ");
|
yellow_fab413, "6 ");
|
||||||
gfx_print(pos_2, layout.top_font, TEXT_ALIGN_RIGHT,
|
gfx_print(pos_2, layout.top_font, TEXT_ALIGN_RIGHT,
|
||||||
color_white, "%.1gW", dBmToWatt(last_state.channel.power));
|
color_white, "%.1gW", dBmToWatt(last_state.channel.power));
|
||||||
|
|
||||||
// Third row
|
// Third row
|
||||||
#if defined(UI_NO_KEYBOARD)
|
#if defined(UI_NO_KEYBOARD)
|
||||||
if (ui_state->macro_menu_selected == 6)
|
if (ui_state->macro_menu_selected == 6)
|
||||||
|
@ -1150,6 +1160,7 @@ bool _ui_drawMacroMenu(ui_state_t* ui_state)
|
||||||
color_white, " %5d",
|
color_white, " %5d",
|
||||||
state.settings.brightness);
|
state.settings.brightness);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(UI_NO_KEYBOARD)
|
#if defined(UI_NO_KEYBOARD)
|
||||||
if (ui_state->macro_menu_selected == 7)
|
if (ui_state->macro_menu_selected == 7)
|
||||||
#endif // UI_NO_KEYBOARD
|
#endif // UI_NO_KEYBOARD
|
||||||
|
@ -1159,6 +1170,7 @@ bool _ui_drawMacroMenu(ui_state_t* ui_state)
|
||||||
gfx_print(layout.line3_large_pos, layout.top_font, TEXT_ALIGN_CENTER,
|
gfx_print(layout.line3_large_pos, layout.top_font, TEXT_ALIGN_CENTER,
|
||||||
color_white, " B+");
|
color_white, " B+");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(UI_NO_KEYBOARD)
|
#if defined(UI_NO_KEYBOARD)
|
||||||
if (ui_state->macro_menu_selected == 8)
|
if (ui_state->macro_menu_selected == 8)
|
||||||
#endif // UI_NO_KEYBOARD
|
#endif // UI_NO_KEYBOARD
|
||||||
|
|
Ładowanie…
Reference in New Issue