Bjorklund parameter reduction

ctag-fh-kiel · May 13, 2021 · 3cc3a94 · 3cc3a94
1 parent 4235859
commit 3cc3a94
Show file tree

Hide file tree

Showing 7 changed files with 696 additions and 687 deletions.
diff --git a/bin/bootloader.bin b/bin/bootloader.bin
diff --git a/bin/ctag-tbd.bin b/bin/ctag-tbd.bin
diff --git a/bin/storage.bin b/bin/storage.bin
diff --git a/components/ctagSoundProcessor/ctagSoundProcessorBjorklund.cpp b/components/ctagSoundProcessor/ctagSoundProcessorBjorklund.cpp
diff --git a/components/ctagSoundProcessor/ctagSoundProcessorBjorklund.hpp b/components/ctagSoundProcessor/ctagSoundProcessorBjorklund.hpp
@@ -39,7 +39,7 @@ namespace CTAG {
                e_EasyEditOn, e_EGoscMixActive, e_EGoscMixNegative, e_EGoscMixLoop, e_EGfilterLeakActive, e_EGfilterLeakNegative, e_FilterLeakEnvLoop,
                e_EGwfNegative, e_EGringNegative, e_EGfiltNegative, e_EGvolLoop, e_EGvolNegative, e_EGringLoop, e_EGwfLoop, e_EGfiltLoop, e_AccentIsBjorklund,
                e_AccentOff, e_AccentSync, e_ResetSequencer, e_PalindromeOff, e_RingOn, e_RingOnPulse, e_RingOnSaw, e_EGvolActive, e_EGwfActive,
-               e_EGnoiseActive, e_EGringActive, e_EGfiltActive, e_AMisSquare, e_PWMon, e_QuantizePitch, e_VintageFilter, e_Bjorklund_options_max
+               e_EGnoiseActive, e_EGringActive, e_EGfiltActive, e_AMisSquare, e_PWMon, e_QuantizePitch, e_Bjorklund_options_max
             };
             int prev_trig_state[e_Bjorklund_options_max] = {0};   // Initialize _all_ entries with "low value"
             bool low_reached[e_Bjorklund_options_max] = {false};  // We need this for look for toggle-events
@@ -51,7 +51,6 @@ namespace CTAG {
             Saw_eptr__ctx_type_0 saw_data;              // Saw oscillator data-structure
             Blit__ctx_type_1 pulse_data;                 // Pulse oscillator data-structure
             Noise__ctx_type_1 noise_data;               // Noise oscillator data-structure
-            Ladder__ctx_type_8 ladder_data;             // Ladder filter data-structure
             Ladder__ctx_type_6 ladder_vintage_data;     // Euler ladder algorithm
 
             // --- Additional oscillator[s] ---
@@ -249,7 +248,6 @@ namespace CTAG {
 	atomic<int32_t> RingModFreq, cv_RingModFreq;
 	atomic<int32_t> RingModAmnt, cv_RingModAmnt;
 	atomic<int32_t> WaveFolder, cv_WaveFolder;
-	atomic<int32_t> VintageFilter, trig_VintageFilter;
 	atomic<int32_t> Cutoff, cv_Cutoff;
 	atomic<int32_t> Resonance, cv_Resonance;
 	atomic<int32_t> FilterTracking, cv_FilterTracking;

diff --git a/spiffs_image/data/sp/mp-Bjorklund.jsn b/spiffs_image/data/sp/mp-Bjorklund.jsn
diff --git a/spiffs_image/data/sp/mui-Bjorklund.jsn b/spiffs_image/data/sp/mui-Bjorklund.jsn
@@ -46,7 +46,6 @@
                {"id":"RingModFreq","name":"AM/RingMod Frequency","type":"int","min":0,"max":4095,"step":1}, 
                {"id":"RingModAmnt","name":"AM/RingMod amount","type":"int","min":0,"max":4095,"step":1}, 
                {"id":"WaveFolder","name":"WaveFolding Amount","type":"int","min":0,"max":4095,"step":1},
-               {"id":"VintageFilter","name":"Vintage Resonance pitching n/y","type":"bool"},
                {"id":"Cutoff","name":"Cutoff Frequency","type":"int","min":0,"max":4095,"step":1}, 
                {"id":"Resonance","name":"Resonance amount","type":"int","min":0,"max":4095,"step":1},
                {"id":"FilterTracking","name":"Filter key tracking","type":"int","min": -2048,"max": 2047,"step": 1},