From c9c1e2312fef9c9aaf5798584691442f58720edb Mon Sep 17 00:00:00 2001 From: Federico Amedeo Izzo Date: Sun, 24 Jan 2021 15:51:11 +0100 Subject: [PATCH] UI: Fix compiler warnings --- openrtx/src/ui/ui.c | 4 ++-- openrtx/src/ui/ui_main.c | 18 +++++++++--------- openrtx/src/ui/ui_menu.c | 13 +++++++------ 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/openrtx/src/ui/ui.c b/openrtx/src/ui/ui.c index 338adb67..fe834e85 100644 --- a/openrtx/src/ui/ui.c +++ b/openrtx/src/ui/ui.c @@ -90,7 +90,7 @@ extern void _ui_drawMenuTop(ui_state_t* ui_state); extern void _ui_drawMenuChannel(ui_state_t* ui_state); extern void _ui_drawMenuSettings(ui_state_t* ui_state); #ifdef HAS_RTC -extern void _ui_drawSettingsTimeDate(state_t* last_state, ui_state_t* ui_state); +extern void _ui_drawSettingsTimeDate(state_t* last_state); extern void _ui_drawSettingsTimeDateSet(state_t* last_state, ui_state_t* ui_state); #endif extern bool _ui_drawMenuMacro(state_t* last_state); @@ -878,7 +878,7 @@ void ui_updateGUI(state_t last_state) #ifdef HAS_RTC // Time&Date settings screen case SETTINGS_TIMEDATE: - _ui_drawSettingsTimeDate(&last_state, &ui_state); + _ui_drawSettingsTimeDate(&last_state); break; // Time&Date settings screen, edit mode case SETTINGS_TIMEDATE_SET: diff --git a/openrtx/src/ui/ui_main.c b/openrtx/src/ui/ui_main.c index 3840497d..72c2998a 100644 --- a/openrtx/src/ui/ui_main.c +++ b/openrtx/src/ui/ui_main.c @@ -74,12 +74,12 @@ void _ui_drawVFOMiddle(state_t* last_state) { // Print VFO frequencies char freq_buf[20] = ""; - snprintf(freq_buf, sizeof(freq_buf), " Rx:%03u.%05u", + snprintf(freq_buf, sizeof(freq_buf), " Rx:%03lu.%05lu", last_state->channel.rx_frequency/1000000, last_state->channel.rx_frequency%1000000/10); gfx_print(layout.line2_left, freq_buf, layout.line2_font, TEXT_ALIGN_CENTER, color_white); - snprintf(freq_buf, sizeof(freq_buf), " Tx:%03u.%05u", + snprintf(freq_buf, sizeof(freq_buf), " Tx:%03lu.%05lu", last_state->channel.tx_frequency/1000000, last_state->channel.tx_frequency%1000000/10); gfx_print(layout.line3_left, freq_buf, layout.line3_font, TEXT_ALIGN_CENTER, @@ -93,12 +93,12 @@ void _ui_drawMEMMiddle(state_t* last_state) color_white); // Print Channel frequencies char freq_buf[20] = ""; - snprintf(freq_buf, sizeof(freq_buf), " Rx:%03u.%05u", + snprintf(freq_buf, sizeof(freq_buf), " Rx:%03lu.%05lu", last_state->channel.rx_frequency/1000000, last_state->channel.rx_frequency%1000000/10); gfx_print(layout.line2_left, freq_buf, layout.line2_font, TEXT_ALIGN_CENTER, color_white); - snprintf(freq_buf, sizeof(freq_buf), " Tx:%03u.%05u", + snprintf(freq_buf, sizeof(freq_buf), " Tx:%03lu.%05lu", last_state->channel.tx_frequency/1000000, last_state->channel.tx_frequency%1000000/10); gfx_print(layout.line3_left, freq_buf, layout.line3_font, TEXT_ALIGN_CENTER, @@ -111,13 +111,13 @@ void _ui_drawVFOMiddleInput(state_t* last_state, ui_state_t* ui_state) uint8_t insert_pos = ui_state->input_position + 3; if(ui_state->input_position > 3) insert_pos += 1; char input_char = ui_state->input_number + '0'; - char freq_buf[14] = ""; + char freq_buf[15] = ""; if(ui_state->input_set == SET_RX) { if(ui_state->input_position == 0) { - snprintf(freq_buf, sizeof(freq_buf), ">Rx:%03u.%05u", + snprintf(freq_buf, sizeof(freq_buf), ">Rx:%03lu.%05lu", ui_state->new_rx_frequency/1000000, ui_state->new_rx_frequency%1000000/10); gfx_print(layout.line2_left, freq_buf, layout.line2_font, TEXT_ALIGN_CENTER, @@ -132,7 +132,7 @@ void _ui_drawVFOMiddleInput(state_t* last_state, ui_state_t* ui_state) gfx_print(layout.line2_left, ui_state->new_rx_freq_buf, layout.line2_font, TEXT_ALIGN_CENTER, color_white); } - snprintf(freq_buf, sizeof(freq_buf), " Tx:%03u.%05u", + snprintf(freq_buf, sizeof(freq_buf), " Tx:%03lu.%05lu", last_state->channel.tx_frequency/1000000, last_state->channel.tx_frequency%1000000/10); gfx_print(layout.line3_left, freq_buf, layout.line3_font, TEXT_ALIGN_CENTER, @@ -140,7 +140,7 @@ void _ui_drawVFOMiddleInput(state_t* last_state, ui_state_t* ui_state) } else if(ui_state->input_set == SET_TX) { - snprintf(freq_buf, sizeof(freq_buf), " Rx:%03u.%05u", + snprintf(freq_buf, sizeof(freq_buf), " Rx:%03lu.%05lu", ui_state->new_rx_frequency/1000000, ui_state->new_rx_frequency%1000000/10); gfx_print(layout.line2_left, freq_buf, layout.line2_font, TEXT_ALIGN_CENTER, @@ -148,7 +148,7 @@ void _ui_drawVFOMiddleInput(state_t* last_state, ui_state_t* ui_state) // Replace Rx frequency with underscorses if(ui_state->input_position == 0) { - snprintf(freq_buf, sizeof(freq_buf), ">Tx:%03u.%05u", + snprintf(freq_buf, sizeof(freq_buf), ">Tx:%03lu.%05lu", ui_state->new_rx_frequency/1000000, ui_state->new_rx_frequency%1000000/10); gfx_print(layout.line3_left, freq_buf, layout.line3_font, TEXT_ALIGN_CENTER, diff --git a/openrtx/src/ui/ui_menu.c b/openrtx/src/ui/ui_menu.c index bf2ff68d..f8f02187 100644 --- a/openrtx/src/ui/ui_menu.c +++ b/openrtx/src/ui/ui_menu.c @@ -20,8 +20,9 @@ #include #include -#include #include +#include +#include void _ui_drawMenuList(point_t pos, const char *entries[], uint8_t num_entries, uint8_t selected) @@ -112,15 +113,15 @@ void _ui_drawMenuSettings(ui_state_t* ui_state) } #ifdef HAS_RTC -void _ui_drawSettingsTimeDate(state_t* last_state, ui_state_t* ui_state) +void _ui_drawSettingsTimeDate(state_t* last_state) { gfx_clearScreen(); // Print "Time&Date" on top bar gfx_print(layout.top_left, "Time&Date", layout.top_font, TEXT_ALIGN_CENTER, color_white); // Print current time and date - char date_buf[9] = ""; - char time_buf[9] = ""; + char date_buf[10] = ""; + char time_buf[10] = ""; snprintf(date_buf, sizeof(date_buf), "%02d/%02d/%02d", last_state->time.date, last_state->time.month, last_state->time.year); snprintf(time_buf, sizeof(time_buf), "%02d:%02d:%02d", @@ -201,8 +202,8 @@ bool _ui_drawMenuMacro(state_t* last_state) { color_white); gfx_print(layout.line1_right, "3 ", layout.top_font, TEXT_ALIGN_RIGHT, yellow_fab413); - char pow_str[5] = { 0 }; - snprintf(pow_str, 5, "%.1gW", last_state->channel.power); + char pow_str[9] = { 0 }; + snprintf(pow_str, 9, "%.1gW", last_state->channel.power); gfx_print(layout.line1_right, pow_str, layout.top_font, TEXT_ALIGN_RIGHT, color_white); // Second row