From b3ce3e0169eb3106c9ef49bb2575b2e0cc7d67d5 Mon Sep 17 00:00:00 2001
From: Thomas Schmid <tom@lfence.de>
Date: Sun, 19 Jun 2022 12:17:21 +0200
Subject: [PATCH] dc_cancelation: implement as template class

Signed-off-by: Thomas Schmid <tom@lfence.de>
---
 firmware/include/dc_cancelation.h             | 23 ++++++++++++-------
 .../src/dc_cancelation/dc_canelcation.cpp     | 18 ---------------
 firmware/src/zauberstab.cpp                   |  5 ++--
 3 files changed, 17 insertions(+), 29 deletions(-)
 delete mode 100644 firmware/src/dc_cancelation/dc_canelcation.cpp

diff --git a/firmware/include/dc_cancelation.h b/firmware/include/dc_cancelation.h
index 6ddeefe..36efdef 100644
--- a/firmware/include/dc_cancelation.h
+++ b/firmware/include/dc_cancelation.h
@@ -1,11 +1,18 @@
 #pragma once
 
-struct dc_cancelation_state {
-    float x_n1;
-    float y_n1;
-    float R; 
-};
+template<class T>
+struct DcCancelation {
+    T x_n1;
+    T y_n1;
+    T R;
 
-void dc_cancelation_init(struct dc_cancelation_state *state, float R);
-void dc_cancelation_set_R(struct dc_cancelation_state *state, float R);
-float dc_cancelation_update(struct dc_cancelation_state *state, float x);
\ No newline at end of file
+    DcCancelation(T R) : R(R) {};
+
+    T update(T x) {
+        T y = x-this->x_n1 + this->R * this->y_n1;
+        this->x_n1 = x;
+        this->y_n1 = y;
+
+        return y;
+    };
+};
\ No newline at end of file
diff --git a/firmware/src/dc_cancelation/dc_canelcation.cpp b/firmware/src/dc_cancelation/dc_canelcation.cpp
deleted file mode 100644
index e0faa79..0000000
--- a/firmware/src/dc_cancelation/dc_canelcation.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "dc_cancelation.h"
-
-void dc_cancelation_init(struct dc_cancelation_state *state, float R){
-    state->R = R; 
-    state->x_n1 = 0.0f;
-    state->y_n1 = 0.0f;
-}
-
-void dc_cancelation_set_R(struct dc_cancelation_state *state, float R) {
-    state->R = R;
-}
-
-float dc_cancelation_update(struct dc_cancelation_state *state, float x) {
-    float y = x-state->x_n1 + state->R * state->y_n1;
-    state->x_n1 = x;
-    state->y_n1 = y;
-    return y;
-}
diff --git a/firmware/src/zauberstab.cpp b/firmware/src/zauberstab.cpp
index 85b8389..c4b2936 100644
--- a/firmware/src/zauberstab.cpp
+++ b/firmware/src/zauberstab.cpp
@@ -1,7 +1,7 @@
 #include "zauberstab.h"
 #include "dc_cancelation.h"
 
-struct dc_cancelation_state dc_blocker;
+DcCancelation<float> dc_blocker{0.95};
 CRGB leds[NUM_LEDS];
 static int16_t mic_offset = 0;
 
@@ -12,12 +12,11 @@ static uint16_t read_mic() {
 int zauberstab_init() {
     FastLED.addLeds<WS2812, LED_PIN, GRB>(leds, NUM_LEDS);
     //FastLED.setMaxPowerInVoltsAndMilliamps(5, 300);
-    dc_cancelation_init(&dc_blocker, 0.95);
     return 0;
 }
 
 float get_sample() {
     float sample = read_mic();
-    sample = dc_cancelation_update(&dc_blocker, sample);
+    sample = dc_blocker.update(sample);
     return sample;
 }
\ No newline at end of file