From a0cca8375d4ba838aaf3a339d66d012091447ea5 Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Tue, 17 Sep 2019 08:34:19 +0200 Subject: [PATCH] Fixes for modulated delay feedback. --- MicroMDAEPiano.ino | 10 ++++------ UI.hpp | 6 +----- config.h | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/MicroMDAEPiano.ino b/MicroMDAEPiano.ino index dc3cdb4..e7f387a 100644 --- a/MicroMDAEPiano.ino +++ b/MicroMDAEPiano.ino @@ -248,12 +248,10 @@ void setup() #endif modchorus_r.offset(15.0); modchorus_l.offset(15.0); - //modchorus_r.feedback(0.25); - //modchorus_l.feedback(0.25); - modchorus_fbk_mixer_r.gain(0, 0.75); - modchorus_fbk_mixer_l.gain(0, 0.75); - modchorus_fbk_mixer_r.gain(1, 0.25); - modchorus_fbk_mixer_l.gain(1, 0.25); + modchorus_fbk_mixer_r.gain(0, 1.0); + modchorus_fbk_mixer_l.gain(0, 1.0); + modchorus_fbk_mixer_r.gain(1, 0.0); + modchorus_fbk_mixer_l.gain(1, 0.0); // internal mixing of original signal(0), reverb(1) and chorus(2) mixer_r.gain(VOL_MAIN, 0.5); diff --git a/UI.hpp b/UI.hpp index 9128700..d6caff4 100644 --- a/UI.hpp +++ b/UI.hpp @@ -2208,11 +2208,7 @@ void set_chorus_feedback(uint8_t value) Serial.print(F("Set CHORUS_FEEDBACK ")); Serial.println(value); #endif - //modchorus_r.feedback(mapfloat(float(value), ENC_CHORUS_FEEDBACK_MIN, ENC_CHORUS_FEEDBACK_MAX, 0.0, 1.0)); - //modchorus_l.feedback(mapfloat(float(value), ENC_CHORUS_FEEDBACK_MIN, ENC_CHORUS_FEEDBACK_MAX, 0.0, 1.0)); - float tmp = mapfloat(float(value), ENC_CHORUS_FEEDBACK_MIN, ENC_CHORUS_FEEDBACK_MAX, 0.0, 0.5); - modchorus_fbk_mixer_r.gain(0, 1.0 - tmp); - modchorus_fbk_mixer_l.gain(0, 1.0 - tmp); + float tmp = mapfloat(float(value), ENC_CHORUS_FEEDBACK_MIN, ENC_CHORUS_FEEDBACK_MAX, 0.0, 0.2); modchorus_fbk_mixer_r.gain(1, tmp); modchorus_fbk_mixer_l.gain(1, tmp); configuration.chorus_feedback = value; diff --git a/config.h b/config.h index 258f9d2..cc60e0d 100644 --- a/config.h +++ b/config.h @@ -243,7 +243,7 @@ #define ENC_CHORUS_INTENSITY_DEFAULT 50 // #define ENC_CHORUS_FEEDBACK_MIN 0 -#define ENC_CHORUS_FEEDBACK_MAX 10 +#define ENC_CHORUS_FEEDBACK_MAX 20 #define ENC_CHORUS_FEEDBACK_DEFAULT 0 // #define ENC_CHORUS_WAVEFORM_MIN 1