From 224a96df635c8ce73d542b87ca714cb6f4650a01 Mon Sep 17 00:00:00 2001 From: erikkaashoek Date: Wed, 3 Feb 2021 14:06:53 +0100 Subject: [PATCH] Hangup output menu repaired again --- sa_core.c | 4 ++-- ui.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sa_core.c b/sa_core.c index ef6b218..63b047a 100644 --- a/sa_core.c +++ b/sa_core.c @@ -1916,8 +1916,8 @@ modulation_again: if (MODE_OUTPUT(setting.mode)) { // No substepping and no RSSI in output mode if (break_on_operation && operation_requested) // break subscanning if requested return(0); // abort - if (MODE_OUTPUT(setting.mode) && setting.modulation != MO_NONE && setting.modulation != MO_EXTERNAL) { // if in output mode with modulation - i = 1; // Everything set so skip LO setting + if ( i==1 && MODE_OUTPUT(setting.mode) && setting.modulation != MO_NONE && setting.modulation != MO_EXTERNAL) { // if in output mode with modulation and LO setup done +// i = 1; // Everything set so skip LO setting goto modulation_again; // Keep repeating sweep loop till user aborts by input } return(0); diff --git a/ui.c b/ui.c index 7dbf96d..9b548dc 100644 --- a/ui.c +++ b/ui.c @@ -2022,6 +2022,7 @@ menu_select_touch(int i, int pos) apply_step: set_keypad_value(keypad); apply: + perform(false, 0, get_sweep_frequency(ST_CENTER), false); draw_menu(); // } // } else if (MT_MASK(menu[i].type) == MT_ADV_CALLBACK && menu[i].reference == menu_sdrive_acb) { @@ -2076,7 +2077,7 @@ menu_select_touch(int i, int pos) step = setting.slider_span; break; } - if (step < 0 && get_sweep_frequency(ST_CENTER) < -step) + if (step < 0 && get_sweep_frequency(ST_CENTER) < (uint32_t)(-step)) uistat.value = 0; else uistat.value = get_sweep_frequency(ST_CENTER) + step;