From 7cd6fb2b5dc2e8d01057f490ed5cd9720d2a3d12 Mon Sep 17 00:00:00 2001 From: erikkaashoek Date: Mon, 20 Jul 2020 09:46:46 +0200 Subject: [PATCH 1/2] Tuned selftests 3,4 and 10 --- sa_core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sa_core.c b/sa_core.c index 30ec653..03ae3e4 100644 --- a/sa_core.c +++ b/sa_core.c @@ -2642,14 +2642,14 @@ static const struct { {// Condition Preparation Center Span Pass Width(%)Stop {TC_BELOW, TP_SILENT, 0.005, 0.01, 0, 0, 0}, // 1 Zero Hz leakage {TC_BELOW, TP_SILENT, 0.015, 0.01, -30, 0, 0}, // 2 Phase noise of zero Hz - {TC_SIGNAL, TP_10MHZ, 20, 7, -37, 10, -90 }, // 3 - {TC_SIGNAL, TP_10MHZ, 30, 7, -32, 10, -90 }, // 4 + {TC_SIGNAL, TP_10MHZ, 20, 7, -39, 10, -90 }, // 3 + {TC_SIGNAL, TP_10MHZ, 30, 7, -34, 10, -90 }, // 4 {TC_BELOW, TP_SILENT, 200, 100, -75, 0, 0}, // 5 Wide band noise floor low mode {TC_BELOW, TPH_SILENT, 600, 720, -75, 0, 0}, // 6 Wide band noise floor high mode {TC_SIGNAL, TP_10MHZEXTRA, 10, 8, -20, 27, -80 }, // 7 BPF loss and stop band {TC_FLAT, TP_10MHZEXTRA, 10, 4, -18, 7, -60}, // 8 BPF pass band flatness {TC_BELOW, TP_30MHZ, 430, 60, -75, 0, -75}, // 9 LPF cutoff - {TC_SIGNAL, TP_10MHZ_SWITCH,20, 7, -38, 10, -60 }, // 10 Switch isolation using high attenuation + {TC_SIGNAL, TP_10MHZ_SWITCH,20, 7, -39, 10, -60 }, // 10 Switch isolation using high attenuation {TC_END, 0, 0, 0, 0, 0, 0}, {TC_MEASURE, TP_30MHZ, 30, 7, -25, 10, -55 }, // 12 Measure power level and noise {TC_MEASURE, TP_30MHZ, 270, 4, -50, 10, -75 }, // 13 Measure powerlevel and noise From 46e9b7790b6027cb418ee77b1bf74aec8ffaf217 Mon Sep 17 00:00:00 2001 From: DiSlord Date: Mon, 20 Jul 2020 12:59:34 +0300 Subject: [PATCH 2/2] use the radio button for reflevel auto/manual and attenuate auto/manual In MARKERS/MODIFY MARKERS/ the 4 marker buttons always have a checkbox --- ui_sa.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ui_sa.c b/ui_sa.c index 0c70f3f..a65e65d 100644 --- a/ui_sa.c +++ b/ui_sa.c @@ -870,7 +870,7 @@ static UI_FUNCTION_ADV_CALLBACK(menu_atten_acb) (void)item; (void)data; if(b){ - b->icon = setting.auto_attenuation ? BUTTON_ICON_CHECK : BUTTON_ICON_NOCHECK; + b->icon = setting.auto_attenuation ? BUTTON_ICON_GROUP_CHECKED : BUTTON_ICON_GROUP; return; } set_auto_attenuation(); @@ -894,7 +894,7 @@ static UI_FUNCTION_ADV_CALLBACK(menu_reflevel_acb) (void)item; (void)data; if(b){ - if (setting.auto_reflevel) b->icon = BUTTON_ICON_CHECK; + b->icon = setting.auto_reflevel ? BUTTON_ICON_GROUP_CHECKED : BUTTON_ICON_GROUP; return; } set_auto_reflevel(true); @@ -949,7 +949,7 @@ static UI_FUNCTION_ADV_CALLBACK(menu_marker_select_acb) { (void)item; if(b){ - if (markers[data-1].enabled) b->icon = BUTTON_ICON_CHECK; + b->icon = markers[data-1].enabled ? BUTTON_ICON_CHECK : BUTTON_ICON_NOCHECK; b->param_1.i = data; return; } @@ -1759,10 +1759,10 @@ static void menu_item_modify_attribute( button->icon = setting.fast_speedup != 0 ? BUTTON_ICON_CHECK_MANUAL : BUTTON_ICON_CHECK_AUTO; } else if (menu == menu_reflevel) { if (item == 1) - button->icon = setting.auto_reflevel ? BUTTON_ICON_CHECK_AUTO : BUTTON_ICON_CHECK_MANUAL; + button->icon = setting.auto_reflevel ? BUTTON_ICON_GROUP: BUTTON_ICON_GROUP_CHECKED; } else if (menu == menu_atten) { if (item == 1) - button->icon = setting.auto_attenuation ? BUTTON_ICON_CHECK_AUTO : BUTTON_ICON_CHECK_MANUAL; + button->icon = setting.auto_attenuation ? BUTTON_ICON_GROUP: BUTTON_ICON_GROUP_CHECKED; } }