Allow marker on|off command use

This commit is contained in:
DiSlord 2020-07-23 16:43:39 +03:00
parent e47129e21d
commit 7008d6d4e9

11
main.c
View file

@ -1834,6 +1834,7 @@ VNA_SHELL_FUNCTION(cmd_edelay)
VNA_SHELL_FUNCTION(cmd_marker) VNA_SHELL_FUNCTION(cmd_marker)
{ {
static const char cmd_marker_list[] = "on|off";
int t; int t;
if (argc == 0) { if (argc == 0) {
for (t = 0; t < MARKERS_MAX; t++) { for (t = 0; t < MARKERS_MAX; t++) {
@ -1844,10 +1845,12 @@ VNA_SHELL_FUNCTION(cmd_marker)
return; return;
} }
redraw_request |= REDRAW_MARKER; redraw_request |= REDRAW_MARKER;
if (strcmp(argv[0], "off") == 0) { // Marker on|off command
active_marker = -1; int enable = get_str_index(argv[0], cmd_marker_list);
if (enable>=1) {
active_marker = enable == 0 ? -1 : 1;
for (t = 0; t < MARKERS_MAX; t++) for (t = 0; t < MARKERS_MAX; t++)
markers[t].enabled = FALSE; markers[t].enabled = enable > 0;
return; return;
} }
t = my_atoi(argv[0])-1; t = my_atoi(argv[0])-1;
@ -1860,7 +1863,7 @@ VNA_SHELL_FUNCTION(cmd_marker)
markers[t].enabled = TRUE; markers[t].enabled = TRUE;
return; return;
} }
static const char cmd_marker_list[] = "on|off";
switch (get_str_index(argv[1], cmd_marker_list)) { switch (get_str_index(argv[1], cmd_marker_list)) {
case 0: markers[t].enabled = TRUE; active_marker = t; return; case 0: markers[t].enabled = TRUE; active_marker = t; return;
case 1: markers[t].enabled =FALSE; if (active_marker == t) active_marker = -1; return; case 1: markers[t].enabled =FALSE; if (active_marker == t) active_marker = -1; return;