ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2025-12-06 03:31:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

rearange trace menu

Browse source
This commit is contained in:
TT 2017-02-08 06:17:14 +09:00
parent 807afd8511
commit 0ce695b886
1 changed files with 46 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
ui.c
View file

@ -451,13 +451,20 @@ menu_save_cb(int item)
static void static void
menu_trace_cb(int item) menu_trace_cb(int item)
{ {
extern const menuitem_t menu_trace_op[];
if (item < 0 || item >= 4) if (item < 0 || item >= 4)
return; return;
trace[item].enabled = TRUE; if (trace[item].enabled) {
uistat.current_trace = item; uistat.current_trace = item;
menu_move_back(); menu_push_submenu(menu_trace_op);
ui_mode_normal(); } else {
redraw_all(); trace[item].enabled = TRUE;
uistat.current_trace = item;
menu_move_back();
ui_mode_normal();
redraw_all();
}
} }
static void static void
@ -522,15 +529,38 @@ choose_active_marker(void)
active_marker = -1; active_marker = -1;
} }
static void
choose_active_trace(void)
{
int i;
for (i = 0; i < 4; i++)
if (trace[i].enabled) {
uistat.current_trace = i;
return;
}
}
static void static void
menu_single_trace_cb(int item) menu_trace_op_cb(int item)
{ {
(void)item; (void)item;
int t; int t;
for (t = 0; t < 4; t++) switch (item) {
if (uistat.current_trace != t) { case 0: // OFF
trace[t].enabled = FALSE; if (uistat.current_trace >= 0) {
trace[uistat.current_trace].enabled = FALSE;
choose_active_trace();
} }
break;
case 1: // SINGLE
for (t = 0; t < 4; t++)
if (uistat.current_trace != t) {
trace[t].enabled = FALSE;
}
break;
}
menu_move_back();
ui_mode_normal(); ui_mode_normal();
redraw_all(); redraw_all();
} }
@ -644,12 +674,18 @@ const menuitem_t menu_cal[] = {
{ MT_NONE, NULL, NULL } // sentinel { MT_NONE, NULL, NULL } // sentinel
}; };
const menuitem_t menu_trace_op[] = {
{ MT_CALLBACK, "OFF", menu_trace_op_cb },
{ MT_CALLBACK, "SINGLE", menu_trace_op_cb },
{ MT_CANCEL, "BACK", NULL },
{ MT_NONE, NULL, NULL } // sentinel
};
const menuitem_t menu_trace[] = { const menuitem_t menu_trace[] = {
{ MT_CALLBACK, "TRACE 0", menu_trace_cb }, { MT_CALLBACK, "TRACE 0", menu_trace_cb },
{ MT_CALLBACK, "TRACE 1", menu_trace_cb }, { MT_CALLBACK, "TRACE 1", menu_trace_cb },
{ MT_CALLBACK, "TRACE 2", menu_trace_cb }, { MT_CALLBACK, "TRACE 2", menu_trace_cb },
{ MT_CALLBACK, "TRACE 3", menu_trace_cb }, { MT_CALLBACK, "TRACE 3", menu_trace_cb },
{ MT_CALLBACK, "\2SINGLE\0TRACE", menu_single_trace_cb },
{ MT_CANCEL, "BACK", NULL }, { MT_CANCEL, "BACK", NULL },
{ MT_NONE, NULL, NULL } // sentinel { MT_NONE, NULL, NULL } // sentinel
}; };