From 958754edf47157b7136dfb83dbcb30f97a56b0eb Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 16 Jan 2020 10:42:39 +0100
Subject: [PATCH] enforce following lf config

---
 armsrc/lfadc.c      | 7 +++----
 armsrc/lfsampling.c | 4 ++++
 armsrc/lfsampling.h | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/armsrc/lfadc.c b/armsrc/lfadc.c
index 09ee5a2a6..c715020a2 100644
--- a/armsrc/lfadc.c
+++ b/armsrc/lfadc.c
@@ -61,7 +61,7 @@ size_t lf_count_edge_periods_ex(size_t max, bool wait, bool detect_gap) {
             adc_val = AT91C_BASE_SSC->SSC_RHR;
             periods++;
 
-            if (logging) logSample(adc_val, 1, 8, 0);
+            if (logging) logSampleSimple(adc_val);
 
             // Only test field changes if state of adc values matter
             if (!wait) {
@@ -91,7 +91,7 @@ size_t lf_count_edge_periods_ex(size_t max, bool wait, bool detect_gap) {
             if (periods == max) return 0;
         }
     }
-    if (logging) logSample(255, 1, 8, 0);
+    if (logging) logSampleSimple(0xFF);
     return 0;
 }
 
@@ -206,14 +206,13 @@ size_t lf_detect_field_drop(size_t max) {
         }
         ++checked;
 
-        // Watchdog hit
         WDT_HIT();
 
         if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
             periods++;
             adc_val = AT91C_BASE_SSC->SSC_RHR;
 
-            if (logging) logSample(adc_val, 1, 8, 0);
+            if (logging) logSampleSimple(adc_val);
 
             if (adc_val == 0) {
                 rising_edge = false;
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index eb3edb029..2d92cd692 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -138,6 +138,10 @@ uint32_t getSampleCounter() {
     return samples.total_saved;
 }
 
+void logSampleSimple(uint8_t sample) {
+    logSample(sample, config.decimation, config.bits_per_sample, config.averaging);
+}
+
 void logSample(uint8_t sample, uint8_t decimation, uint8_t bits_per_sample, bool avg) {
 
     if (!data.buffer) return;
diff --git a/armsrc/lfsampling.h b/armsrc/lfsampling.h
index e97a3ac1a..cd3a8993e 100644
--- a/armsrc/lfsampling.h
+++ b/armsrc/lfsampling.h
@@ -70,6 +70,7 @@ uint32_t DoAcquisition_config(bool verbose, uint32_t sample_size);
  * Refactoring of lf sampling buffer
  */
 void initSampleBuffer(uint32_t *sample_size);
+void logSampleSimple(uint8_t sample);
 void logSample(uint8_t sample, uint8_t decimation, uint8_t bits_per_sample, bool avg);
 uint32_t getSampleCounter();