Updated RBW levels

nanovna.h

@@ -136,6 +136,8 @@
 #define HIGH_MAX_FREQ_MHZ   1130
 #define MINIMUM_DIRECT_FREQ  830000000ULL
 #define ULTRA_MAX_FREQ      5350000000ULL           // Start of harmonic mode
+#define DEFAULT_ULTRA_THRESHOLD 700000000ULL
+
 #define ULTRA_AUTO         10000000000ULL // 10GHz
 //#define ULTRA_MAX_FREQ      2900000000ULL
 #define MAX_LO_FREQ         4350000000ULL

sa_cmd.c

@@ -270,7 +270,7 @@ VNA_SHELL_FUNCTION(cmd_agc)
 VNA_SHELL_FUNCTION(cmd_attenuate)
 {
   if (argc != 1 || argv[0][0] == '?') {
-    usage_printf("attenuate 0..31|auto\r\n");
+    usage_printf("attenuate 0..31|auto\r\n%4.2F\r\n", get_attenuation());
     return;
   }
   if (get_str_index(argv[0],"auto") == 0) {

sa_core.c

@@ -67,7 +67,6 @@ static float old_a = -150;          // cached value to reduce writes to level re
 int spur_gate = 100;
 
 #ifdef __ULTRA__
-#define DEFAULT_ULTRA_THRESHOLD 800000000ULL
 freq_t ultra_threshold;
 bool ultra;
 static int LO_harmonic;
@@ -4937,7 +4936,7 @@ static volatile int dummy;
 #endif
   // -------------------------- auto attenuate ----------------------------------
 #ifdef TINYSA4
-#define AUTO_TARGET_LEVEL   (actual_rbw_x10  >= 10 ? -30 : -40)
+#define AUTO_TARGET_LEVEL   (actual_rbw_x10  >= 10 ? -35 : -40)
 #define LNA_AUTO_TARGET_LEVEL   -45
 #else
 #define AUTO_TARGET_LEVEL   -25

si4468.c

@@ -1718,15 +1718,15 @@ static const RBW_t RBW_choices[] =
 #else
 
 #define NOISE_BASE_CORRECTION   7
- {SI4463_RBW_02kHz,  15,3,  NOISE_BASE_CORRECTION + 10},   // 15 ->10
+ {SI4463_RBW_02kHz,  18,3,  NOISE_BASE_CORRECTION + 10},   // 15 ->10
  {SI4463_RBW_1kHz,   15,10, NOISE_BASE_CORRECTION +  -5},  //  5 -> -5
  {SI4463_RBW_3kHz,   10,30, NOISE_BASE_CORRECTION +  -5},   // 0 ->-5
- {SI4463_RBW_10kHz,  10,100,NOISE_BASE_CORRECTION +  0},  // 0 -> 0
+ {SI4463_RBW_10kHz,  14,100,NOISE_BASE_CORRECTION +  0},  // 0 -> 0
  {SI4463_RBW_30kHz,  0,300, NOISE_BASE_CORRECTION +  -5},    //  5 -> -5
  {SI4463_RBW_100kHz, 0,1000,NOISE_BASE_CORRECTION +  -5},      // 5 -> -5
  {SI4463_RBW_300kHz, 0,3000,NOISE_BASE_CORRECTION},       // 300k must have RSSI correction = 0
  {SI4463_RBW_600kHz, 5,6000,NOISE_BASE_CORRECTION +  0},      // 10-?0
- {SI4463_RBW_850kHz, 5,8500,NOISE_BASE_CORRECTION +  10},     // 8->10
+ {SI4463_RBW_850kHz, 8,8500,NOISE_BASE_CORRECTION +  10},     // 8->10
 #endif
 };
 

ui_sa.c

@@ -1735,7 +1735,7 @@ static UI_FUNCTION_ADV_CALLBACK(menu_traces_acb)
         plot_printf(b->text, sizeof(b->text), "SUBTRACT\nTRACE %d", setting.subtract[current_trace]);
       else
         plot_printf(b->text, sizeof(b->text), "SUBTRACT\nOFF");
-      b->icon = setting.subtract[current_trace] ? BUTTON_ICON_CHECK : BUTTON_ICON_NOCHECK;
+      // b->icon = setting.subtract[current_trace] ? BUTTON_ICON_CHECK : BUTTON_ICON_NOCHECK;  // icon not needed
     } else if (data == 4) {
       if (current_trace == TRACES_MAX-1)
         b->fg = LCD_DARK_GREY;
@@ -1743,7 +1743,7 @@ static UI_FUNCTION_ADV_CALLBACK(menu_traces_acb)
         b->icon = setting.normalized[current_trace] ? BUTTON_ICON_CHECK : BUTTON_ICON_NOCHECK;
     } else if (data == 3) {
       plot_printf(b->text, sizeof(b->text), "CALC\n%s", averageText[setting.average[current_trace]]);
-      b->icon = setting.average[current_trace] ? BUTTON_ICON_CHECK : BUTTON_ICON_NOCHECK;
+      // b->icon = setting.average[current_trace] ? BUTTON_ICON_CHECK : BUTTON_ICON_NOCHECK; // icon not needed
     }
     return;
   }