From a35807ea78aea30eeebb4cde86f3bd6025f14597 Mon Sep 17 00:00:00 2001
From: erikkaashoek <erik@kaashoek.com>
Date: Thu, 8 Jul 2021 12:21:18 +0200
Subject: [PATCH] Selftest after calibrate repaired

---
 main.c    |  1 +
 sa_core.c | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/main.c b/main.c
index 6ee33fa..44d2edc 100644
--- a/main.c
+++ b/main.c
@@ -137,6 +137,7 @@ static THD_FUNCTION(Thread1, arg)
     } else if (sweep_mode & SWEEP_SELFTEST) {
       // call from lowest level to save stack space
       self_test(setting.test);
+      completed = true;
 //      sweep_mode = SWEEP_ENABLE;
 #ifdef __SINGLE_LETTER__
       } else if (sweep_mode & SWEEP_REMOTE) {
diff --git a/sa_core.c b/sa_core.c
index f7c75fd..5ec2518 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -6131,17 +6131,17 @@ quit:
   ili9341_clear_screen();
   set_sweep_points(old_sweep_points);
   in_selftest = false;
-  sweep_mode = SWEEP_ENABLE;
 //  set_refer_output(-1);
 #ifdef TINYSA4
-  set_extra_lna(false);
-  set_average(0,AV_OFF);
-//  set_refer_output(-1);
+  reset_settings(M_LOW);
+//  set_extra_lna(false);
+//  set_average(0,AV_OFF);
+  set_refer_output(-1);
 #else
   reset_settings(M_LOW);
   set_refer_output(-1);
 #endif
-
+  test_wait = false;
 }