From e7c575ed40cb3896a020f2a14be8b17b3c609ea5 Mon Sep 17 00:00:00 2001
From: erikkaashoek <erik@kaashoek.com>
Date: Thu, 19 Aug 2021 18:53:22 +0200
Subject: [PATCH] Small updates

---
 Makefile  | 1 +
 nanovna.h | 4 ----
 sa_core.c | 6 ++----
 ui_sa.c   | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 2515a8a..7f7b81d 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@ endif
 ifeq ($(USE_OPT),)
  ifeq ($(TARGET),F303)
 USE_OPT = -Og -fno-inline-small-functions -ggdb -fomit-frame-pointer -falign-functions=16 --specs=nano.specs -fstack-usage -std=c11
+#USE_OPT+=-fstack-protector-strong
  else
 USE_OPT = -Og -fno-inline-small-functions -ggdb -fomit-frame-pointer -falign-functions=16 --specs=nano.specs -fstack-usage -fsingle-precision-constant 
  endif
diff --git a/nanovna.h b/nanovna.h
index 7f68086..d538a11 100644
--- a/nanovna.h
+++ b/nanovna.h
@@ -759,7 +759,6 @@ typedef struct {
   int16_t index;
 } limit_t;
 extern uint8_t active_limit;
-extern uint8_t active_reference;
 extern void limits_update(void);
 #endif
 
@@ -1029,9 +1028,6 @@ typedef struct setting
   uint8_t waterfall;           // enum
   uint8_t average[TRACES_MAX]; // enum
   uint8_t subtract[TRACES_MAX];// index
-#ifdef __LIMITS__
-  uint8_t limit_trace[REFERENCE_MAX];         // index
-#endif
   uint8_t measurement;         // enum
   uint8_t spur_removal;        // enum
   int8_t normalized_trace;
diff --git a/sa_core.c b/sa_core.c
index f9ca51f..aa7407c 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -128,7 +128,7 @@ const int8_t drive_dBm [16] = {-38, -32, -30, -27, -24, -19, -15, -12, -5, -2, 0
 #define MAX_DRIVE   (setting.mode == M_GENHIGH ? 15 : 11)
 #define MIN_DRIVE   8
 #define SL_GENHIGH_LEVEL_MIN    -38
-#define SL_GENHIGH_LEVEL_MAX    16
+#define SL_GENHIGH_LEVEL_MAX    9
 #define SL_GENLOW_LEVEL_MIN    -76
 #define SL_GENLOW_LEVEL_MAX   -7
 #endif
@@ -254,8 +254,6 @@ void reset_settings(int m)
   for (int r=0;r<REFERENCE_MAX;r++)
     for (int l=0;l<LIMITS_MAX;l++)
       setting.limits[r][l].enabled = false;
-  for (int i=0; i<REFERENCE_MAX;i++)
-    setting.limit_trace[i] = 0;
   if (in_selftest) {
     setting.stored[TRACE_STORED] = true;
     TRACE_ENABLE(TRACE_STORED_FLAG);
@@ -957,7 +955,7 @@ void limits_update(void)
     for (int i = 0; i<LIMITS_MAX; i++)
     {
       if (setting.limits[t][i].enabled) {
-        while (j < sweep_points && (getFrequency(j) < setting.limits[t][i].frequency || setting.limits[t][i].frequency == 0)) {
+        while (j < sweep_points && (getFrequency(j) < setting.limits[t][i].frequency /* || setting.limits[t][i].frequency == 0 */)) {
           if (prev < 0)
             measured[t][j] = setting.limits[t][i].level;
           else
diff --git a/ui_sa.c b/ui_sa.c
index ae066fc..246d649 100644
--- a/ui_sa.c
+++ b/ui_sa.c
@@ -2494,7 +2494,7 @@ static const menuitem_t menu_limit_modify[] =
 };
 
 static const menuitem_t menu_limit_select[] = {
-  { MT_ADV_CALLBACK | MT_REPEATS,   DATA_STARTS_REPEATS(0,8), MT_CUSTOM_LABEL, menu_limit_select_acb },
+  { MT_ADV_CALLBACK | MT_REPEATS,   DATA_STARTS_REPEATS(0,LIMITS_MAX), MT_CUSTOM_LABEL, menu_limit_select_acb },
   { MT_NONE, 0, NULL, menu_back} // next-> menu_back
 };
 #endif