Updated noise corrections and NF RBW

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

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
 };
 

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);