venti/fusion-zauberstab
1
0
Fork 0
forked from buddhabrot/fusion-zauberstab
Code Pull Requests Activity

refactor beat_detect: use pt1 code

Browse Source 
Signed-off-by: Thomas Schmid <tom@lfence.de>
This commit is contained in:
Thomas 2022-06-19 12:55:24 +02:00
parent 830703589d
commit 3d13f0f49a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
firmware/src/beat_detect.cpp
View File

@ -1,6 +1,7 @@
#include "zauberstab.h" #include "zauberstab.h"
#include <algorithm> #include <algorithm>
#include "biquad.h" #include "biquad.h"
#include "pt1.h"
#undef NUM_LEDS #undef NUM_LEDS
#define NUM_LEDS 45 #define NUM_LEDS 45
@ -18,6 +19,8 @@ static unsigned long last_us_bp = 0L;
static unsigned long last_us_control = 0L; static unsigned long last_us_control = 0L;
static Biquad<float> bp_filters[n_BP]; static Biquad<float> bp_filters[n_BP];
static Pt1<float> y_filter{1.f, 1.f};
static Pt1<float> pos_filter{1.f, 1.f};
static float yy1[n_BP]; static float yy1[n_BP];
static float yy2[n_BP]; static float yy2[n_BP];
@ -40,7 +43,6 @@ static long initial_time;
static int active = 15; static int active = 15;
static int candidate = 15; static int candidate = 15;
static int rounds = 0; static int rounds = 0;
static int n_samples = 0; static int n_samples = 0;
static int get_value(int pos, float pos0) static int get_value(int pos, float pos0)
@ -102,7 +104,8 @@ void loop()
yy3[i] = yy2[i]; yy3[i] = yy2[i];
yy2[i] = yy1[i]; yy2[i] = yy1[i];
yy1[i] = y[i]; yy1[i] = y[i];
y_fil[i] += (abs(y[i]) - y_fil[i]) * 0.005; //linie der scheitelpunkte y_fil[i] = y_filter.update(std::abs(y[i]), 0.005f); //linie der scheitelpunkte
//y_fil[i] += (abs(y[i]) - y_fil[i]) * 0.005; //linie der scheitelpunkte
} }
@ -133,10 +136,10 @@ void loop()
if (pos_target > pos_target_filtered) if (pos_target > pos_target_filtered)
{ {
pos_target_filtered += (pos_target - pos_target_filtered) * 0.35; pos_target_filtered = pos_filter.update(pos_target, 0.35f); }
}
else else
{ {
pos_filter.y_n1 = pos_target;
pos_target_filtered = pos_target; pos_target_filtered = pos_target;
} }