From b999e0c72a9e9991524841690b228747c6fcc4ae Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Mon, 27 Dec 2021 09:21:33 +0100 Subject: [PATCH] Small fixes before merge. --- MicroDexed.ino | 4 +++- UI_FX_T4.h | 2 +- addon/SD/PERFORMANCE/0/epiano.json | 8 ++++---- addon/SD/PERFORMANCE/1/epiano.json | 14 +++++++------- addon/SD/PERFORMANCE/2/epiano.json | 14 +++++++------- addon/SD/PERFORMANCE/3/epiano.json | 10 +++++----- addon/SD/PERFORMANCE/4/epiano.json | 10 +++++----- addon/SD/PERFORMANCE/5/epiano.json | 8 ++++---- addon/SD/PERFORMANCE/6/epiano.json | 14 +++++++------- addon/SD/PERFORMANCE/7/epiano.json | 14 +++++++------- addon/SD/PERFORMANCE/8/epiano.json | 10 +++++----- config.h | 3 ++- 12 files changed, 57 insertions(+), 54 deletions(-) diff --git a/MicroDexed.ino b/MicroDexed.ino index 9264a47..da2cebd 100644 --- a/MicroDexed.ino +++ b/MicroDexed.ino @@ -459,8 +459,10 @@ void setup() Serial.println(CrashReport); Serial.println(F("-------------------------------------------------------------------------------")); #endif - +#ifdef DEBUG setup_debug_message(); +#endif + generate_version_string(version_string, sizeof(version_string)); #ifdef DEBUG diff --git a/UI_FX_T4.h b/UI_FX_T4.h index 738ae1e..3442e4b 100644 --- a/UI_FX_T4.h +++ b/UI_FX_T4.h @@ -100,7 +100,7 @@ LCDML_add(65, LCDML_0_2, 8, "Smart Filter", UI_func_smart_filter); LCDML_add(66, LCDML_0, 3, "E-Piano", NULL); LCDML_add(67, LCDML_0_3, 1, "Voice Level", UI_func_epiano_sound_intensity); LCDML_add(68, LCDML_0_3, 2, "Panorama", UI_func_epiano_panorama); -LCDML_add(69, LCDML_0_3, 3, "Audio", NULL); +LCDML_add(69, LCDML_0_3, 3, "Sound", NULL); LCDML_add(70, LCDML_0_3_3, 1, "Decay", UI_func_epiano_decay); // uint8_t decay; LCDML_add(71, LCDML_0_3_3, 2, "Release", UI_func_epiano_release); // uint8_t release; LCDML_add(72, LCDML_0_3_3, 3, "Hardness", UI_func_epiano_hardness); // uint8_t hardness; diff --git a/addon/SD/PERFORMANCE/0/epiano.json b/addon/SD/PERFORMANCE/0/epiano.json index d0edd2e..c7395a4 100755 --- a/addon/SD/PERFORMANCE/0/epiano.json +++ b/addon/SD/PERFORMANCE/0/epiano.json @@ -3,10 +3,10 @@ "release": 50, "hardness": 50, "treble": 50, - "pan_tremolo": 65, - "pan_lfo": 25, - "velocity_sense": 50, - "stereo": 100, + "pan_tremolo": 50, + "pan_lfo": 65, + "velocity_sense": 25, + "stereo": 50, "polyphony": 16, "tune": 50, "detune": 15, diff --git a/addon/SD/PERFORMANCE/1/epiano.json b/addon/SD/PERFORMANCE/1/epiano.json index d0edd2e..5f54fe3 100644 --- a/addon/SD/PERFORMANCE/1/epiano.json +++ b/addon/SD/PERFORMANCE/1/epiano.json @@ -1,16 +1,16 @@ { "decay": 50, "release": 50, - "hardness": 50, - "treble": 50, - "pan_tremolo": 65, - "pan_lfo": 25, - "velocity_sense": 50, - "stereo": 100, + "hardness": 100, + "treble": 80, + "pan_tremolo": 50, + "pan_lfo": 65, + "velocity_sense": 25, + "stereo": 50, "polyphony": 16, "tune": 50, "detune": 15, - "overdrive": 0, + "overdrive": 50, "lowest_note": 21, "highest_note": 108, "transpose": 24, diff --git a/addon/SD/PERFORMANCE/2/epiano.json b/addon/SD/PERFORMANCE/2/epiano.json index d0edd2e..87d9e76 100644 --- a/addon/SD/PERFORMANCE/2/epiano.json +++ b/addon/SD/PERFORMANCE/2/epiano.json @@ -1,15 +1,15 @@ { "decay": 50, "release": 50, - "hardness": 50, - "treble": 50, - "pan_tremolo": 65, - "pan_lfo": 25, - "velocity_sense": 50, - "stereo": 100, + "hardness": 0, + "treble": 0, + "pan_tremolo": 50, + "pan_lfo": 65, + "velocity_sense": 25, + "stereo": 50, "polyphony": 16, "tune": 50, - "detune": 15, + "detune": 25, "overdrive": 0, "lowest_note": 21, "highest_note": 108, diff --git a/addon/SD/PERFORMANCE/3/epiano.json b/addon/SD/PERFORMANCE/3/epiano.json index d0edd2e..bfae928 100644 --- a/addon/SD/PERFORMANCE/3/epiano.json +++ b/addon/SD/PERFORMANCE/3/epiano.json @@ -3,13 +3,13 @@ "release": 50, "hardness": 50, "treble": 50, - "pan_tremolo": 65, - "pan_lfo": 25, - "velocity_sense": 50, - "stereo": 100, + "pan_tremolo": 25, + "pan_lfo": 65, + "velocity_sense": 25, + "stereo": 50, "polyphony": 16, "tune": 50, - "detune": 15, + "detune": 25, "overdrive": 0, "lowest_note": 21, "highest_note": 108, diff --git a/addon/SD/PERFORMANCE/4/epiano.json b/addon/SD/PERFORMANCE/4/epiano.json index d0edd2e..9f59d62 100644 --- a/addon/SD/PERFORMANCE/4/epiano.json +++ b/addon/SD/PERFORMANCE/4/epiano.json @@ -3,13 +3,13 @@ "release": 50, "hardness": 50, "treble": 50, - "pan_tremolo": 65, - "pan_lfo": 25, - "velocity_sense": 50, - "stereo": 100, + "pan_tremolo": 75, + "pan_lfo": 65, + "velocity_sense": 25, + "stereo": 50, "polyphony": 16, "tune": 50, - "detune": 15, + "detune": 25, "overdrive": 0, "lowest_note": 21, "highest_note": 108, diff --git a/addon/SD/PERFORMANCE/5/epiano.json b/addon/SD/PERFORMANCE/5/epiano.json index d0edd2e..c7395a4 100644 --- a/addon/SD/PERFORMANCE/5/epiano.json +++ b/addon/SD/PERFORMANCE/5/epiano.json @@ -3,10 +3,10 @@ "release": 50, "hardness": 50, "treble": 50, - "pan_tremolo": 65, - "pan_lfo": 25, - "velocity_sense": 50, - "stereo": 100, + "pan_tremolo": 50, + "pan_lfo": 65, + "velocity_sense": 25, + "stereo": 50, "polyphony": 16, "tune": 50, "detune": 15, diff --git a/addon/SD/PERFORMANCE/6/epiano.json b/addon/SD/PERFORMANCE/6/epiano.json index d0edd2e..5f54fe3 100644 --- a/addon/SD/PERFORMANCE/6/epiano.json +++ b/addon/SD/PERFORMANCE/6/epiano.json @@ -1,16 +1,16 @@ { "decay": 50, "release": 50, - "hardness": 50, - "treble": 50, - "pan_tremolo": 65, - "pan_lfo": 25, - "velocity_sense": 50, - "stereo": 100, + "hardness": 100, + "treble": 80, + "pan_tremolo": 50, + "pan_lfo": 65, + "velocity_sense": 25, + "stereo": 50, "polyphony": 16, "tune": 50, "detune": 15, - "overdrive": 0, + "overdrive": 50, "lowest_note": 21, "highest_note": 108, "transpose": 24, diff --git a/addon/SD/PERFORMANCE/7/epiano.json b/addon/SD/PERFORMANCE/7/epiano.json index d0edd2e..87d9e76 100644 --- a/addon/SD/PERFORMANCE/7/epiano.json +++ b/addon/SD/PERFORMANCE/7/epiano.json @@ -1,15 +1,15 @@ { "decay": 50, "release": 50, - "hardness": 50, - "treble": 50, - "pan_tremolo": 65, - "pan_lfo": 25, - "velocity_sense": 50, - "stereo": 100, + "hardness": 0, + "treble": 0, + "pan_tremolo": 50, + "pan_lfo": 65, + "velocity_sense": 25, + "stereo": 50, "polyphony": 16, "tune": 50, - "detune": 15, + "detune": 25, "overdrive": 0, "lowest_note": 21, "highest_note": 108, diff --git a/addon/SD/PERFORMANCE/8/epiano.json b/addon/SD/PERFORMANCE/8/epiano.json index d0edd2e..bfae928 100644 --- a/addon/SD/PERFORMANCE/8/epiano.json +++ b/addon/SD/PERFORMANCE/8/epiano.json @@ -3,13 +3,13 @@ "release": 50, "hardness": 50, "treble": 50, - "pan_tremolo": 65, - "pan_lfo": 25, - "velocity_sense": 50, - "stereo": 100, + "pan_tremolo": 25, + "pan_lfo": 65, + "velocity_sense": 25, + "stereo": 50, "polyphony": 16, "tune": 50, - "detune": 15, + "detune": 25, "overdrive": 0, "lowest_note": 21, "highest_note": 108, diff --git a/config.h b/config.h index cd07fc5..1d6237a 100644 --- a/config.h +++ b/config.h @@ -91,7 +91,7 @@ //************************************************************************************************* //* DEBUG OUTPUT SETTINGS //************************************************************************************************* -#define DEBUG 1 +//#define DEBUG 1 //#define DEBUG_SHOW_JSON 1 #define SERIAL_SPEED 230400 #define SHOW_XRUN 1 @@ -148,6 +148,7 @@ #define MOD_WAVEFORM WAVEFORM_TRIANGLE // WAVEFORM_SINE WAVEFORM_TRIANGLE WAVEFORM_SAWTOOTH WAVEFORM_SAWTOOTH_REVERSE #define MOD_FILTER_OUTPUT MOD_BUTTERWORTH_FILTER_OUTPUT // MOD_LINKWITZ_RILEY_FILTER_OUTPUT MOD_BUTTERWORTH_FILTER_OUTPUT MOD_NO_FILTER_OUTPUT #define MOD_FILTER_CUTOFF_HZ 2000 + // SGTL5000 #ifdef TEENSY_AUDIO_BOARD #define SGTL5000_AUDIO_ENHANCE 1