From b815a5b2fec827b1a2cec90e4f8d91cefe143811 Mon Sep 17 00:00:00 2001 From: TT Date: Sun, 11 Aug 2019 23:57:36 +0900 Subject: [PATCH] menu: add feedback at correction/pause menu item --- nanovna.h | 2 ++ ui.c | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/nanovna.h b/nanovna.h index faddfc2..a68633c 100644 --- a/nanovna.h +++ b/nanovna.h @@ -63,6 +63,8 @@ float my_atof(const char *p); void toggle_sweep(void); +extern int8_t sweep_enabled; + /* * ui.c */ diff --git a/ui.c b/ui.c index 9c6982f..e410b49 100644 --- a/ui.c +++ b/ui.c @@ -444,6 +444,7 @@ menu_cal2_cb(int item) // toggle applying correction if (cal_status) cal_status ^= CALSTAT_APPLY; + draw_menu(); break; } draw_cal_status(); @@ -631,8 +632,9 @@ menu_stimulus_cb(int item) break; case 5: /* PAUSE */ toggle_sweep(); - menu_move_back(); - ui_mode_normal(); + //menu_move_back(); + //ui_mode_normal(); + draw_menu(); break; } } @@ -1133,6 +1135,16 @@ menu_item_modify_attribute(const menuitem_t *menu, int item, *bg = 0x0000; *fg = 0xffff; } + } else if (menu == menu_stimulus) { + if (item == 5 /* PAUSE */ && !sweep_enabled) { + *bg = 0x0000; + *fg = 0xffff; + } + } else if (menu == menu_cal) { + if (item == 2 /* CORRECTION */ && (cal_status & CALSTAT_APPLY)) { + *bg = 0x0000; + *fg = 0xffff; + } } }