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

add pt1 filter code

Browse Source 
Signed-off-by: Thomas Schmid <tom@lfence.de>
This commit is contained in:
Thomas 2022-06-18 11:33:56 +02:00
parent 722d80108a
commit 28ba543381
3 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/include/pt1.h Normal file
View File

@ -0,0 +1,10 @@
#pragma once
struct pt1_state {
float y_n1;
float K;
float T;
};
void pt1_init(struct pt1_state *state, float K, float T);
float pt1_update(struct pt1_state *state, float u, float dt);

15
firmware/src/pt1.cpp Normal file
View File

@ -0,0 +1,15 @@
#include "pt1.h"
void pt1_init(struct pt1_state *state, float K, float T)
{
state->K = K;
state->T = T;
state->y_n1 = 0.0f;
}
float pt1_update(struct pt1_state *state, float u, float dt)
{
float y = state->y_n1 + (state->K * u - state->y_n1) * dt / state->T;
state->y_n1 = y;
return y;
}

14
firmware/src/vumeter.cpp
View File

@ -1,4 +1,5 @@
#include "zauberstab.h" #include "zauberstab.h"
#include "pt1.h"
unsigned long last_sample_time; unsigned long last_sample_time;
static int sample_counter = 0; static int sample_counter = 0;
@ -6,12 +7,19 @@ unsigned int top_led_pos = 0;
float rms_avg = 0; float rms_avg = 0;
float vu_filt = 0.0f; float vu_filt = 0.0f;
float vu_filt_slow = 0.0f; float vu_filt_slow = 0.0f;
float dt;
struct pt1_state vu_pt1_fast;
struct pt1_state vu_pt1_slow;
void setup() void setup()
{ {
zauberstab_init(); zauberstab_init();
Serial.begin(115200); Serial.begin(115200);
FastLED.setBrightness(100); FastLED.setBrightness(100);
pt1_init(&vu_pt1_slow, 1, 1.f);
pt1_init(&vu_pt1_fast, 1, 0.05);
} }
void loop() { void loop() {
@ -26,8 +34,8 @@ void loop() {
EVERY_N_MILLIS(10){ EVERY_N_MILLIS(10){
float vu = 20 * log10f(rms_avg); float vu = 20 * log10f(rms_avg);
vu_filt = (vu-vu_filt) * 0.8 + vu_filt; vu_filt = pt1_update(&vu_pt1_fast, vu, 0.01f);
vu_filt_slow = (vu_filt-vu_filt_slow) * 0.01 + vu_filt_slow; vu_filt_slow = pt1_update(&vu_pt1_slow, vu_filt, 0.01f);
//Serial.println(vu); //Serial.println(vu);
int max_led = vu_filt; int max_led = vu_filt;
int top_led = vu_filt_slow; int top_led = vu_filt_slow;
@ -35,7 +43,7 @@ void loop() {
max_led = max_led > 0xFF ? 0xFF : max_led; max_led = max_led > 0xFF ? 0xFF : max_led;
if (top_led < max_led){ if (top_led < max_led){
vu_filt_slow = vu_filt; vu_pt1_slow.y_n1 = vu_filt;
top_led = max_led; top_led = max_led;
} }