From 1ae158c7dac5bc7918854acf5a5b85ac5dc5a8e8 Mon Sep 17 00:00:00 2001
From: erikkaashoek <erik@kaashoek.com>
Date: Tue, 15 Jun 2021 17:29:24 +0200
Subject: [PATCH] Disable tinySA3 harmonic and add calc aver cmd

---
 nanovna.h |  4 ++--
 plot.c    |  2 +-
 sa_cmd.c  | 11 ++++++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/nanovna.h b/nanovna.h
index 191889e..5a5848c 100644
--- a/nanovna.h
+++ b/nanovna.h
@@ -81,7 +81,7 @@
 #define __USE_SD_CARD__           // Enable SD card support
 #define __SD_CARD_LOAD__          // Allow run commands from SD card (config.ini in root)
 #define __LCD_BRIGHTNESS__        // LCD or hardware allow change brightness, add menu item for this
-#define __HARMONIC__
+//#define __HARMONIC__
 #define __NOISE_FIGURE__
 #define __VBW__
 #define __SWEEP_RESTART__
@@ -94,7 +94,7 @@
 //#define __FFT_VBW__
 //#define __FFT_DECONV__
 #else
-#define __HARMONIC__
+//#define __HARMONIC__
 #endif
 #define __USE_FREQ_TABLE__      // Enable use table for frequency list
 
diff --git a/plot.c b/plot.c
index 3f366eb..366a8f7 100644
--- a/plot.c
+++ b/plot.c
@@ -127,7 +127,7 @@ void update_grid(void)
   if (config.gridlines < 3)
     config.gridlines = 6;
 
-  while (gdigit > 100) {
+  while (gdigit > 10) {
     grid = 5 * gdigit;
     if (fspan / grid >= config.gridlines)
       break;
diff --git a/sa_cmd.c b/sa_cmd.c
index 4103234..59b9836 100644
--- a/sa_cmd.c
+++ b/sa_cmd.c
@@ -79,7 +79,11 @@ VNA_SHELL_FUNCTION(cmd_modulation )
 
 VNA_SHELL_FUNCTION(cmd_calc )
 {
-  static const char cmd_cal[] = "off|minh|maxh|maxd|aver4|aver16|quasip";
+#ifdef TINYSA4
+  static const char cmd_cal[] = "off|minh|maxh|maxd|aver4|aver16|aver|quasip|log|lin";
+#else
+  static const char cmd_cal[] = "off|minh|maxh|maxd|aver4|aver16|aver|quasip";
+#endif
   if (argc < 1) {
   usage:
     shell_printf("usage: calc %s\r\n", cmd_cal);
@@ -88,6 +92,11 @@ VNA_SHELL_FUNCTION(cmd_calc )
   int m = get_str_index(argv[0], cmd_cal);
   if (m<0)
      goto usage;
+#ifdef TINYSA4
+  if (m>=8) {
+    linear_averaging = (m == 9);
+  } else
+#endif
   set_average(m);
 }