From 2aeba4dd20b9a1d39432d388cb890b57bffaf029 Mon Sep 17 00:00:00 2001
From: erikkaashoek <erik@kaashoek.com>
Date: Mon, 2 Dec 2024 12:56:23 +0100
Subject: [PATCH] Update

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

diff --git a/main.c b/main.c
index 830f648..8dfdcb9 100644
--- a/main.c
+++ b/main.c
@@ -2206,8 +2206,8 @@ const version_t hw_version_text[MAX_VERSION_TEXT] =
  { 165, 179,    "V0.4.5.1",     1,      0},
  { 180, 195,    "V0.4.5.1.1",   2,      0},
  { 250, 350,    "V0.4.6",       3,      1},
- { 2030, 2050,  "V0.5.2",       102,    1},
- { 2051, 2500,  "V0.5.3.2",     103,    1},
+ { 2030, 2040,  "V0.5.2",       102,    1},
+ { 2240, 2260,  "V0.5.4",       103,    1},
 };
 
 uint16_t hwid = 0;
@@ -2867,8 +2867,8 @@ THD_FUNCTION(myshellThread, p)
   (void)p;
   chRegSetThreadName("shell");
   shell_printf(VNA_SHELL_NEWLINE_STR"tinySA Shell"VNA_SHELL_NEWLINE_STR);
+  shell_printf(VNA_SHELL_PROMPT_STR);
   while (true) {
-    shell_printf(VNA_SHELL_PROMPT_STR);
     if (VNAShell_readLine(shell_line, VNA_SHELL_MAX_LENGTH))
       VNAShell_executeLine(shell_line);
     else // Putting a delay in order to avoid an endless loop trying to read an unavailable stream.
diff --git a/sa_core.c b/sa_core.c
index dd62fb7..c24b849 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -7895,6 +7895,7 @@ void calibrate(void)
   //for (int j = 0; j < CALIBRATE_RBWS; j++) {
   //  set_RBW(power_rbw[j]);
 
+  in_calibration = true;
   setting.scale = 1;
   set_trace_scale(1);
   for (int i =0; i<HARMONIC_JUMP; i++) { // Don't do harmonic
@@ -7946,7 +7947,6 @@ void calibrate(void)
 #endif
 #endif
   reset_calibration();
-  in_calibration = true;
 #ifdef TINYSA4
   //int current_correction_calibration = 0;
 #endif