Small fixes.

master
Holger Wirtz 6 years ago
parent 6bd662b602
commit 9efd4e6f03
  1. 8
      MicroMDAEPiano.ino
  2. 3
      config.h
  3. 2
      utility/gen_xfade.sh

@ -76,9 +76,11 @@ AudioConnection patchCord14(freeverb_r, 0, mixer_r, 1);
AudioConnection patchCord15(freeverb_l, 0, mixer_l, 1); AudioConnection patchCord15(freeverb_l, 0, mixer_l, 1);
AudioConnection patchCord16(mixer_r, volume_r); AudioConnection patchCord16(mixer_r, volume_r);
AudioConnection patchCord17(mixer_l, volume_l); AudioConnection patchCord17(mixer_l, volume_l);
#ifdef USB_AUDIO
AudioOutputUSB usb1; AudioOutputUSB usb1;
AudioConnection patchCord18(volume_r, 0, usb1, 0); AudioConnection patchCord18(volume_r, 0, usb1, 0);
AudioConnection patchCord19(volume_l, 0, usb1, 1); AudioConnection patchCord19(volume_l, 0, usb1, 1);
#endif
AudioOutputI2S i2s1; AudioOutputI2S i2s1;
AudioConnection patchCord20(volume_r, 0, i2s1, 0); AudioConnection patchCord20(volume_r, 0, i2s1, 0);
AudioConnection patchCord21(volume_l, 0, i2s1, 1); AudioConnection patchCord21(volume_l, 0, i2s1, 1);
@ -229,11 +231,11 @@ void setup()
modulator.phase(0); modulator.phase(0);
modulator.offset(0.0); modulator.offset(0.0);
modulator_filter.setLowpass(0, CHORUS_MODULATOR_FILTER_FRQ, CHORUS_MODULATOR_FILTER_Q); modulator_filter.setLowpass(0, CHORUS_MODULATOR_FILTER_FRQ, CHORUS_MODULATOR_FILTER_Q);
inverter.gain(-1.0); // change phase for second moduleated delay inverter.gain(-1.0); // change phase for second modulated delay (faked stereo mode)
// internal mixing of original signal(0), reverb(1) and chorus(2) // internal mixing of original signal(0), reverb(1) and chorus(2)
mixer_r.gain(VOL_MAIN, 0.4); mixer_r.gain(VOL_MAIN, 0.5);
mixer_l.gain(VOL_MAIN, 0.4); mixer_l.gain(VOL_MAIN, 0.5);
mixer_r.gain(VOL_REVERB, 0.2); mixer_r.gain(VOL_REVERB, 0.2);
mixer_l.gain(VOL_REVERB, 0.2); mixer_l.gain(VOL_REVERB, 0.2);
mixer_r.gain(VOL_CHORUS, 0.2); mixer_r.gain(VOL_CHORUS, 0.2);

@ -51,7 +51,6 @@
//* AUDIO SETTINGS //* AUDIO SETTINGS
//************************************************************************************************* //*************************************************************************************************
#define VOLUME 0.8
#define AUDIO_MEM 128 #define AUDIO_MEM 128
#define SAMPLE_RATE AUDIO_SAMPLE_RATE #define SAMPLE_RATE AUDIO_SAMPLE_RATE
#define REDUCE_LOUDNESS 0 #define REDUCE_LOUDNESS 0
@ -77,6 +76,8 @@
//* HARDWARE SETTINGS //* HARDWARE SETTINGS
//************************************************************************************************* //*************************************************************************************************
#define USB_AUDIO 1
// Teensy Audio Shield: // Teensy Audio Shield:
/* Values for SGTL5000_LINEOUT_LEVEL /* Values for SGTL5000_LINEOUT_LEVEL
13: 3.16 Volts p-p 13: 3.16 Volts p-p

@ -5,5 +5,5 @@ sed -i 's/PROGMEM//' mdaEPianoData.h
sed -i 's/const//' mdaEPianoData.h sed -i 's/const//' mdaEPianoData.h
gcc -o xfade_generator xfade_generator.c gcc -o xfade_generator xfade_generator.c
rm mdaEPianoData.h rm mdaEPianoData.h
./xfade_generator >../mdaEPianoData_xfade.h ./xfade_generator >../mdaEPianoDataXfade.h
rm xfade_generator rm xfade_generator

Loading…
Cancel
Save