From ae9a7dcd519ee1607045d2aa64f2a9997c37ed00 Mon Sep 17 00:00:00 2001
From: erikkaashoek <erik@kaashoek.com>
Date: Wed, 19 Oct 2022 10:42:57 +0200
Subject: [PATCH] Updated noise corrections and NF RBW

---
 nanovna.h |  4 ++--
 si4468.c  | 14 +++++++-------
 ui_sa.c   |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/nanovna.h b/nanovna.h
index 72ca6ab..40e0a12 100644
--- a/nanovna.h
+++ b/nanovna.h
@@ -18,7 +18,7 @@
  */
 #include "ch.h"
 
-#ifdef TINYSA_F303
+//#ifdef TINYSA_F303
 #ifdef TINYSA_F072
 #error "Remove comment for #ifdef TINYSA_F303"
 #endif
@@ -26,7 +26,7 @@
 #define TINYSA4
 #endif
 #define TINYSA4_PROTO
-#endif
+//#endif
 
 #ifdef TINYSA_F072
 #ifdef TINYSA_F303
diff --git a/si4468.c b/si4468.c
index 4865fe8..3c7c936 100644
--- a/si4468.c
+++ b/si4468.c
@@ -1736,16 +1736,16 @@ static const RBW_t RBW_choices[] =
  {SI4463_RBW_850kHz, -9,8500,  8},
 #else
 
-#define NOISE_BASE_CORRECTION   18   // 7
- {SI4463_RBW_02kHz,  10,2,  NOISE_BASE_CORRECTION +  -20}, //
- {SI4463_RBW_1kHz,   15,10, NOISE_BASE_CORRECTION +  -5},//
+#define NOISE_BASE_CORRECTION   7   // 7
+ {SI4463_RBW_02kHz,  10,2,  NOISE_BASE_CORRECTION +  2}, //
+ {SI4463_RBW_1kHz,   15,10, NOISE_BASE_CORRECTION +  -12},//
  {SI4463_RBW_3kHz,   10,30, NOISE_BASE_CORRECTION +  -5},//
- {SI4463_RBW_10kHz,  14,100,NOISE_BASE_CORRECTION +  5}, //
+ {SI4463_RBW_10kHz,  14,100,NOISE_BASE_CORRECTION +  0}, //
  {SI4463_RBW_30kHz,  0,300, NOISE_BASE_CORRECTION +  0},//
- {SI4463_RBW_100kHz, 0,1000,NOISE_BASE_CORRECTION +  0},//
+ {SI4463_RBW_100kHz, 0,1000,NOISE_BASE_CORRECTION +  -2},//
  {SI4463_RBW_300kHz, 0,3000,NOISE_BASE_CORRECTION},      // 300k must have RSSI correction = 0
- {SI4463_RBW_600kHz, 5,6000,NOISE_BASE_CORRECTION +  -5}, // was 0
- {SI4463_RBW_850kHz, 8,8500,NOISE_BASE_CORRECTION +  0},// was 5
+ {SI4463_RBW_600kHz, 5,6000,NOISE_BASE_CORRECTION +  -0},//
+ {SI4463_RBW_850kHz, 8,8500,NOISE_BASE_CORRECTION +  3},//
 #endif
 };
 
diff --git a/ui_sa.c b/ui_sa.c
index 55cd5a0..3fe3de1 100644
--- a/ui_sa.c
+++ b/ui_sa.c
@@ -1808,7 +1808,7 @@ validate:
 #else
         set_sweep_frequency(ST_SPAN, 100000);
 #endif
-        set_RBW(get_sweep_frequency(ST_SPAN)/100 / 100);
+        set_RBW(1000);  // 300kHz
       }
 
 //      set_sweep_frequency(ST_SPAN, 0);