Code cleanup and suppression of some compilation warnings

replace/64510b562dc58e0a0851d4ff0ceeb42a93aee6a6
Silvano Seva 2020-11-24 14:23:05 +01:00
rodzic 8efbfab6e1
commit 65e4643f1e
3 zmienionych plików z 26 dodań i 9 usunięć

Wyświetl plik

@ -39,6 +39,11 @@ void ui_init();
*/ */
bool ui_update(state_t last_state, uint32_t keys); bool ui_update(state_t last_state, uint32_t keys);
/**
* This function writes the OpenRTX splash screen image into the framebuffer.
*/
void ui_drawSplashScreen();
/** /**
* This function terminates the User Interface. * This function terminates the User Interface.
*/ */

Wyświetl plik

@ -20,17 +20,20 @@
#include <stdio.h> #include <stdio.h>
#include <state.h> #include <state.h>
#include <platform.h>
const curTime_t epoch = {0, 0, 0, 1, 1, 1970}; const curTime_t epoch = {0, 0, 0, 1, 1, 1, 70};
state_t state = { state_t state =
{
epoch, //time epoch, //time
0.0, //v_bat 0.0, //v_bat
0.0, //rx_freq 0.0, //rx_freq
0.0 //tx_freq 0.0 //tx_freq
}; };
modified_t state_flags = { modified_t state_flags =
{
false, //ui_modified false, //ui_modified
false, //rtx_modified false, //rtx_modified
false //self_modified false //self_modified

Wyświetl plik

@ -206,13 +206,15 @@ void _ui_drawTopBar()
char clock_buf[6] = ""; char clock_buf[6] = "";
snprintf(clock_buf, sizeof(clock_buf), "%02d:%02d", state.time.hour, snprintf(clock_buf, sizeof(clock_buf), "%02d:%02d", state.time.hour,
state.time.minute); state.time.minute);
gfx_print(layout.top_pos, clock_buf, layout.top_font, TEXT_ALIGN_CENTER, color_white); gfx_print(layout.top_pos, clock_buf, layout.top_font, TEXT_ALIGN_CENTER,
color_white);
// Print battery voltage on top bar, use 4 px padding // Print battery voltage on top bar, use 4 px padding
// TODO: Replace with battery icon // TODO: Replace with battery icon
char bat_buf[6] = ""; char bat_buf[6] = "";
snprintf(bat_buf, sizeof(bat_buf), "%02.1fV ", state.v_bat); snprintf(bat_buf, sizeof(bat_buf), "%02.1fV ", state.v_bat);
gfx_print(layout.top_pos, bat_buf, layout.top_font, TEXT_ALIGN_RIGHT, color_white); gfx_print(layout.top_pos, bat_buf, layout.top_font, TEXT_ALIGN_RIGHT,
color_white);
} }
void _ui_drawVFO() void _ui_drawVFO()
@ -220,20 +222,25 @@ void _ui_drawVFO()
// Print VFO frequencies // Print VFO frequencies
char freq_buf[20] = ""; char freq_buf[20] = "";
snprintf(freq_buf, sizeof(freq_buf), "Rx: %09.5f", state.rx_freq); snprintf(freq_buf, sizeof(freq_buf), "Rx: %09.5f", state.rx_freq);
gfx_print(layout.line2_pos, freq_buf, layout.line1_font, TEXT_ALIGN_CENTER, color_white); gfx_print(layout.line2_pos, freq_buf, layout.line1_font, TEXT_ALIGN_CENTER,
color_white);
snprintf(freq_buf, sizeof(freq_buf), "Tx: %09.5f", state.tx_freq); snprintf(freq_buf, sizeof(freq_buf), "Tx: %09.5f", state.tx_freq);
gfx_print(layout.line3_pos, freq_buf, layout.line2_font, TEXT_ALIGN_CENTER, color_white); gfx_print(layout.line3_pos, freq_buf, layout.line2_font, TEXT_ALIGN_CENTER,
color_white);
} }
void _ui_drawBottomBar() void _ui_drawBottomBar()
{ {
// Print OpenRTX on bottom bar // Print OpenRTX on bottom bar
char bottom_buf[8] = "OpenRTX"; char bottom_buf[8] = "OpenRTX";
gfx_print(layout.bottom_pos, bottom_buf, layout.bottom_font, TEXT_ALIGN_CENTER, color_white); gfx_print(layout.bottom_pos, bottom_buf, layout.bottom_font,
TEXT_ALIGN_CENTER, color_white);
} }
bool ui_drawMainScreen(state_t last_state) bool ui_drawMainScreen(state_t last_state)
{ {
(void) last_state;
bool screen_update = false; bool screen_update = false;
// Total GUI redraw // Total GUI redraw
if(redraw_needed) if(redraw_needed)
@ -269,7 +276,6 @@ void ui_init()
void ui_drawSplashScreen() void ui_drawSplashScreen()
{ {
point_t splash_origin = {0, SCREEN_HEIGHT / 2 + 6}; point_t splash_origin = {0, SCREEN_HEIGHT / 2 + 6};
char *splash_buf = "OpenRTX";
gfx_clearScreen(); gfx_clearScreen();
gfx_print(splash_origin, "OpenRTX", FONT_SIZE_12PT, TEXT_ALIGN_CENTER, gfx_print(splash_origin, "OpenRTX", FONT_SIZE_12PT, TEXT_ALIGN_CENTER,
yellow_fab413); yellow_fab413);
@ -277,11 +283,14 @@ void ui_drawSplashScreen()
bool ui_update(state_t last_state, uint32_t keys) bool ui_update(state_t last_state, uint32_t keys)
{ {
(void) keys;
if(!layout_ready) if(!layout_ready)
{ {
layout = _ui_calculateLayout(); layout = _ui_calculateLayout();
layout_ready = true; layout_ready = true;
} }
bool screen_update = ui_drawMainScreen(last_state); bool screen_update = ui_drawMainScreen(last_state);
return screen_update; return screen_update;
} }