jan-henrik/eurorack
1
0
Fork 0
mirror of https://github.com/jhbruhn/eurorack.git synced 2025-03-15 02:55:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implement attenuverters

Browse source
This commit is contained in:
Jan-Henrik 2020-05-10 14:54:25 +02:00
parent 4f1b3ff867
commit 6d54dc0a7b
5 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
stereo_mix/processor.cc
View file

@ -1,5 +1,6 @@
#include "processor.h" #include "processor.h"
#include "stmlib/stmlib.h" #include "stmlib/stmlib.h"
#include "stmlib/dsp/dsp.h"
#include "stmlib/utils/dsp.h" #include "stmlib/utils/dsp.h"
#include <math.h> #include <math.h>
@ -12,14 +13,16 @@ void Processor::Process(int16_t cvs[], uint16_t* outs)
uint32_t value_r; uint32_t value_r;
uint16_t pan_pot = (pan_offset + 32767L); uint16_t pan_pot = (pan_offset + 32767L);
uint16_t vol_pot = (volume_offset); uint16_t vol_pot = (vol_offset);
int16_t pan_cv = cvs[0]; int32_t pan_cv = (cvs[0] * static_cast<int32_t>(pan_att)) >> 15; // full attenuate gives 3x amplification :)
int16_t vol_cv = cvs[1]; int32_t vol_cv = (cvs[1] * static_cast<int32_t>(vol_att)) >> 15;
int32_t pan = pan_pot + pan_cv; pan_cv = Clip16(pan_cv);
vol_cv = Clip16(vol_cv);
// calculate value for ui // calculate value for ui
int32_t lin = volume_offset + (cvs[1] << 1); int32_t lin = vol_offset + vol_cv * 3;
CONSTRAIN(lin, 0, 65535); lin = ClipU16(lin);
lin *= !mute; lin *= !mute;
this->linear_vol = lin; this->linear_vol = lin;
@ -29,18 +32,20 @@ void Processor::Process(int16_t cvs[], uint16_t* outs)
vol_pot = Mix(vol_pot_exp, vol_pot_log, log_exp_mix_pot); vol_pot = Mix(vol_pot_exp, vol_pot_log, log_exp_mix_pot);
int32_t vol = vol_pot; int32_t vol = vol_pot;
uint16_t vol_cv_absu16 = abs(vol_cv); uint16_t vol_cv_absu16 = abs(vol_cv) << 1;
uint16_t vol_cv_exp = Interpolate124(lut_linear_to_exp, vol_cv_absu16); uint16_t vol_cv_exp = Interpolate124(lut_linear_to_exp, vol_cv_absu16);
uint16_t vol_cv_log = 65535 - InverseInterpolate124(lut_linear_to_exp, vol_cv_absu16); uint16_t vol_cv_log = 65535 - InverseInterpolate124(lut_linear_to_exp, vol_cv_absu16);
uint16_t vol_cv_pre = Mix(vol_cv_exp, vol_cv_log, log_exp_mix_cv); uint32_t vol_cv_pre = Mix(vol_cv_exp, vol_cv_log, log_exp_mix_cv) * 3;
vol += vol_cv > 0 ? vol_cv_pre : -vol_cv_pre; vol += vol_cv > 0 ? vol_cv_pre : -vol_cv_pre;
vol *= !mute; vol *= !mute;
CONSTRAIN(pan, 0, 65535); vol = ClipU16(vol);
CONSTRAIN(vol, 0, 65535);
this->previous_vol = vol; this->previous_vol = vol;
int32_t pan = pan_pot + (pan_cv * 3);
pan = ClipU16(pan);
value_l = (Interpolate124(lut_left_sin_pan, pan) * vol) >> 16; value_l = (Interpolate124(lut_left_sin_pan, pan) * vol) >> 16;
value_r = (Interpolate124(lut_right_cos_pan, pan) * vol) >> 16; value_r = (Interpolate124(lut_right_cos_pan, pan) * vol) >> 16;

21
stereo_mix/processor.h
View file

@ -9,7 +9,7 @@ class Processor {
inline void set_volume_offset(uint16_t volume_offset_) inline void set_volume_offset(uint16_t volume_offset_)
{ {
volume_offset = volume_offset_; vol_offset = volume_offset_;
} }
inline void set_pan_offset(int16_t pan_offset_) inline void set_pan_offset(int16_t pan_offset_)
@ -17,6 +17,14 @@ class Processor {
pan_offset = pan_offset_; pan_offset = pan_offset_;
} }
inline void set_volume_attenuverter(int16_t vol_att_) {
vol_att = vol_att_;
}
inline void set_pan_attenuverter(int16_t pan_att_) {
pan_att = pan_att_;
}
inline void set_muted(bool m) inline void set_muted(bool m)
{ {
mute = m; mute = m;
@ -27,13 +35,16 @@ class Processor {
} }
private: private:
uint16_t volume_offset = 0;
int16_t pan_offset = 0;
uint16_t previous_vol; uint16_t previous_vol;
uint16_t linear_vol; uint16_t linear_vol;
uint16_t log_exp_mix_cv = 32767; // -> linear uint16_t vol_offset = 0;
uint16_t log_exp_mix_pot = 0; int16_t pan_offset = 0;
int16_t vol_att;
int16_t pan_att;
uint16_t log_exp_mix_cv = 32767;//32767; // -> linear
uint16_t log_exp_mix_pot = 0; // -> exp
bool mute = false; bool mute = false;
}; };

3
stereo_mix/ui.cc
View file

@ -89,6 +89,9 @@ void UI::TaskProcessPotControllers()
for (size_t i = 0; i < kNumChannels; i++) { for (size_t i = 0; i < kNumChannels; i++) {
potControllers[i].ProcessUIRate(); potControllers[i].ProcessUIRate();
potControllers[i + kNumChannels].ProcessUIRate(); potControllers[i + kNumChannels].ProcessUIRate();
processors[i].set_volume_attenuverter(this->volume_att_pots[i] - 32767);
processors[i].set_pan_attenuverter(this->pan_att_pots[i] - 32767);
} }
} }

2
stereo_mix/ui.h
View file

@ -29,7 +29,7 @@ class UI {
uint16_t* pan_hidden_params[kNumChannels] = {&pan_att_pots[i], &pan_att_pots[i], &pan_att_pots[i], &pan_att_pots[i]}; uint16_t* pan_hidden_params[kNumChannels] = {&pan_att_pots[i], &pan_att_pots[i], &pan_att_pots[i], &pan_att_pots[i]};
potControllers[i + kNumChannels].Init(&pan_pots[i], pan_hidden_params); potControllers[i + kNumChannels].Init(&pan_pots[i], pan_hidden_params);
volume_att_pots[i] = pan_att_pots[i] = 65535; volume_att_pots[i] = pan_att_pots[i] = 32767 + (32767 / 2);
} }
} }

2
stmlib

@ -1 +1 @@
Subproject commit bac07fcc33cbdf4f53528ba79f8b94ee8d0093bd Subproject commit e5d7705dbabd7e6827057d8a30be44d0ca55c6d6