Various UI improvements

chprintf.c

@@ -182,7 +182,7 @@ static char *ftoa(char *p, float num, uint32_t precision) {
   return p;
 }
 
-static char *ftoaS(char *p, float num, uint32_t precision) {
+static char *ftoaS(char *p, float num, int precision) {
   char prefix=0;
   char *ptr;
   if (num > 1000.0){
@@ -200,10 +200,12 @@ static char *ftoaS(char *p, float num, uint32_t precision) {
 
   // Auto set precision
   uint32_t l = num;
-  if (l > 100)
+  if (l >= 100)
     precision-=2;
-  else if (l > 10)
+  else if (l >= 10)
     precision-=1;
+  if (precision<0)
+    precision=0;
   p=ftoa(p, num, precision);
   if (prefix)
     *p++ = prefix;

sa_core.c

@@ -193,6 +193,10 @@ void set_sweep_time(float t)
   if (t > 600000.0)
     t = 600000.0;
   setting.sweep_time = t;
+  float ta = calc_min_sweep_time();
+  if (ta < t)
+    ta = t;
+  setting.actual_sweep_time = ta;
   if (FREQ_IS_CW())
     update_grid();            // Really only needed in zero span mode
   redraw_request |= REDRAW_FREQUENCY;
@@ -1978,10 +1982,11 @@ void draw_cal_status(void)
   ili9341_drawstring("RBW:", x, y);
 
   y += YSTEP;
-  plot_printf(buf, BLEN, "%dkHz", (int)actual_rbw);
+  plot_printf(buf, BLEN, "%.1FkHz", actual_rbw);
-  buf[6]=0;
+//  buf[6]=0;
   ili9341_drawstring(buf, x, y);
 
+#if 0
   // VBW
   if (setting.frequency_step > 0) {
     ili9341_set_foreground(DEFAULT_FG_COLOR);
@@ -1993,7 +1998,7 @@ void draw_cal_status(void)
     buf[6]=0;
     ili9341_drawstring(buf, x, y);
   }
-
+#endif
   // Sweep time
   if (dirty)
     color = BRIGHT_COLOR_RED;

ui.c

@@ -1949,7 +1949,7 @@ step_round(uint32_t v)
 {
   // decade step
   uint32_t x = 1;
-  for (x = 1; x*10 < v; x*= 10)
+  for (x = 1; x*10 <= v; x*= 10)
     ;
 
   // 1-2-5 step
@@ -1974,6 +1974,21 @@ lever_zoom_span(int status)
   set_sweep_frequency(ST_SPAN, span);
 }
 
+static void
+lever_zoom_time(int status)
+{
+  uint32_t time = setting.sweep_time; // in mS
+  if (time < MINIMUM_SWEEP_TIME)
+    time = MINIMUM_SWEEP_TIME;
+  if (status & EVT_UP) {
+    time = time*10/25;
+  } else if (status & EVT_DOWN) {
+    time = time*25/10;
+  }
+  time = step_round(time);
+  set_sweep_time(time);
+}
+
 static void
 lever_move(int status, int mode)
 {
@@ -2022,7 +2037,7 @@ ui_process_normal(void)
         if (FREQ_IS_STARTSTOP())
           lever_move(status, ST_STOP);
         else
-        lever_zoom_span(status);
+          lever_zoom_time(status);
         break;
 #ifdef __VNA__
       case LM_EDELAY:

ui_sa.c

@@ -1169,20 +1169,20 @@ const menuitem_t  menu_modulation[] = {
 
 const menuitem_t  menu_lowoutputmode[] = {
   { MT_FORM | MT_CALLBACK, 0,                   "LOW OUTPUT              %s",       menu_outputmode_cb},
-  { MT_FORM | MT_KEYPAD,   KM_CENTER,           "FREQ: %s",         "10kHz..350Mhz"},
+  { MT_FORM | MT_KEYPAD,   KM_CENTER,           "FREQ: %s",         "10kHz..350MHz"},
   { MT_FORM | MT_KEYPAD,   KM_LOWOUTLEVEL,      "LEVEL: %s",        "-76..-6"},
   { MT_FORM | MT_SUBMENU,  0,                   "MODULATION: %s",   menu_modulation},
   { MT_FORM | MT_KEYPAD,   KM_SPAN,             "SPAN: %s",         "0..350MHz"},
   { MT_FORM | MT_KEYPAD | MT_LOW, KM_LEVELSWEEP,"LEVELSWEEP: %s",   "-70..70"},
   { MT_FORM | MT_KEYPAD,   KM_SWEEP_TIME,       "SWEEP TIME: %s",   "0..600S"},
-  //  { MT_FORM | MT_KEYPAD,   KM_10MHZ,        "10MHZ: %s",         NULL},
+  //  { MT_FORM | MT_KEYPAD,   KM_10MHZ,        "10MHz: %s",         NULL},
   { MT_FORM | MT_CANCEL,   0,           "MODE",                     NULL },
   { MT_FORM | MT_NONE, 0, NULL, NULL } // sentinel
 };
 
 const menuitem_t  menu_highoutputmode[] = {
   { MT_FORM | MT_CALLBACK,  0,          "HIGH OUTPUT             %s",      menu_outputmode_cb},
-  { MT_FORM | MT_KEYPAD,    KM_CENTER,  "FREQ: %s",         "240MHz..960Mhz"},
+  { MT_FORM | MT_KEYPAD,    KM_CENTER,  "FREQ: %s",         "240MHz..960MHz"},
   { MT_FORM | MT_SUBMENU,   0,          "LEVEL: %s",        menu_drive_wide},
   { MT_FORM | MT_SUBMENU,   0,          "MODULATION: %s",   menu_modulation},
   { MT_FORM | MT_KEYPAD,    KM_SPAN,    "SPAN: %s",         NULL},
@@ -1382,7 +1382,7 @@ static const menuitem_t menu_settings2[] =
 #ifdef __ULTRA__
   { MT_SUBMENU,0,               "HARMONIC",         menu_harmonic},
 #endif
-//  { MT_KEYPAD, KM_10MHZ,"\00210MHZ\0ACTUAL",    NULL},
+//  { MT_KEYPAD, KM_10MHZ,"\00210MHz\0ACTUAL",    NULL},
   { MT_CANCEL,   0, "\032 BACK", NULL },
   { MT_NONE,     0, NULL, NULL } // sentinel
 };