diff --git a/MicroDexed.ino b/MicroDexed.ino index 0e2d441..c517308 100644 --- a/MicroDexed.ino +++ b/MicroDexed.ino @@ -565,6 +565,7 @@ void setup() { configuration.drums.drum_pan[i] = mapfloat(drum_config[i].pan, -1.0, 1.0, DRUMS_PANORAMA_MIN, DRUMS_PANORAMA_MAX); configuration.drums.drum_reverb_send[i] = mapfloat(drum_config[i].reverb_send, 0.0, 1.0, DRUMS_REVERB_SEND_MIN, DRUMS_REVERB_SEND_MAX); configuration.drums.drum_pitch[i] = mapfloat(drum_config[i].pitch, -1.0, 1.0, DRUMS_PITCH_MIN, DRUMS_PITCH_MAX); + configuration.drums.drum_midi_note[i] = constrain(drum_config[i].midinote, DRUMS_MIDI_NOTE_MIN, DRUMS_MIDI_NOTE_MAX); } #endif diff --git a/UI.hpp b/UI.hpp index e684ff9..d8bfafe 100644 --- a/UI.hpp +++ b/UI.hpp @@ -360,6 +360,7 @@ void UI_func_drums_main_volume(uint8_t param); void UI_func_drum_volume(uint8_t param); void UI_func_drum_pan(uint8_t param); void UI_func_drum_pitch(uint8_t param); +void UI_func_drum_midi_note(uint8_t param); char* basename(const char* filename); char* strip_extension(char* filename); @@ -4281,6 +4282,70 @@ void UI_func_drum_reverb_send(uint8_t param) { } } +void _UI_func_drum_midi_note_display(bool mode) { + char temp1[10]; + char temp2[10]; + char note_name[4]; + + memset(temp1, 0, sizeof(temp1)); + memset(temp2, 0, sizeof(temp2)); + + getNoteName(note_name, configuration.drums.drum_midi_note[activesample]); + + if (mode == false) { + snprintf_P(temp1, sizeof(temp1), PSTR("[%02d]"), activesample + 1); + snprintf_P(temp2, sizeof(temp2), PSTR(" %-3s "), note_name); + } else { + snprintf_P(temp1, sizeof(temp1), PSTR(" %02d "), activesample + 1); + snprintf_P(temp2, sizeof(temp2), PSTR("[%-3s]"), note_name); + } + display.show(1, 0, 4, temp1); + display.show(1, 4, 7, basename(drum_config[activesample].name)); + display.show(1, 11, 5, temp2); +} + +void UI_func_drum_midi_note(uint8_t param) { + static bool mode; + + if (LCDML.FUNC_setup()) // ****** SETUP ********* + { + encoderDir[ENC_R].reset(); + display.setCursor(0, 0); + display.print("Drum MIDI Note"); + _UI_func_drum_midi_note_display(mode); + } + + if (LCDML.FUNC_loop()) // ****** LOOP ********* + { + if (LCDML.BT_checkEnter() && encoderDir[ENC_R].ButtonShort()) { + mode = !mode; + } else if (LCDML.BT_checkDown()) { + if (mode == false) + activesample = (activesample + ENCODER[ENC_R].speed()) % (NUM_DRUMSET_CONFIG - 1); + else + configuration.drums.drum_midi_note[activesample] = constrain(++configuration.drums.drum_midi_note[activesample], DRUMS_MIDI_NOTE_MIN, DRUMS_MIDI_NOTE_MAX); + } else if (LCDML.BT_checkUp()) { + if (mode == false) { + uint8_t temp_encoder = ENCODER[ENC_R].speed(); + if (activesample - temp_encoder < 0) + activesample = NUM_DRUMSET_CONFIG - (abs(activesample - temp_encoder)) - 1; + else + activesample -= temp_encoder; + } else { + configuration.drums.drum_midi_note[activesample] = constrain(--configuration.drums.drum_midi_note[activesample], DRUMS_MIDI_NOTE_MIN, DRUMS_MIDI_NOTE_MAX); + } + } + + // Display and set values + _UI_func_drum_midi_note_display(mode); + } + + if (LCDML.FUNC_close()) // ****** STABLE END ********* + { + encoderDir[ENC_R].reset(); + } +} + void UI_func_save_performance(uint8_t param) { static bool overwrite; static bool yesno; diff --git a/UI_FX_T4.h b/UI_FX_T4.h index bccd261..0755ee1 100644 --- a/UI_FX_T4.h +++ b/UI_FX_T4.h @@ -92,68 +92,69 @@ LCDML_add(58, LCDML_0_2, 1, "Drums Main Vol", UI_func_drums_main_volume); LCDML_add(59, LCDML_0_2, 2, "Drum Volumes", UI_func_drum_volume); LCDML_add(60, LCDML_0_2, 3, "Drum Pan", UI_func_drum_pan); LCDML_add(61, LCDML_0_2, 4, "Drum Rev.Send", UI_func_drum_reverb_send); -LCDML_add(62, LCDML_0_2, 5, "Drum Pitch", UI_func_drum_pitch); -LCDML_add(63, LCDML_0_2, 6, "MIDI Channel", UI_func_drum_midi_channel); -LCDML_add(64, LCDML_0, 3, "E-Piano", NULL); -LCDML_add(65, LCDML_0_3, 1, "Voice Level", UI_func_epiano_sound_intensity); -LCDML_add(66, LCDML_0_3, 2, "Panorama", UI_func_epiano_panorama); -LCDML_add(67, LCDML_0_3, 3, "Sound", NULL); -LCDML_add(68, LCDML_0_3_3, 1, "Decay", UI_func_epiano_decay); // uint8_t decay; -LCDML_add(69, LCDML_0_3_3, 2, "Release", UI_func_epiano_release); // uint8_t release; -LCDML_add(70, LCDML_0_3_3, 3, "Hardness", UI_func_epiano_hardness); // uint8_t hardness; -LCDML_add(71, LCDML_0_3_3, 4, "Treble", UI_func_epiano_treble); // uint8_t treble; -LCDML_add(72, LCDML_0_3_3, 5, "Stereo", UI_func_epiano_stereo); // uint8_t stereo; -LCDML_add(73, LCDML_0_3_3, 6, "Tune", UI_func_epiano_tune); // uint8_t tune; -LCDML_add(74, LCDML_0_3_3, 7, "Detune", UI_func_epiano_detune); // uint8_t detune; -LCDML_add(75, LCDML_0_3, 4, "Effects", NULL); -LCDML_add(76, LCDML_0_3_4, 1, "Overdrive", UI_func_epiano_overdrive); // uint8_t overdrive; -LCDML_add(77, LCDML_0_3_4, 2, "Tremolo", NULL); -LCDML_add(78, LCDML_0_3_4_2, 1, "Width", UI_func_epiano_pan_tremolo); // uint8_t pan_tremolo; -LCDML_add(79, LCDML_0_3_4_2, 2, "LFO", UI_func_epiano_pan_lfo); // uint8_t pan_lfo; -LCDML_add(80, LCDML_0_3_4, 3, "Chorus", NULL); -LCDML_add(81, LCDML_0_3_4_3, 1, "Frequency", UI_func_epiano_chorus_frequency); -LCDML_add(82, LCDML_0_3_4_3, 2, "Waveform", UI_func_epiano_chorus_waveform); -LCDML_add(83, LCDML_0_3_4_3, 3, "Depth", UI_func_epiano_chorus_depth); -LCDML_add(84, LCDML_0_3_4_3, 4, "Level", UI_func_epiano_chorus_level); -LCDML_add(85, LCDML_0_3_4, 4, "Reverb Send", UI_func_epiano_reverb_send); -LCDML_add(86, LCDML_0_3, 6, "MIDI", NULL); -LCDML_add(87, LCDML_0_3_6, 1, "MIDI Channel", UI_func_epiano_midi_channel); // uint8_t midi_channel; -LCDML_add(88, LCDML_0_3_6, 2, "Lowest Note", UI_func_epiano_lowest_note); // uint8_t lowest_note; -LCDML_add(89, LCDML_0_3_6, 3, "Highest Note", UI_func_epiano_highest_note); // uint8_t highest_note; -LCDML_add(90, LCDML_0_3, 7, "Setup", NULL); -LCDML_add(91, LCDML_0_3_7, 4, "Transpose", UI_func_epiano_transpose); // uint8_t transpose; -LCDML_add(92, LCDML_0_3_7, 1, "Polyphony", UI_func_epiano_polyphony); // uint8_t polyphony; -LCDML_add(93, LCDML_0_3_7, 2, "Vel. Sense", UI_func_epiano_velocity_sense); // uint8_t velocity_sense; -LCDML_add(94, LCDML_0, 4, "Master Effects", NULL); -LCDML_add(95, LCDML_0_4, 1, "Reverb", NULL); -LCDML_add(96, LCDML_0_4_1, 1, "Roomsize", UI_func_reverb_roomsize); -LCDML_add(97, LCDML_0_4_1, 2, "Lowpass", UI_func_reverb_lowpass); -LCDML_add(98, LCDML_0_4_1, 3, "Lodamp", UI_func_reverb_lodamp); -LCDML_add(99, LCDML_0_4_1, 4, "Hidamp", UI_func_reverb_hidamp); -LCDML_add(100, LCDML_0_4_1, 5, "Diffusion", UI_func_reverb_diffusion); -LCDML_add(101, LCDML_0_4_1, 6, "Level", UI_func_reverb_level); -LCDML_add(102, LCDML_0_4_1, 7, "Reverb Send", UI_func_reverb_send); -LCDML_add(103, LCDML_0_4, 2, "EQ", NULL); -LCDML_add(104, LCDML_0_4_2, 1, "Low-Cut", UI_func_eq_1); -LCDML_add(105, LCDML_0_4_2, 2, "110Hz", UI_func_eq_2); -LCDML_add(106, LCDML_0_4_2, 3, "220Hz", UI_func_eq_3); -LCDML_add(107, LCDML_0_4_2, 4, "1000Hz", UI_func_eq_4); -LCDML_add(108, LCDML_0_4_2, 5, "2000Hz", UI_func_eq_5); -LCDML_add(109, LCDML_0_4_2, 6, "7000Hz", UI_func_eq_6); -LCDML_add(110, LCDML_0_4_2, 7, "High-Cut", UI_func_eq_7) -LCDML_add(111, LCDML_0, 5, "Load/Save", NULL); -LCDML_add(112, LCDML_0_5, 1, "Load Perf.", UI_func_load_performance); -LCDML_add(113, LCDML_0_5, 2, "Save Perf.", UI_func_save_performance); -LCDML_add(114, LCDML_0_5, 3, "Name Perf.", UI_func_set_performance_name); -LCDML_add(115, LCDML_0_5, 4, "MIDI", NULL); -LCDML_add(116, LCDML_0_5_4, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank); -LCDML_add(117, LCDML_0_5_4, 2, "MIDI Snd Bank", UI_func_sysex_send_bank); -LCDML_add(118, LCDML_0_5_4, 3, "MIDI Snd Voice", UI_func_sysex_send_voice); -LCDML_add(119, LCDML_0, 6, "System", NULL); -LCDML_add(120, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono); -LCDML_add(121, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); -LCDML_add(122, LCDML_0_6, 3, "Favorites", UI_func_favorites); -LCDML_add(123, LCDML_0_6, 4, "Startup", UI_func_startup); -LCDML_add(124, LCDML_0, 7, "Info", UI_func_information); -LCDML_addAdvanced(125, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); -#define _LCDML_DISP_cnt 125 +LCDML_add(62, LCDML_0_2, 5, "Drum Pitch", UI_func_drum_pitch); +LCDML_add(63, LCDML_0_2, 6, "Drum MIDI Note", UI_func_drum_midi_note); +LCDML_add(64, LCDML_0_2, 7, "MIDI Channel", UI_func_drum_midi_channel); +LCDML_add(65, LCDML_0, 3, "E-Piano", NULL); +LCDML_add(66, LCDML_0_3, 1, "Voice Level", UI_func_epiano_sound_intensity); +LCDML_add(67, LCDML_0_3, 2, "Panorama", UI_func_epiano_panorama); +LCDML_add(68, LCDML_0_3, 3, "Sound", NULL); +LCDML_add(69, LCDML_0_3_3, 1, "Decay", UI_func_epiano_decay); // uint8_t decay; +LCDML_add(70, LCDML_0_3_3, 2, "Release", UI_func_epiano_release); // uint8_t release; +LCDML_add(71, LCDML_0_3_3, 3, "Hardness", UI_func_epiano_hardness); // uint8_t hardness; +LCDML_add(72, LCDML_0_3_3, 4, "Treble", UI_func_epiano_treble); // uint8_t treble; +LCDML_add(73, LCDML_0_3_3, 5, "Stereo", UI_func_epiano_stereo); // uint8_t stereo; +LCDML_add(74, LCDML_0_3_3, 6, "Tune", UI_func_epiano_tune); // uint8_t tune; +LCDML_add(75, LCDML_0_3_3, 7, "Detune", UI_func_epiano_detune); // uint8_t detune; +LCDML_add(76, LCDML_0_3, 4, "Effects", NULL); +LCDML_add(77, LCDML_0_3_4, 1, "Overdrive", UI_func_epiano_overdrive); // uint8_t overdrive; +LCDML_add(78, LCDML_0_3_4, 2, "Tremolo", NULL); +LCDML_add(79, LCDML_0_3_4_2, 1, "Width", UI_func_epiano_pan_tremolo); // uint8_t pan_tremolo; +LCDML_add(80, LCDML_0_3_4_2, 2, "LFO", UI_func_epiano_pan_lfo); // uint8_t pan_lfo; +LCDML_add(81, LCDML_0_3_4, 3, "Chorus", NULL); +LCDML_add(82, LCDML_0_3_4_3, 1, "Frequency", UI_func_epiano_chorus_frequency); +LCDML_add(83, LCDML_0_3_4_3, 2, "Waveform", UI_func_epiano_chorus_waveform); +LCDML_add(84, LCDML_0_3_4_3, 3, "Depth", UI_func_epiano_chorus_depth); +LCDML_add(85, LCDML_0_3_4_3, 4, "Level", UI_func_epiano_chorus_level); +LCDML_add(86, LCDML_0_3_4, 4, "Reverb Send", UI_func_epiano_reverb_send); +LCDML_add(87, LCDML_0_3, 6, "MIDI", NULL); +LCDML_add(88, LCDML_0_3_6, 1, "MIDI Channel", UI_func_epiano_midi_channel); // uint8_t midi_channel; +LCDML_add(89, LCDML_0_3_6, 2, "Lowest Note", UI_func_epiano_lowest_note); // uint8_t lowest_note; +LCDML_add(90, LCDML_0_3_6, 3, "Highest Note", UI_func_epiano_highest_note); // uint8_t highest_note; +LCDML_add(91, LCDML_0_3, 7, "Setup", NULL); +LCDML_add(92, LCDML_0_3_7, 4, "Transpose", UI_func_epiano_transpose); // uint8_t transpose; +LCDML_add(93, LCDML_0_3_7, 1, "Polyphony", UI_func_epiano_polyphony); // uint8_t polyphony; +LCDML_add(94, LCDML_0_3_7, 2, "Vel. Sense", UI_func_epiano_velocity_sense); // uint8_t velocity_sense; +LCDML_add(95, LCDML_0, 4, "Master Effects", NULL); +LCDML_add(96, LCDML_0_4, 1, "Reverb", NULL); +LCDML_add(97, LCDML_0_4_1, 1, "Roomsize", UI_func_reverb_roomsize); +LCDML_add(98, LCDML_0_4_1, 2, "Lowpass", UI_func_reverb_lowpass); +LCDML_add(99, LCDML_0_4_1, 3, "Lodamp", UI_func_reverb_lodamp); +LCDML_add(100, LCDML_0_4_1, 4, "Hidamp", UI_func_reverb_hidamp); +LCDML_add(101, LCDML_0_4_1, 5, "Diffusion", UI_func_reverb_diffusion); +LCDML_add(102, LCDML_0_4_1, 6, "Level", UI_func_reverb_level); +LCDML_add(103, LCDML_0_4_1, 7, "Reverb Send", UI_func_reverb_send); +LCDML_add(104, LCDML_0_4, 2, "EQ", NULL); +LCDML_add(105, LCDML_0_4_2, 1, "Low-Cut", UI_func_eq_1); +LCDML_add(106, LCDML_0_4_2, 2, "110Hz", UI_func_eq_2); +LCDML_add(107, LCDML_0_4_2, 3, "220Hz", UI_func_eq_3); +LCDML_add(108, LCDML_0_4_2, 4, "1000Hz", UI_func_eq_4); +LCDML_add(109, LCDML_0_4_2, 5, "2000Hz", UI_func_eq_5); +LCDML_add(110, LCDML_0_4_2, 6, "7000Hz", UI_func_eq_6); +LCDML_add(111, LCDML_0_4_2, 7, "High-Cut", UI_func_eq_7) +LCDML_add(112, LCDML_0, 5, "Load/Save", NULL); +LCDML_add(113, LCDML_0_5, 1, "Load Perf.", UI_func_load_performance); +LCDML_add(114, LCDML_0_5, 2, "Save Perf.", UI_func_save_performance); +LCDML_add(115, LCDML_0_5, 3, "Name Perf.", UI_func_set_performance_name); +LCDML_add(116, LCDML_0_5, 4, "MIDI", NULL); +LCDML_add(117, LCDML_0_5_4, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank); +LCDML_add(118, LCDML_0_5_4, 2, "MIDI Snd Bank", UI_func_sysex_send_bank); +LCDML_add(119, LCDML_0_5_4, 3, "MIDI Snd Voice", UI_func_sysex_send_voice); +LCDML_add(120, LCDML_0, 6, "System", NULL); +LCDML_add(121, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono); +LCDML_add(122, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); +LCDML_add(123, LCDML_0_6, 3, "Favorites", UI_func_favorites); +LCDML_add(124, LCDML_0_6, 4, "Startup", UI_func_startup); +LCDML_add(125, LCDML_0, 7, "Info", UI_func_information); +LCDML_addAdvanced(126, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); +#define _LCDML_DISP_cnt 126 \ No newline at end of file diff --git a/config.h b/config.h index c502435..8a381ea 100644 --- a/config.h +++ b/config.h @@ -664,6 +664,9 @@ #define DRUMS_MAIN_VOL_MAX 100 #define DRUMS_MAIN_VOL_DEFAULT 80 +#define DRUMS_MIDI_NOTE_MIN 21 +#define DRUMS_MIDI_NOTE_MAX 108 + #define DRUMS_PANORAMA_MIN -50 #define DRUMS_PANORAMA_MAX 50 @@ -933,6 +936,7 @@ typedef struct performance_s { typedef struct drums_s { uint8_t drum_main_vol; uint8_t drum_midi_channel; + uint8_t drum_midi_note[NUM_DRUMSET_CONFIG - 1]; uint8_t drum_vol[NUM_DRUMSET_CONFIG - 1]; int8_t drum_pan[NUM_DRUMSET_CONFIG - 1]; uint8_t drum_reverb_send[NUM_DRUMSET_CONFIG - 1];