UI: Add current mode print on status bar

replace/270dfe5bbaca93d0ecc251a96459ea7d38a24546
Federico Amedeo Izzo 2020-12-07 18:43:54 +01:00
rodzic 27f2fad507
commit 0e1d9b090f
2 zmienionych plików z 39 dodań i 5 usunięć

Wyświetl plik

@ -38,8 +38,8 @@ typedef struct
float v_bat; float v_bat;
uint8_t ui_screen; uint8_t ui_screen;
//enum tuner_mode; uint8_t tuner_mode;
//enum radio_mode; uint8_t radio_mode;
//time_t rx_status_tv; //time_t rx_status_tv;
//bool rx_status; //bool rx_status;
@ -55,6 +55,21 @@ typedef struct
} }
state_t; state_t;
enum TunerMode
{
VFO = 0,
CH,
SCAN,
CHSCAN
};
enum RadioMode
{
MODE_FM = 0,
MODE_NFM,
MODE_DMR,
};
enum RtxStatus enum RtxStatus
{ {
RTX_OFF = 0, RTX_OFF = 0,

Wyświetl plik

@ -71,6 +71,7 @@
#include <keyboard.h> #include <keyboard.h>
#include <platform.h> #include <platform.h>
#include <hwconfig.h> #include <hwconfig.h>
#include <string.h>
const char *menuItems[MENU_NUM] = const char *menuItems[MENU_NUM] =
{ {
@ -102,12 +103,13 @@ typedef struct layout_t
fontSize_t bottom_font; fontSize_t bottom_font;
} layout_t; } layout_t;
const color_t color_white = {255, 255, 255};
const color_t color_grey = {60, 60, 60};
const color_t yellow_fab413 = {250, 180, 19};
layout_t layout; layout_t layout;
bool layout_ready = false; bool layout_ready = false;
bool redraw_needed = true; bool redraw_needed = true;
color_t color_white = {255, 255, 255};
color_t color_grey = {60, 60, 60};
color_t yellow_fab413 = {250, 180, 19};
layout_t _ui_calculateLayout() layout_t _ui_calculateLayout()
{ {
@ -233,6 +235,23 @@ void _ui_drawTopBar(state_t* last_state)
point_t bat_pos = {SCREEN_WIDTH - bat_width - layout.horizontal_pad, point_t bat_pos = {SCREEN_WIDTH - bat_width - layout.horizontal_pad,
layout.vertical_pad / 2}; layout.vertical_pad / 2};
gfx_drawBattery(bat_pos, bat_width, bat_height, percentage); gfx_drawBattery(bat_pos, bat_width, bat_height, percentage);
// Print radio mode on top bar
char mode[4] = "";
switch(last_state->radio_mode)
{
case MODE_FM:
strcpy(mode, "FM");
break;
case MODE_NFM:
strcpy(mode, "NFM");
break;
case MODE_DMR:
strcpy(mode, "DMR");
break;
}
gfx_print(layout.top_pos, mode, layout.top_font, TEXT_ALIGN_LEFT,
color_white);
} }
void _ui_drawMiddleVFO(state_t* last_state) void _ui_drawMiddleVFO(state_t* last_state)