diff --git a/openrtx/include/core/ui.h b/openrtx/include/core/ui.h index 667d9fc8..232ba06e 100644 --- a/openrtx/include/core/ui.h +++ b/openrtx/include/core/ui.h @@ -31,7 +31,7 @@ // Maximum menu entry length #define MAX_ENTRY_LEN 21 // Frequency digits -#define FREQ_DIGITS 8 +#define FREQ_DIGITS 7 // Time & Date digits #define TIMEDATE_DIGITS 10 // Max number of UI events diff --git a/openrtx/src/ui/ui.c b/openrtx/src/ui/ui.c index 945e3e96..d4337706 100644 --- a/openrtx/src/ui/ui.c +++ b/openrtx/src/ui/ui.c @@ -458,7 +458,7 @@ void _ui_drawLowBatteryScreen() freq_t _ui_freq_add_digit(freq_t freq, uint8_t pos, uint8_t number) { - freq_t coefficient = 10; + freq_t coefficient = 100; for(uint8_t i=0; i < FREQ_DIGITS - pos; i++) { coefficient *= 10; diff --git a/openrtx/src/ui/ui_main.c b/openrtx/src/ui/ui_main.c index 61cc4205..6fe0f73b 100644 --- a/openrtx/src/ui/ui_main.c +++ b/openrtx/src/ui/ui_main.c @@ -115,42 +115,42 @@ void _ui_drawVFOMiddleInput(ui_state_t* ui_state) if(ui_state->input_position == 0) { gfx_print(layout.line2_pos, layout.input_font, TEXT_ALIGN_CENTER, - color_white, ">Rx:%03lu.%05lu", + color_white, ">Rx:%03lu.%04lu", (unsigned long)ui_state->new_rx_frequency/1000000, - (unsigned long)ui_state->new_rx_frequency%1000000/10); + (unsigned long)(ui_state->new_rx_frequency%1000000)/100); } else { // Replace Rx frequency with underscorses if(ui_state->input_position == 1) - strcpy(ui_state->new_rx_freq_buf, ">Rx:___._____"); + strcpy(ui_state->new_rx_freq_buf, ">Rx:___.____"); ui_state->new_rx_freq_buf[insert_pos] = input_char; gfx_print(layout.line2_pos, layout.input_font, TEXT_ALIGN_CENTER, color_white, ui_state->new_rx_freq_buf); } gfx_print(layout.line3_pos, layout.input_font, TEXT_ALIGN_CENTER, - color_white, " Tx:%03lu.%05lu", + color_white, " Tx:%03lu.%04lu", (unsigned long)last_state.channel.tx_frequency/1000000, - (unsigned long)last_state.channel.tx_frequency%1000000/10); + (unsigned long)(last_state.channel.tx_frequency%1000000)/100); } else if(ui_state->input_set == SET_TX) { gfx_print(layout.line2_pos, layout.input_font, TEXT_ALIGN_CENTER, - color_white, " Rx:%03lu.%05lu", + color_white, " Rx:%03lu.%04lu", (unsigned long)ui_state->new_rx_frequency/1000000, - (unsigned long)ui_state->new_rx_frequency%1000000/10); + (unsigned long)(ui_state->new_rx_frequency%1000000)/100); // Replace Rx frequency with underscorses if(ui_state->input_position == 0) { gfx_print(layout.line3_pos, layout.input_font, TEXT_ALIGN_CENTER, - color_white, ">Tx:%03lu.%05lu", + color_white, ">Tx:%03lu.%04lu", (unsigned long)ui_state->new_rx_frequency/1000000, - (unsigned long)ui_state->new_rx_frequency%1000000/10); + (unsigned long)(ui_state->new_rx_frequency%1000000)/100); } else { if(ui_state->input_position == 1) - strcpy(ui_state->new_tx_freq_buf, ">Tx:___._____"); + strcpy(ui_state->new_tx_freq_buf, ">Tx:___.____"); ui_state->new_tx_freq_buf[insert_pos] = input_char; gfx_print(layout.line3_pos, layout.input_font, TEXT_ALIGN_CENTER, color_white, ui_state->new_tx_freq_buf);