From 1cdfb362773feb22b7d128ffb8737db5d97d6964 Mon Sep 17 00:00:00 2001
From: erikkaashoek <erik@kaashoek.com>
Date: Tue, 24 Sep 2019 12:05:53 +0200
Subject: [PATCH] Averaging working when cal off

---
 dsp.c  | 11 +++++++++--
 main.c | 31 ++++++++++++++++++++++++++++---
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/dsp.c b/dsp.c
index 80fa97a..9aef486 100644
--- a/dsp.c
+++ b/dsp.c
@@ -43,6 +43,8 @@ int32_t acc_samp_s;
 int32_t acc_samp_c;
 int32_t acc_ref_s;
 int32_t acc_ref_c;
+extern int8_t dirty;
+extern int8_t averaging;
 
 void
 dsp_process(int16_t *capture, size_t length)
@@ -92,8 +94,13 @@ calculate_gamma(float gamma[2])
   //rr = sqrtf(rr) * 1e8;
   float ss = acc_samp_s;
   float sc = acc_samp_c;
-  gamma[0] =  (sc * rc + ss * rs) / rr;
-  gamma[1] =  (ss * rc - sc * rs) / rr;
+  if (dirty || (averaging == 0) ) {
+    gamma[0] =  (sc * rc + ss * rs) / rr;
+    gamma[1] =  (ss * rc - sc * rs) / rr;
+  } else {
+    gamma[0] =  ( gamma[0] * averaging + (sc * rc + ss * rs) / rr)/(averaging + 1);
+    gamma[1] =  ( gamma[1] * averaging + (ss * rc - sc * rs) / rr)/(averaging + 1);
+  }
 #elif 0
   gamma[0] =  acc_samp_s;
   gamma[1] =  acc_samp_c;
diff --git a/main.c b/main.c
index 53117ee..0c03362 100644
--- a/main.c
+++ b/main.c
@@ -52,6 +52,8 @@ int32_t step = 1;
 int     count;
 int8_t drive_strength = DRIVE_STRENGTH_AUTO;
 int8_t frequency_updated = FALSE;
+int8_t dirty = FALSE;
+int8_t averaging = 0;
 int8_t sweep_enabled = TRUE;
 int8_t sweep_once = FALSE;
 int8_t cal_auto_interpolate = TRUE;
@@ -423,6 +425,10 @@ duplicate_buffer_to_dump(int16_t *p)
 }
 #endif
 
+
+volatile average_count=1;
+
+
 void i2s_end_callback(I2SDriver *i2sp, size_t offset, size_t n)
 {
 #if PORT_SUPPORTS_RT
@@ -643,21 +649,36 @@ ensure_edit_config(void)
 }
 
 
-static void cmd_scan(BaseSequentialStream *chp, int argc, char *argv[])
+static void cmd_averaging(BaseSequentialStream *chp, int argc, char *argv[])
 {
   (void)argc;
   (void)argv;
 
-  if (argc == 3 ) {
+  if (argc == 1 ) {
+    averaging = atoi(argv[0]);
+  } else
+    chprintf(chp, "usage: averaging [factor] \r\n");
+}
+  static void cmd_scan(BaseSequentialStream *chp, int argc, char *argv[])
+  {
+    (void)argc;
+    (void)argv;
+
+    if (argc == 4 ) {
+      average_count = atoi(argv[3]);
+      argc--;
+    }
+  if (argc == 3) {
     freq = atoi(argv[0]);
     step = atoi(argv[1]);
     count = atoi(argv[2]);
   } else {
-    chprintf(chp, "usage: scan start(Hz) step(Hz) points\r\n");
+    chprintf(chp, "usage: scan start(Hz) step(Hz) points [average]\r\n");
     return;
   }
   pause_sweep();
   chMtxLock(&mutex);
+  frequency_updated = TRUE; // to trigger dirty
   saved_chp = chp;
   sweep_once = TRUE;
   sweep_enabled = TRUE;
@@ -701,6 +722,8 @@ void sweep(void)
     chprintf(saved_chp, "start\r\n");
 
  rewind:
+  if (frequency_updated)
+    dirty = TRUE;
   frequency_updated = FALSE;
   //delay = 3;
   if (!sweep_once) {
@@ -757,6 +780,7 @@ void sweep(void)
       goto rewind;
     freq += step;
   }
+  dirty = FALSE;
   if (sweep_once)
     chprintf(saved_chp, "done\r\n");
   else
@@ -1943,6 +1967,7 @@ static const ShellCommand commands[] =
     { "sample", cmd_sample },
     //{ "gamma", cmd_gamma },
     { "scan", cmd_scan },
+    { "averaging", cmd_averaging},
     { "sweep", cmd_sweep },
     { "test", cmd_test },
     { "touchcal", cmd_touchcal },