Merge branch 'tinySA' into tinySA-v0.2

main.c

@@ -117,7 +117,7 @@ const char *info_about[]={
   0 // sentinel
 };
 
-static THD_WORKING_AREA(waThread1, 730);
+static THD_WORKING_AREA(waThread1, 900);
 static THD_FUNCTION(Thread1, arg)
 {
   (void)arg;
@@ -128,6 +128,10 @@ static THD_FUNCTION(Thread1, arg)
     if (sweep_mode&(SWEEP_ENABLE|SWEEP_ONCE)) {
       completed = sweep(true);
       sweep_mode&=~SWEEP_ONCE;
+    } else if (sweep_mode & SWEEP_SELFTEST) {
+      self_test();                                  // call from lowest level to save stack space
+    } else if (sweep_mode & SWEEP_CALIBRATE) {
+      calibrate();                                  // call from lowest level to save stack space
     } else {
       __WFI();
     }

nanovna.h

@@ -139,6 +139,9 @@ enum {
 
 #define SWEEP_ENABLE  0x01
 #define SWEEP_ONCE    0x02
+#define SWEEP_CALIBRATE 0x04
+#define SWEEP_SELFTEST  0x08
+
 extern int8_t sweep_mode;
 extern const char *info_about[];
 

sa_core.c

@@ -1045,7 +1045,7 @@ static const struct {
  {TC_FLAT,      TP_10MHZEXTRA,  10,     4,      -25, 20,    -70},       // 8 BPF pass band flatness
  {TC_BELOW,     TP_30MHZ,       430,    60,     -75, 0,     -85},       // 9 LPF cutoff
  {TC_END,       0,              0,      0,      0,   0,     0},
- {TC_MEASURE,   TP_30MHZ,       30,     7,      -25, 30,    -85 },      // 11 Measure power level and noise
+ {TC_MEASURE,   TP_30MHZ,       30,     7,      -25, 30,    -80 },      // 11 Measure power level and noise
  {TC_MEASURE,   TP_30MHZ,       270,    4,      -50, 30,    -85 },       // 13 Measure powerlevel and noise
  {TC_MEASURE,   TPH_30MHZ,      270,    4,      -50, 30,    -85 },       // 14 Calibrate power high mode
  {TC_END,       0,              0,      0,      0,   0,     0},
@@ -1312,7 +1312,6 @@ common_silent:
 }
 
 extern void menu_autosettings_cb(int item);
-extern void touch_wait_release(void);
 
 void self_test(void)
 {
@@ -1330,25 +1329,25 @@ void self_test(void)
     test_prepare(i);
     test_acquire(i);                        // Acquire test
     test_status[i] = test_validate(i);                       // Validate test
-    chThdSleepMilliseconds(1000);
     if (test_status[i] != TS_PASS) {
-      touch_wait_release();
+      wait_user();
     }
     i++;
   }
-  touch_wait_release();
-    //  chThdSleepMilliseconds(2000);
+  ili9341_set_foreground(BRIGHT_COLOR_GREEN);
+  ili9341_drawstring_7x13("Self test complete", 30, 120);
+  ili9341_drawstring_7x13("Touch screen to continue", 30, 140);
+  wait_user();
+
+  sweep_mode = SWEEP_ENABLE;
   show_test_info = FALSE;
   trace[TRACE_STORED].enabled = false;
   set_trace_refpos(0, NGRIDY - (-10) / get_trace_scale(0));
   set_trace_refpos(1, NGRIDY - (-10) / get_trace_scale(0));
   set_trace_refpos(2, NGRIDY - (-10) / get_trace_scale(0));
   set_refer_output(0);
-  SetMode(M_LOW);
-  SetAverage(0);
-  draw_cal_status();
+  reset_settings(M_LOW);
   in_selftest = false;
-  menu_autosettings_cb(0);
 }
 
 void reset_calibration(void)
@@ -1365,18 +1364,21 @@ void calibrate(void)
   float last_peak_level;
   in_selftest = true;
   SetPowerLevel(100);
-  menu_autosettings_cb(0);
+  reset_settings(M_LOW);
   int i = 10;       // calibrate low mode power on 30 MHz;
   for (int j= 0; j < CALIBRATE_RBWS; j++ ) {
     SetRBW(power_rbw[j]);
     test_prepare(i);
     test_acquire(i);                        // Acquire test
     local_test_status = test_validate(i);                       // Validate test
-    chThdSleepMilliseconds(1000);
+//    chThdSleepMilliseconds(1000);
     if (local_test_status != TS_PASS) {
- //     touch_wait_release();
+      ili9341_set_foreground(BRIGHT_COLOR_RED);
+      ili9341_drawstring_7x13("Calibration failed", 30, 120);
+      goto quit;
     } else
       SetPowerLevel(-25);
+    goto  done;
   }
   i = 11;           // Measure 270MHz in low mode
   SetRBW(100);
@@ -1394,23 +1396,28 @@ void calibrate(void)
     test_prepare(i);
     test_acquire(i);                        // Acquire test
     local_test_status = test_validate(i);                       // Validate test
-    chThdSleepMilliseconds(1000);
     if (local_test_status != TS_PASS) {
-      touch_wait_release();
+      ili9341_set_foreground(BRIGHT_COLOR_RED);
+      ili9341_drawstring_7x13("Calibration failed", 30, 120);
+      goto quit;
     } else
       SetPowerLevel(last_peak_level);
     }
-  touch_wait_release();
+done:
+  ili9341_set_foreground(BRIGHT_COLOR_GREEN);
+  ili9341_drawstring_7x13("Calibration complete", 30, 120);
+quit:
+  ili9341_drawstring_7x13("Touch screen to continue", 30, 140);
+  wait_user();
+
+  in_selftest = false;
+  sweep_mode = SWEEP_ENABLE;
   trace[TRACE_STORED].enabled = false;
   set_trace_refpos(0, NGRIDY - (-10) / get_trace_scale(0));
   set_trace_refpos(1, NGRIDY - (-10) / get_trace_scale(0));
   set_trace_refpos(2, NGRIDY - (-10) / get_trace_scale(0));
   set_refer_output(0);
-  SetMode(M_LOW);
-  SetAverage(0);
-  draw_cal_status();
-  in_selftest = false;
-  menu_autosettings_cb(0);
+  reset_settings(M_LOW);
 }
 
 

ui.c

@@ -2469,3 +2469,20 @@ ui_init()
 
   touch_start_watchdog();
 }
+
+void wait_user(void)
+{
+  adc_stop();
+  touch_wait_release();
+#if 0
+  operation_requested = OP_NONE;
+  while (true) {
+    if (operation_requested & OP_TOUCH)
+      break;
+    if (operation_requested & OP_LEVER)
+      break;
+  }
+#endif
+  touch_start_watchdog();
+}
+

ui_sa.c

@@ -242,7 +242,7 @@ static void menu_calibrate_cb(int item, uint8_t data)
   (void)data;
   switch (item) {
   case 1:
-    calibrate();
+    sweep_mode = SWEEP_CALIBRATE;
     menu_move_back();
     ui_mode_normal();
     break;
@@ -272,7 +272,7 @@ static void menu_config_cb(int item, uint8_t data)
   case 2:
     menu_move_back();
     ui_mode_normal();
-    self_test();
+    sweep_mode = SWEEP_SELFTEST;
     break;
   case 4:
     show_version();