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

use time mode for scale for group delay

Browse source
This commit is contained in:
TT 2019-09-08 21:39:57 +09:00
parent 342c5ff669
commit 9d41719fdc
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ui.c
View file

@ -68,7 +68,7 @@ enum {
}; };
enum { enum {
KM_START, KM_STOP, KM_CENTER, KM_SPAN, KM_CW, KM_SCALE, KM_REFPOS, KM_EDELAY, KM_VELOCITY_FACTOR KM_START, KM_STOP, KM_CENTER, KM_SPAN, KM_CW, KM_SCALE, KM_REFPOS, KM_EDELAY, KM_VELOCITY_FACTOR, KM_SCALEDELAY
}; };
uint8_t ui_mode = UI_NORMAL; uint8_t ui_mode = UI_NORMAL;
@ -742,12 +742,16 @@ static void
menu_scale_cb(int item) menu_scale_cb(int item)
{ {
int status; int status;
int km = KM_SCALE + item;
if (km == KM_SCALE && trace[uistat.current_trace].type == TRC_DELAY) {
km = KM_SCALEDELAY;
}
status = btn_wait_release(); status = btn_wait_release();
if (status & EVT_BUTTON_DOWN_LONG) { if (status & EVT_BUTTON_DOWN_LONG) {
ui_mode_numeric(KM_SCALE + item); ui_mode_numeric(km);
ui_process_numeric(); ui_process_numeric();
} else { } else {
ui_mode_keypad(KM_SCALE + item); ui_mode_keypad(km);
ui_process_keypad(); ui_process_keypad();
} }
} }
@ -1223,11 +1227,12 @@ const keypads_t * const keypads_mode_tbl[] = {
keypads_scale, // scale keypads_scale, // scale
keypads_scale, // refpos keypads_scale, // refpos
keypads_time, // electrical delay keypads_time, // electrical delay
keypads_scale // velocity factor keypads_scale, // velocity factor
keypads_time // scale of delay
}; };
const char * const keypad_mode_label[] = { const char * const keypad_mode_label[] = {
"START", "STOP", "CENTER", "SPAN", "CW FREQ", "SCALE", "REFPOS", "EDELAY", "VELOCITY%" "START", "STOP", "CENTER", "SPAN", "CW FREQ", "SCALE", "REFPOS", "EDELAY", "VELOCITY%", "DELAY"
}; };
void void
@ -1487,6 +1492,9 @@ fetch_numeric_target(void)
case KM_VELOCITY_FACTOR: case KM_VELOCITY_FACTOR:
uistat.value = velocity_factor; uistat.value = velocity_factor;
break; break;
case KM_SCALEDELAY:
uistat.value = get_trace_scale(uistat.current_trace) * 1e12;
break;
} }
{ {
@ -1706,6 +1714,9 @@ keypad_click(int key)
case KM_VELOCITY_FACTOR: case KM_VELOCITY_FACTOR:
velocity_factor = value; velocity_factor = value;
break; break;
case KM_SCALEDELAY:
set_trace_scale(uistat.current_trace, value * 1e-12); // pico second
break;
} }
return KP_DONE; return KP_DONE;