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

Fix Offset DAC gain being set to 1x instead of 2x. Improve performance

Browse source 
of stereo_mix.
This commit is contained in:
Jan-Henrik 2020-01-16 00:07:12 +01:00
parent 13f390591b
commit e54318126a
1 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
stereo_mix/stereo_mix.cc
View file

@ -26,19 +26,20 @@ typedef SpiMaster<NumberedGpio<3>, MSB_FIRST, 2> dac4Spi;
typedef Dac<dac4Spi, BUFFERED_REFERENCE, 1> Dac4; typedef Dac<dac4Spi, BUFFERED_REFERENCE, 1> Dac4;
typedef SpiMaster<NumberedGpio<4>, MSB_FIRST, 2> oDac1Spi; typedef SpiMaster<NumberedGpio<4>, MSB_FIRST, 2> oDac1Spi;
typedef Dac<oDac1Spi, BUFFERED_REFERENCE, 1> oDac1; typedef Dac<oDac1Spi, BUFFERED_REFERENCE, 0> oDac1;
typedef SpiMaster<NumberedGpio<5>, MSB_FIRST, 2> oDac2Spi; typedef SpiMaster<NumberedGpio<5>, MSB_FIRST, 2> oDac2Spi;
typedef Dac<oDac2Spi, BUFFERED_REFERENCE, 1> oDac2; typedef Dac<oDac2Spi, BUFFERED_REFERENCE, 0> oDac2;
typedef SpiMaster<NumberedGpio<6>, MSB_FIRST, 2> oDac3Spi; typedef SpiMaster<NumberedGpio<6>, MSB_FIRST, 2> oDac3Spi;
typedef Dac<oDac3Spi, BUFFERED_REFERENCE, 1> oDac3; typedef Dac<oDac3Spi, BUFFERED_REFERENCE, 0> oDac3;
typedef SpiMaster<NumberedGpio<7>, MSB_FIRST, 2> oDac4Spi; typedef SpiMaster<NumberedGpio<7>, MSB_FIRST, 2> oDac4Spi;
typedef Dac<oDac4Spi, BUFFERED_REFERENCE, 1> oDac4; typedef Dac<oDac4Spi, BUFFERED_REFERENCE, 0> oDac4;
typedef AdcInputScanner AnalogInputs; typedef AdcInputScanner AnalogInputs;
#define NUM_CHANNELS 4 #define NUM_CHANNELS 4
uint32_t volume[NUM_CHANNELS]; uint32_t volume[NUM_CHANNELS];
uint16_t pan[NUM_CHANNELS]; uint16_t pan[NUM_CHANNELS * 2];
int main(void) int main(void)
{ {
@ -56,26 +57,37 @@ int main(void)
AnalogInputs::Init(); AnalogInputs::Init();
AnalogInputs::set_num_inputs(8); AnalogInputs::set_num_inputs(8);
#define WRITE(DAC, ODAC, N) \
DAC::Write((volume[N] * pan[N * NUM_CHANNELS]) >> 8, 0); \
ODAC::Write((volume[N] * pan[N * NUM_CHANNELS]) >> 8, 0); \
DAC::Write((volume[N] * pan[N * NUM_CHANNELS + 1]) >> 8, 1); \
ODAC::Write((volume[N] * pan[N * NUM_CHANNELS + 1]) >> 8, 1);
while (true) { while (true) {
ResetWatchdog(); ResetWatchdog();
for (int i = 0; i < NUM_CHANNELS; i++) { for (int i = 0; i < NUM_CHANNELS; i++) {
volume[i] = pgm_read_word_near(lut_res_linear_to_exp + (AnalogInputs::Read(i))) >> 1; volume[i] = pgm_read_word_near(lut_res_linear_to_exp + (AnalogInputs::Read(i)));
pan[i] = AnalogInputs::Read(i + NUM_CHANNELS); pan[i * NUM_CHANNELS] = pgm_read_word(lut_res_left_sin_pan + AnalogInputs::Read(i + NUM_CHANNELS));
pan[i * NUM_CHANNELS + 1] = pgm_read_word(lut_res_right_cos_pan + AnalogInputs::Read(i + NUM_CHANNELS));
switch (i) {
case 0:
WRITE(Dac1, oDac1, i);
break;
case 1:
WRITE(Dac2, oDac2, i);
break;
case 2:
WRITE(Dac3, oDac3, i);
break;
case 3:
WRITE(Dac4, oDac4, i);
break;
} }
AnalogInputs::Scan(); AnalogInputs::Scan();
}
#define WRITE(DAC, ODAC, N) \
DAC::Write((volume[N] * (pgm_read_word(lut_res_left_sin_pan + pan[N]))) >> 8, 0); \
ODAC::Write((volume[N] * (pgm_read_word(lut_res_left_sin_pan + pan[N]))) >> 8, 0); \
DAC::Write((volume[N] * (pgm_read_word(lut_res_right_cos_pan + pan[N]))) >> 8, 1); \
ODAC::Write((volume[N] * (pgm_read_word(lut_res_right_cos_pan + pan[N]))) >> 8, 1);
WRITE(Dac1, oDac1, 0);
WRITE(Dac2, oDac2, 1);
WRITE(Dac3, oDac3, 2);
WRITE(Dac4, oDac4, 3);
} }
} }