From cb917f3a2b9b6a936402b36e98e163f0b0239a8b Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Wed, 18 Sep 2019 09:03:39 +0200 Subject: [PATCH] Fixing setting negative numbers for eq_treble and eq_bass. Fixing chorus feedback. --- UI.hpp | 8 +++++--- config.h | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/UI.hpp b/UI.hpp index d6caff4..a182ada 100644 --- a/UI.hpp +++ b/UI.hpp @@ -2208,7 +2208,9 @@ void set_chorus_feedback(uint8_t value) Serial.print(F("Set CHORUS_FEEDBACK ")); Serial.println(value); #endif - float tmp = mapfloat(float(value), ENC_CHORUS_FEEDBACK_MIN, ENC_CHORUS_FEEDBACK_MAX, 0.0, 0.2); + 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); modchorus_fbk_mixer_r.gain(1, tmp); modchorus_fbk_mixer_l.gain(1, tmp); configuration.chorus_feedback = value; @@ -2280,7 +2282,7 @@ void set_bass_mono_level(uint8_t value) configuration.bass_mono_level = value; } -void set_eq_bass(uint8_t value) +void set_eq_bass(int8_t value) { if (value > ENC_EQ_TREBLE_MAX) value = ENC_EQ_TREBLE_MAX; @@ -2294,7 +2296,7 @@ void set_eq_bass(uint8_t value) configuration.eq_bass = value; } -void set_eq_treble(uint8_t value) +void set_eq_treble(int8_t value) { if (value > ENC_EQ_BASS_MAX ) value = ENC_EQ_BASS_MAX; diff --git a/config.h b/config.h index cc60e0d..0e28e9d 100644 --- a/config.h +++ b/config.h @@ -137,7 +137,7 @@ //* DO NO CHANGE ANYTHING BEYOND IF YOU DON'T KNOW WHAT YOU ARE DOING !!! //************************************************************************************************* -#define MICRO_MDAEPIANO_VERSION "0.9.6" +#define MICRO_MDAEPIANO_VERSION "0.9.7" #define MAX_SOUNDS min(99,int((4096-EEPROM_CONFIGURATIONS)/sizeof(config_t))) @@ -243,7 +243,7 @@ #define ENC_CHORUS_INTENSITY_DEFAULT 50 // #define ENC_CHORUS_FEEDBACK_MIN 0 -#define ENC_CHORUS_FEEDBACK_MAX 20 +#define ENC_CHORUS_FEEDBACK_MAX 10 #define ENC_CHORUS_FEEDBACK_DEFAULT 0 // #define ENC_CHORUS_WAVEFORM_MIN 1