Merge branch 'master' of https://github.com/erikkaashoek/tinySA into DiSlord_test_branch

plot.c

@@ -1953,7 +1953,7 @@ static void cell_grid_line_info(int x0, int y0)
   char buf[32];
   int xpos = GRID_X_TEXT - x0;
   int ypos = 0 - y0 + 2;
-  ili9341_set_foreground(DEFAULT_GRID_COLOR);
+  ili9341_set_foreground(/* DEFAULT_GRID_COLOR */ DEFAULT_MENU_COLOR );
   float   ref = get_trace_refpos(TRACE_ACTUAL);
   float scale = get_trace_scale(TRACE_ACTUAL);;
   for (int i = 0; i < NGRIDY; i++){
@@ -2057,8 +2057,8 @@ static void cell_draw_marker_info(int x0, int y0)
 //      buf[k++] = 0;
       ili9341_set_background(DEFAULT_BG_COLOR);
       uint16_t color;
-      if ((setting.mode == M_LOW && temppeakLevel - get_attenuation() > -1) ||
+      if ((setting.mode == M_LOW && temppeakLevel - get_attenuation() - setting.offset > -1) ||
-          (setting.mode == M_HIGH && temppeakLevel - get_attenuation() > -10))
+          (setting.mode == M_HIGH && temppeakLevel - get_attenuation()- setting.offset > -10))
         color = BRIGHT_COLOR_RED;
       else
         color = marker_color(markers[i].mtype);

sa_core.c

@@ -412,6 +412,7 @@ void set_attenuation(float a)       // Is used both in output mode and input mod
     } else
       setting.atten_step = 0;
     setting.auto_attenuation = false;
+    dirty = true;
   }
   if (a<0.0)
       a = 0;
@@ -800,6 +801,17 @@ void calculate_step_delay(void)
     if (setting.frequency_step == 0) {            // zero span mode, not dependent on selected RBW
       SI4432_step_delay = 0;
     } else {
+#if 0       // Table for 200us delay inside SI4432_set_freq
+      if (actual_rbw_x10 >= 1910)      { SI4432_step_delay =  150; SI4432_offset_delay = 10; }
+      else if (actual_rbw_x10 >= 1420) { SI4432_step_delay =  350; SI4432_offset_delay = 10; }
+      else if (actual_rbw_x10 >= 750)  { SI4432_step_delay =  450; SI4432_offset_delay = 10; }
+      else if (actual_rbw_x10 >= 560)  { SI4432_step_delay =  650; SI4432_offset_delay = 10; }
+      else if (actual_rbw_x10 >= 370)  { SI4432_step_delay =  700; SI4432_offset_delay = 10; }
+      else if (actual_rbw_x10 >= 180)  { SI4432_step_delay = 1100; SI4432_offset_delay = 100; }
+      else if (actual_rbw_x10 >=  90)  { SI4432_step_delay = 1700; SI4432_offset_delay = 400; }
+      else if (actual_rbw_x10 >=  48)  { SI4432_step_delay = 3300; SI4432_offset_delay = 400; }
+      else                             { SI4432_step_delay = 6400; SI4432_offset_delay = 800; }
+#else
       if (actual_rbw_x10 >= 1910)      { SI4432_step_delay =  280; SI4432_offset_delay = 100; }
       else if (actual_rbw_x10 >= 1420) { SI4432_step_delay =  350; SI4432_offset_delay = 100; }
       else if (actual_rbw_x10 >= 750)  { SI4432_step_delay =  450; SI4432_offset_delay = 100; }
@@ -809,6 +821,7 @@ void calculate_step_delay(void)
       else if (actual_rbw_x10 >=  90)  { SI4432_step_delay = 1700; SI4432_offset_delay = 400; }
       else if (actual_rbw_x10 >=  50)  { SI4432_step_delay = 3300; SI4432_offset_delay = 400; }
       else                             { SI4432_step_delay = 6400; SI4432_offset_delay =1600; }
+#endif
       if (setting.step_delay_mode == SD_PRECISE)    // In precise mode wait twice as long for RSSI to stabalize
         SI4432_step_delay *= 2;
     }
@@ -1649,8 +1662,8 @@ static bool sweep(bool break_on_operation)
 
   modulation_counter = 0;                                             // init modulation counter in case needed
 
-//  if (sweep_counter > 5000 && setting.average == AV_OFF)            // refresh HW after 5000 sweeps
+  if (sweep_counter > 5000 && setting.average == AV_OFF && setting.frequency_step > 0)      // refresh HW after 5000 sweeps
-//    dirty = true;
+    dirty = true;
 
   if (dirty)                    // Calculate new scanning solution
     sweep_counter = 0;

ui_sa.c

@@ -1291,7 +1291,7 @@ static const menuitem_t menu_atten[] = {
   { MT_CALLBACK | MT_LOW, 0,               "AUTO",    menu_atten_cb},
   { MT_KEYPAD | MT_LOW,   KM_ATTENUATION,  "MANUAL",  "0..30"},
   { MT_CALLBACK | MT_HIGH,0,               "0dB",     menu_atten_high_cb},
-  { MT_CALLBACK | MT_HIGH,30,              "30dB",    menu_atten_high_cb},
+  { MT_CALLBACK | MT_HIGH,30,              "\00225..30dB",    menu_atten_high_cb},
   { MT_CANCEL, 0,               "\032 BACK", NULL },
   { MT_FORM | MT_NONE,   0, NULL, NULL } // sentinel
 };