diff --git a/MicroMDAEPiano.ino b/MicroMDAEPiano.ino index c454b97..5357cca 100644 --- a/MicroMDAEPiano.ino +++ b/MicroMDAEPiano.ino @@ -196,8 +196,8 @@ void setup() // create EPiano object ep = new mdaEPiano(); + // set initial init configuration set_complete_configuration(); - initial_values_from_eeprom(); setup_midi_devices(); @@ -244,7 +244,7 @@ void setup() // chorus modulation fixed modulator.begin(WAVEFORM_MOD); modulator.phase(0); - modulator.amplitude(1.0); + modulator.amplitude(0.0); modulator.offset(0.0); modchorus_r.offset(15.0); modchorus_l.offset(15.0); @@ -274,7 +274,7 @@ void setup() mixer_l.gain(VOL_CHORUS, 0.2); // Stereo/Mono initial setup - if (configuration.mono == false) + if (configuration.mono == 0) { inverter.gain(-1.0); // change phase for second modulated delay (faked stereo mode) } @@ -287,6 +287,9 @@ void setup() // set master volume set_master_volume(master_volume); + // load last configuration used + initial_values_from_eeprom(); + // init random generator srand(analogRead(A0)); @@ -778,6 +781,8 @@ void show_sound(void) Serial.println(configuration.midi_soft_thru, DEC); Serial.print(F("Maximum Polyphony: ")); Serial.println(configuration.max_poly, DEC); + Serial.print(F("Audio-Mono: ")); + Serial.println(configuration.mono, DEC); Serial.print(F("Panorama: ")); Serial.println(configuration.pan, DEC); Serial.println(F("======END=SOUND=CONFIGURATION=======")); diff --git a/UI.hpp b/UI.hpp index 0ee54eb..c04483f 100644 --- a/UI.hpp +++ b/UI.hpp @@ -2230,7 +2230,8 @@ void set_chorus_delay(uint8_t value) Serial.print(F("Set CHORUS_DELAY ")); Serial.println(value); #endif - modchorus_r.offset(20.0); + modchorus_r.offset(float(value) / 10); + modchorus_l.offset(float(value) / 10); configuration.chorus_delay = value; } @@ -2702,7 +2703,7 @@ void handle_ui(void) if (encoder_tmp != encoder_value[RIGHT_ENCODER]) { // value up/down - set_chorus_delay(encoder_tmp / 10); + set_chorus_delay(encoder_tmp); menu_system.update(); } } diff --git a/config.h b/config.h index 49850dd..0cf3159 100644 --- a/config.h +++ b/config.h @@ -99,7 +99,7 @@ 30: 1.22 Volts p-p 31: 1.16 Volts p-p */ -#define SGTL5000_LINEOUT_LEVEL 25 +#define SGTL5000_LINEOUT_LEVEL 21 //#define SDCARD_CS_PIN 10 //#define SDCARD_MOSI_PIN 7 //#define SDCARD_SCK_PIN 14 @@ -137,7 +137,7 @@ //* DO NO CHANGE ANYTHING BEYOND IF YOU DON'T KNOW WHAT YOU ARE DOING !!! //************************************************************************************************* -#define MICRO_MDAEPIANO_VERSION "0.9.7" +#define MICRO_MDAEPIANO_VERSION "0.9.8" #define MAX_SOUNDS min(99,int((4096-EEPROM_CONFIGURATIONS)/sizeof(config_t))) diff --git a/mdaEPiano.cpp b/mdaEPiano.cpp index f23886a..b528e4b 100644 --- a/mdaEPiano.cpp +++ b/mdaEPiano.cpp @@ -257,7 +257,7 @@ void mdaEPiano::setOverdrive(float value) void mdaEPiano::setLoudness(float value) { //volume = value * 0.32258; // 0.00002 * 127^2 - volume = value * 0.17f; + volume = value * 0.16f; } void mdaEPiano::setParameter(int32_t index, float value)