From 263047aee463ea49c8558c008c29e5aa1c1198b9 Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Wed, 21 Aug 2019 18:26:39 +0200 Subject: [PATCH] Next try... --- MicroMDAEPiano.ino | 38 +++++++++++++++++++++++++------------- config.h | 2 +- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/MicroMDAEPiano.ino b/MicroMDAEPiano.ino index 990b59b..88c5536 100644 --- a/MicroMDAEPiano.ino +++ b/MicroMDAEPiano.ino @@ -57,25 +57,31 @@ AudioAmplifier inverter; AudioEffectModulatedDelay modchorus_r; AudioEffectModulatedDelay modchorus_l; AudioSynthWaveform modulator; -AudioFilterStateVariable modulator_filter; +//AudioFilterStateVariable modulator_filter; +AudioFilterStateVariable chorus_filter_r; +AudioFilterStateVariable chorus_filter_l; AudioConnection patchCord0(queue_r, peak_r); AudioConnection patchCord1(queue_l, peak_l); AudioConnection patchCord2(queue_r, freeverb_r); AudioConnection patchCord3(queue_l, freeverb_l); AudioConnection patchCord4(queue_r, 0, modchorus_r, 0); AudioConnection patchCord5(queue_l, 0, modchorus_l, 0); -AudioConnection patchCord6(modulator, 0, modulator_filter, 1); -AudioConnection patchCord7(modulator_filter, 0, modchorus_r, 1); -AudioConnection patchCord8(modulator_filter, 0, inverter, 0); +//AudioConnection patchCord6(modulator, 0, modulator_filter, 1); +//AudioConnection patchCord7(modulator_filter, 0, modchorus_r, 1); +//AudioConnection patchCord8(modulator_filter, 0, inverter, 0); +AudioConnection patchCord6(modulator, 0, modchorus_r, 1); +AudioConnection patchCord7(modulator, 0, inverter, 0); AudioConnection patchCord9(inverter, 0, modchorus_l, 1); AudioConnection patchCord10(queue_r, 0, mixer_r, 0); AudioConnection patchCord11(queue_l, 0, mixer_l, 0); -AudioConnection patchCord12(modchorus_r, 0, mixer_r, 2); -AudioConnection patchCord13(modchorus_l, 0, mixer_l, 2); -AudioConnection patchCord18(freeverb_r, 0, mixer_r, 1); -AudioConnection patchCord19(freeverb_l, 0, mixer_l, 1); -AudioConnection patchCord20(mixer_r, volume_r); -AudioConnection patchCord21(mixer_l, volume_l); +AudioConnection patchCord12(modchorus_r, chorus_filter_r); +AudioConnection patchCord13(modchorus_l, chorus_filter_l); +AudioConnection patchCord14(chorus_filter_r, 0, mixer_r, 2); +AudioConnection patchCord15(chorus_filter_l, 0, mixer_l, 2); +AudioConnection patchCord16(freeverb_r, 0, mixer_r, 1); +AudioConnection patchCord17(freeverb_l, 0, mixer_l, 1); +AudioConnection patchCord18(mixer_r, volume_r); +AudioConnection patchCord19(mixer_l, volume_l); #ifdef USB_AUDIO AudioOutputUSB usb1; AudioConnection patchCord22(volume_r, 0, usb1, 0); @@ -236,9 +242,15 @@ void setup() modulator.amplitude(1.0); modulator.offset(0.0); inverter.gain(-1.0); // change phase for second modulated delay (faked stereo mode) - modulator_filter.frequency(50); - modulator_filter.resonance(0.6); - modulator_filter.octaveControl(1); + //modulator_filter.frequency(15000); + //modulator_filter.resonance(0.7); + //modulator_filter.octaveControl(1); + chorus_filter_r.frequency(3500); + chorus_filter_r.resonance(0.7); + chorus_filter_r.octaveControl(2); + chorus_filter_l.frequency(3500); + chorus_filter_l.resonance(0.7); + chorus_filter_l.octaveControl(2); modchorus_r.offset(15.0); modchorus_l.offset(15.0); diff --git a/config.h b/config.h index bd5836c..e754998 100644 --- a/config.h +++ b/config.h @@ -56,7 +56,7 @@ #define USE_XFADE_DATA 1 // CHORUS parameters #define CHORUS_DELAY_LENGTH_SAMPLES (15*AUDIO_BLOCK_SAMPLES) // one AUDIO_BLOCK_SAMPLES = 2.902ms -#define CHORUS_WAVEFORM WAVEFORM_SINE // WAVEFORM_SINE WAVEFORM_TRIANGLE WAVEFORM_SAWTOOTH WAVEFORM_SAWTOOTH_REVERSE +#define CHORUS_WAVEFORM WAVEFORM_TRIANGLE // WAVEFORM_SINE WAVEFORM_TRIANGLE WAVEFORM_SAWTOOTH WAVEFORM_SAWTOOTH_REVERSE //************************************************************************************************* //* DEBUG OUTPUT SETTINGS //*************************************************************************************************