From abef8aa051446b8e5249c1feab3acd17e6851e00 Mon Sep 17 00:00:00 2001
From: erikkaashoek <erik@kaashoek.com>
Date: Sun, 30 Aug 2020 09:18:30 +0200
Subject: [PATCH] Added save/recall commands and changed auto reflevel target
 to -30

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

diff --git a/main.c b/main.c
index d500bea..ff2bade 100644
--- a/main.c
+++ b/main.c
@@ -1620,6 +1620,7 @@ VNA_SHELL_FUNCTION(cmd_cal)
   }
   shell_printf("usage: cal [%s]\r\n", cmd_cal_list);
 }
+#endif
 
 VNA_SHELL_FUNCTION(cmd_save)
 {
@@ -1654,7 +1655,6 @@ VNA_SHELL_FUNCTION(cmd_recall)
  usage:
   shell_printf("recall {id}\r\n");
 }
-#endif
 
 static const struct {
   const char *name;
@@ -2308,9 +2308,9 @@ static const VNAShellCommand commands[] =
     {"resume"      , cmd_resume      , 0},
 #ifdef __VNA__
     {"cal"         , cmd_cal         , CMD_WAIT_MUTEX},
+#endif
     {"save"        , cmd_save        , 0},
     {"recall"      , cmd_recall      , CMD_WAIT_MUTEX},
-#endif
     {"trace"       , cmd_trace       , CMD_WAIT_MUTEX},
     {"trigger"     , cmd_trigger     , 0},
     {"marker"      , cmd_marker      , 0},
diff --git a/sa_core.c b/sa_core.c
index 81e2c84..77272fb 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -2029,18 +2029,18 @@ sweep_again:                                // stay in sweep loop when output mo
 
 
   // -------------------------- auto attenuate ----------------------------------
-
+#define AUTO_TARGET_LEVEL   -30
   if (!in_selftest && setting.mode == M_LOW && setting.auto_attenuation && max_index[0] > 0) {  // calculate and apply auto attenuate
     setting.atten_step = false;     // No step attenuate in low mode auto attenuate
     int changed = false;
     float actual_max_level = actual_t[max_index[0]] - get_attenuation();
-    if (actual_max_level < - 31 && setting.attenuate >= 10) {
+    if (actual_max_level < AUTO_TARGET_LEVEL - 11 && setting.attenuate >= 10) {
       setting.attenuate -= 10.0;
       changed = true;
-    } else if (actual_max_level < - 26 && setting.attenuate >= 5) {
+    } else if (actual_max_level < AUTO_TARGET_LEVEL - 6 && setting.attenuate >= 5) {
       setting.attenuate -= 5.0;
       changed = true;
-    } else if (actual_max_level > - 19 && setting.attenuate <= 20) {
+    } else if (actual_max_level > AUTO_TARGET_LEVEL + 2 && setting.attenuate <= 20) {
       setting.attenuate += 10.0;
       changed = true;
     }