KB8PMY
/
tinySA
mirror of https://github.com/erikkaashoek/tinySA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'DiSlord_test_branch'

Browse Source
pull/4/head
erikkaashoek 6 years ago
parent 87635d665d 934ab41d8b
commit f5c33824fe
5 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File

6
ili9341.c
Unescape View File

@ -523,17 +523,21 @@ void ili9341_clear_screen(void)
{
ili9341_fill(0, 0, ILI9341_WIDTH, ILI9341_HEIGHT, background_color);
}
#if 0
#ifndef ili9341_set_foreground
void ili9341_set_foreground(uint16_t fg)
{
foreground_color = fg;
}
#endif
#ifndef ili9341_set_background
void ili9341_set_background(uint16_t bg)
{
background_color = bg;
}
#endif
void ili9341_set_rotation(uint8_t r)
{
// static const uint8_t rotation_const[]={DISPLAY_ROTATION_0, DISPLAY_ROTATION_90,

4
main.c
Unescape View File

@ -2797,8 +2797,8 @@ void hard_fault_handler_c(uint32_t *sp)
int y = 0;
int x = OFFSETX + 1;
static char buf[96];
ili9341_set_background(0x0000);
ili9341_set_foreground(0xFFFF);
ili9341_set_background(DEFAULT_BG_COLOR);
ili9341_set_foreground(DEFAULT_FG_COLOR);
plot_printf(buf, sizeof(buf), "SP 0x%08x", (uint32_t)sp);ili9341_drawstring(buf, x, y+=FONT_STR_HEIGHT);
plot_printf(buf, sizeof(buf), "R0 0x%08x", r0);ili9341_drawstring(buf, x, y+=FONT_STR_HEIGHT);

4
nanovna.h
Unescape View File

@ -540,13 +540,15 @@ void ili9341_init(void);
void ili9341_test(int mode);
void ili9341_bulk(int x, int y, int w, int h);
void ili9341_fill(int x, int y, int w, int h, uint16_t color);
#if 0
#if 1
void ili9341_set_foreground(uint16_t fg);
void ili9341_set_background(uint16_t fg);
#else
#define ili9341_set_foreground(fg) { foreground_color = fg; }
#define ili9341_set_background(bg) { background_color = bg;}
#endif
void ili9341_clear_screen(void);
void blit8BitWidthBitmap(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint8_t *bitmap);
void ili9341_drawchar(uint8_t ch, int x, int y);

34
ui.c
Unescape View File

@ -129,6 +129,7 @@ static void ui_process_keypad(void);
static void ui_process_numeric(void);
static void choose_active_marker(void);
static void menu_move_back(void);
static void menu_move_back_and_leave_ui(void);
static void menu_push_submenu(const menuitem_t *submenu);
//static const menuitem_t menu_marker_type[];
@ -767,8 +768,7 @@ menu_marker_op_cb(int item, uint8_t data)
break;
#endif
}
menu_move_back();
ui_mode_normal();
menu_move_back_and_leave_ui();
redraw_request |= REDRAW_CAL_STATUS;
//redraw_all();
}
@ -1138,13 +1138,25 @@ menu_move_back(void)
area_width = 0;
} else {
// redraw_frame();
// request_to_redraw_grid();
redraw_request |= REDRAW_AREA | REDRAW_FREQUENCY | REDRAW_CAL_STATUS | REDRAW_BATTERY;
area_width = AREA_WIDTH_NORMAL - MENU_BUTTON_WIDTH;
}
draw_menu();
}
static void
menu_move_back_and_leave_ui(void)
{
if (menu_current_level == 0)
return;
menu_current_level--;
if (selection >= 0)
selection = 0;
ensure_selection();
ui_mode_normal();
}
static void
menu_push_submenu(const menuitem_t *submenu)
{
@ -1742,14 +1754,14 @@ erase_numeric_input(void)
static void
leave_ui_mode()
{
if (ui_mode == UI_MENU) {
request_to_draw_cells_behind_menu();
erase_menu_buttons();
} else if (ui_mode == UI_NUMERIC) {
request_to_draw_cells_behind_numeric_input();
erase_numeric_input();
}
redraw_request|=REDRAW_AREA|REDRAW_FREQUENCY;
// if (ui_mode == UI_MENU) {
// request_to_draw_cells_behind_menu();
// erase_menu_buttons();
// } else if (ui_mode == UI_NUMERIC) {
// request_to_draw_cells_behind_numeric_input();
// erase_numeric_input();
// }
redraw_request|=REDRAW_AREA | REDRAW_FREQUENCY | REDRAW_CAL_STATUS | REDRAW_BATTERY;
}
#ifdef __VNA__

44
ui_sa.c
Unescape View File

@ -553,14 +553,12 @@ extern const menuitem_t menu_topultra[];
case 0:
// if (setting.mode != M_LOW)
// set_mode(M_LOW);
menu_move_back();
ui_mode_normal();
menu_move_back_and_leave_ui();
break;
case 1:
// if (setting.mode != M_HIGH)
// set_mode(M_HIGH);
menu_move_back();
ui_mode_normal();
menu_move_back_and_leave_ui();
break;
case 2:
menu_push_submenu(menu_lowoutputmode);
@ -588,8 +586,7 @@ void menu_load_preset_cb(int item, uint8_t data)
return;
}
}
menu_move_back();
ui_mode_normal();
menu_move_back_and_leave_ui();
}
void menu_store_preset_cb(int item, uint8_t data)
@ -601,8 +598,7 @@ void menu_store_preset_cb(int item, uint8_t data)
data = 0;
}
caldata_save(data);
menu_move_back();
ui_mode_normal();
menu_move_back_and_leave_ui();
}
@ -636,8 +632,7 @@ static void menu_calibrate_cb(int item, uint8_t data)
switch (item) {
case 1:
sweep_mode = SWEEP_CALIBRATE;
menu_move_back();
ui_mode_normal();
menu_move_back_and_leave_ui();
break;
case 2:
reset_calibration();
@ -672,8 +667,7 @@ static void menu_config_cb(int item, uint8_t data)
break;
case 2:
sweep_mode = 0; // Suspend sweep to save time
menu_move_back();
ui_mode_normal();
menu_move_back_and_leave_ui();
setting.test = 0;
setting.test_argument = 0;
sweep_mode = SWEEP_SELFTEST;
@ -868,8 +862,7 @@ static void menu_atten_cb(int item, uint8_t data)
(void)item;
(void)data;
set_auto_attenuation();
menu_move_back();
ui_mode_normal();
menu_move_back_and_leave_ui();
}
static void menu_atten_high_cb(int item, uint8_t data)
@ -877,8 +870,7 @@ static void menu_atten_high_cb(int item, uint8_t data)
(void)item;
setting.auto_attenuation = false;
set_attenuation(data);
menu_move_back();
ui_mode_normal();
menu_move_back_and_leave_ui();
}
static void menu_reflevel_cb(int item, uint8_t data)
@ -886,8 +878,7 @@ static void menu_reflevel_cb(int item, uint8_t data)
(void)item;
(void)data;
set_auto_reflevel(true);
menu_move_back();
ui_mode_normal();
menu_move_back_and_leave_ui();
}
static void menu_storage_cb(int item, uint8_t data)
@ -910,8 +901,7 @@ static void menu_storage_cb(int item, uint8_t data)
toggle_waterfall();
break;
}
menu_move_back();
ui_mode_normal();
menu_move_back_and_leave_ui();
// draw_cal_status();
}
@ -919,8 +909,7 @@ static void menu_average_cb(int item, uint8_t data)
{
(void)data;
set_average(item);
menu_move_back();
ui_mode_normal();
menu_move_back_and_leave_ui();
redraw_request |= REDRAW_CAL_STATUS;
}
@ -979,17 +968,14 @@ static void menu_rbw_cb(int item, uint8_t data)
{
(void)item;
set_RBW(rbwsel_x10[data]);
menu_move_back();
ui_mode_normal();
// draw_cal_status();
menu_move_back_and_leave_ui();
}
static void menu_unit_cb (int item, uint8_t data)
{
(void)item;
set_unit(data);
menu_move_back();
ui_mode_normal();
menu_move_back_and_leave_ui();
}
enum {
@ -1001,9 +987,7 @@ static void menu_scale_per_cb(int item, uint8_t data)
{
(void)item;
set_scale(menu_scale_per_value[data]);
menu_move_back();
ui_mode_normal();
// draw_cal_status();
menu_move_back_and_leave_ui();
}
static void menu_trigger_cb(int item, uint8_t data)

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.