From 9454e1fb7e21630d49a4c47f20aa020db1cc57bb Mon Sep 17 00:00:00 2001
From: erikkaashoek <erik@kaashoek.com>
Date: Wed, 1 Jun 2022 11:10:49 +0200
Subject: [PATCH] Mode switching repaired

---
 nanovna.h | 4 ++--
 sa_core.c | 3 ++-
 si4468.c  | 2 +-
 ui_sa.c   | 8 ++++++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/nanovna.h b/nanovna.h
index d21752f..eba796a 100644
--- a/nanovna.h
+++ b/nanovna.h
@@ -131,10 +131,10 @@
 #define DEFAULT_SPUR_OFFSET ((freq_t)(actual_rbw_x10 > 3000 ? 1500000 : 1000000))
 #define STATIC_DEFAULT_SPUR_OFFSET ((freq_t) 1500000)
 #define DEFAULT_MAX_FREQ    ((freq_t) 800000000)
-#define MAX_LOW_OUTPUT_FREQ ((freq_t)1100000000)
+#define MAX_LOW_OUTPUT_FREQ ((freq_t)1130000000)
 #define HIGH_MIN_FREQ_MHZ   136// 825
 #define HIGH_MAX_FREQ_MHZ   1130
-#define MINIMUM_DIRECT_FREQ  830000000ULL
+#define MINIMUM_DIRECT_FREQ  823000000ULL
 #define ULTRA_MAX_FREQ      5350000000ULL           // Start of harmonic mode
 #define DEFAULT_ULTRA_THRESHOLD 700000000ULL
 
diff --git a/sa_core.c b/sa_core.c
index 2802fce..4c2b442 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -1322,6 +1322,7 @@ void set_average(int t, int v)
       && (v != AV_QUASI)
 #endif
       );
+  dirty = true;
   if (enable) {
     setting.scan_after_dirty[t] = 0;
   }
@@ -5612,7 +5613,7 @@ static void test_acquire(int i)
   pause_sweep();
   if (test_case[i].kind == TC_LEVEL) {
     float summed_peak_level = 0;
-#define LEVEL_TEST_SWEEPS    10
+#define LEVEL_TEST_SWEEPS    2
     for (int k=0; k<LEVEL_TEST_SWEEPS; k++) {
       sweep(false);
       float local_peak_level = 0.0;
diff --git a/si4468.c b/si4468.c
index cbbd433..a844f2d 100644
--- a/si4468.c
+++ b/si4468.c
@@ -1786,7 +1786,7 @@ freq_t SI4463_set_freq(freq_t freq)
 //  SI4463_set_gpio(3,SI446X_GPIO_MODE_DRIVE1);       // For measuring duration of set_freq
   int S = 4 ;               // Approx 100 Hz channels
   SI4463_channel = 0;
-  if (freq >= 822000000 && freq <= 1130000000)         {       // 822 to 1130MHz
+  if (freq >= 822000000 && freq <= 1150000000)         {       // 822 to 1130MHz
     SI4463_band = 0;
     output_divider = 4 * FREQ_MULTIPLIER;
   } else if (freq >= 411000000 && freq <= 566000000) {    // 411 to  568MHz
diff --git a/ui_sa.c b/ui_sa.c
index 22a8cc1..77fb31e 100644
--- a/ui_sa.c
+++ b/ui_sa.c
@@ -798,11 +798,15 @@ static UI_FUNCTION_ADV_CALLBACK(menu_output_level_acb)
   reset_settings(old_m);
 }
 
-
-
+#ifdef TINYSA4
+static const int item_to_mode[3] = { 0,2,3 };
+#else
+static const int item_to_mode[3] = { 0,1,2,3 };
+#endif
 static UI_FUNCTION_ADV_CALLBACK(menu_mode_acb)
 {
   (void)data;
+  item = item_to_mode[item];
   if (b){
     if (item == setting.mode)  {
       b->param_1.text = "Return";