diff --git a/MicroDexed.ino b/MicroDexed.ino index 77a9a3f..80b52d6 100644 --- a/MicroDexed.ino +++ b/MicroDexed.ino @@ -2347,6 +2347,20 @@ uint8_t drum_get_slot(uint8_t dt) { } #endif +#if NUM_DRUMSET_CONFIG > 0 +uint8_t get_drums_id_by_note(uint8_t note) { + uint8_t ret = NUM_DRUMSET_CONFIG - 1; + + for (uint8_t i = 0; i < NUM_DRUMSET_CONFIG - 1; i++) { + if (configuration.drums.midinote[i] == note) { + ret = i; + break; + } + } + return (ret); +} +#endif + int8_t handle_midi_learn(int8_t note) { int8_t ret_channel = -1; @@ -2355,9 +2369,22 @@ int8_t handle_midi_learn(int8_t note) { Serial.println(note); #endif - if (LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_drum_midi_note)) { + if (LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_drum_pan)) { + ret_channel = configuration.drums.midi_channel; + active_sample = get_drums_id_by_note(note); + LCDML.OTHER_jumpToFunc(UI_func_drum_pan); + } else if (LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_drum_reverb_send)) { + ret_channel = configuration.drums.midi_channel; + active_sample = get_drums_id_by_note(note); + LCDML.OTHER_jumpToFunc(UI_func_drum_reverb_send); + } else if (LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_drum_midi_note)) { + ret_channel = configuration.drums.midi_channel; + active_sample = get_drums_id_by_note(note); + LCDML.OTHER_jumpToFunc(UI_func_drum_midi_note); + } else if (LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_drum_pitch)) { ret_channel = configuration.drums.midi_channel; - //LCDML.OTHER_jumpToFunc(UI_func_drum_midi_note); + active_sample = get_drums_id_by_note(note); + LCDML.OTHER_jumpToFunc(UI_func_drum_pitch); } else if (LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_epiano_lowest_note)) { if (note > configuration.epiano.highest_note) configuration.epiano.lowest_note = configuration.epiano.highest_note; diff --git a/UI.hpp b/UI.hpp index 1ef157c..195ef66 100644 --- a/UI.hpp +++ b/UI.hpp @@ -340,7 +340,8 @@ void UI_func_epiano_chorus_depth(uint8_t param); void UI_func_epiano_chorus_level(uint8_t param); void UI_func_drum_midi_channel(uint8_t param); void UI_func_drums_main_volume(uint8_t param); -void UI_func_drum_volume(uint8_t param); +void UI_func_drum_vol_min(uint8_t param); +void UI_func_drum_vol_max(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); @@ -4068,6 +4069,7 @@ void UI_func_drums_main_volume(uint8_t param) { void UI_func_drum_pitch(uint8_t param) { static bool display_name; char tmp_val[5]; + char tmp_name[9]; if (LCDML.FUNC_setup()) // ****** SETUP ********* { @@ -4107,18 +4109,17 @@ void UI_func_drum_pitch(uint8_t param) { } else if (LCDML.BT_checkEnter()) { display_name = !display_name; } - - if (display_name == true) { - display.setCursor(1, 1); - display.print(drum_config[active_sample].name); - } else { - display.setCursor(LCD_cols - 5, 1); - snprintf_P(tmp_val, sizeof(tmp_val), PSTR("%4.1f"), configuration.drums.pitch[active_sample] / 10.0); - display.print(tmp_val); - } - - _check_display_name(display_name, 4); } +#ifdef DEBUG + Serial.printf("Pitch for active_sample=%d [%s]\n", active_sample, drum_config[active_sample].name); +#endif + display.setCursor(1, 1); + display.print(drum_config[active_sample].name); + display.setCursor(LCD_cols - 5, 1); + snprintf_P(tmp_val, sizeof(tmp_val), PSTR("%4.1f"), configuration.drums.pitch[active_sample] / 10.0); + display.print(tmp_val); + + _check_display_name(display_name, 4); } if (LCDML.FUNC_close()) // ****** STABLE END ********* @@ -4128,7 +4129,11 @@ void UI_func_drum_pitch(uint8_t param) { } } -void UI_func_drum_volume(uint8_t param) { +void UI_func_drum_vol_min(uint8_t param) { + ; +} + +void UI_func_drum_vol_max(uint8_t param) { ; } diff --git a/UI_FX_T4.h b/UI_FX_T4.h index 0755ee1..400bee1 100644 --- a/UI_FX_T4.h +++ b/UI_FX_T4.h @@ -89,72 +89,73 @@ LCDML_add(55, LCDML_0_1, 7, "Operator", UI_handle_OP); LCDML_add(56, LCDML_0_1, 8, "Save Voice", UI_func_save_voice); LCDML_add(57, LCDML_0, 2, "Drums", NULL); 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, "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 +LCDML_add(59, LCDML_0_2, 2, "Drum Vol Min", UI_func_drum_vol_min); +LCDML_add(60, LCDML_0_2, 3, "Drum Vol Max", UI_func_drum_vol_max); +LCDML_add(61, LCDML_0_2, 4, "Drum Pan", UI_func_drum_pan); +LCDML_add(62, LCDML_0_2, 5, "Drum Rev.Send", UI_func_drum_reverb_send); +LCDML_add(63, LCDML_0_2, 6, "Drum Pitch", UI_func_drum_pitch); +LCDML_add(64, LCDML_0_2, 7, "Drum MIDI Note", UI_func_drum_midi_note); +LCDML_add(65, LCDML_0_2, 8, "MIDI Channel", UI_func_drum_midi_channel); +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, "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; +LCDML_add(73, LCDML_0_3_3, 4, "Treble", UI_func_epiano_treble); // uint8_t treble; +LCDML_add(74, LCDML_0_3_3, 5, "Stereo", UI_func_epiano_stereo); // uint8_t stereo; +LCDML_add(75, LCDML_0_3_3, 6, "Tune", UI_func_epiano_tune); // uint8_t tune; +LCDML_add(76, LCDML_0_3_3, 7, "Detune", UI_func_epiano_detune); // uint8_t detune; +LCDML_add(77, LCDML_0_3, 4, "Effects", NULL); +LCDML_add(78, LCDML_0_3_4, 1, "Overdrive", UI_func_epiano_overdrive); // uint8_t overdrive; +LCDML_add(79, LCDML_0_3_4, 2, "Tremolo", NULL); +LCDML_add(80, LCDML_0_3_4_2, 1, "Width", UI_func_epiano_pan_tremolo); // uint8_t pan_tremolo; +LCDML_add(81, LCDML_0_3_4_2, 2, "LFO", UI_func_epiano_pan_lfo); // uint8_t pan_lfo; +LCDML_add(82, LCDML_0_3_4, 3, "Chorus", NULL); +LCDML_add(83, LCDML_0_3_4_3, 1, "Frequency", UI_func_epiano_chorus_frequency); +LCDML_add(84, LCDML_0_3_4_3, 2, "Waveform", UI_func_epiano_chorus_waveform); +LCDML_add(85, LCDML_0_3_4_3, 3, "Depth", UI_func_epiano_chorus_depth); +LCDML_add(86, LCDML_0_3_4_3, 4, "Level", UI_func_epiano_chorus_level); +LCDML_add(87, LCDML_0_3_4, 4, "Reverb Send", UI_func_epiano_reverb_send); +LCDML_add(88, LCDML_0_3, 6, "MIDI", NULL); +LCDML_add(89, LCDML_0_3_6, 1, "MIDI Channel", UI_func_epiano_midi_channel); // uint8_t midi_channel; +LCDML_add(90, LCDML_0_3_6, 2, "Lowest Note", UI_func_epiano_lowest_note); // uint8_t lowest_note; +LCDML_add(91, LCDML_0_3_6, 3, "Highest Note", UI_func_epiano_highest_note); // uint8_t highest_note; +LCDML_add(92, LCDML_0_3, 7, "Setup", NULL); +LCDML_add(93, LCDML_0_3_7, 4, "Transpose", UI_func_epiano_transpose); // uint8_t transpose; +LCDML_add(94, LCDML_0_3_7, 1, "Polyphony", UI_func_epiano_polyphony); // uint8_t polyphony; +LCDML_add(95, LCDML_0_3_7, 2, "Vel. Sense", UI_func_epiano_velocity_sense); // uint8_t velocity_sense; +LCDML_add(96, LCDML_0, 4, "Master Effects", NULL); +LCDML_add(97, LCDML_0_4, 1, "Reverb", NULL); +LCDML_add(98, LCDML_0_4_1, 1, "Roomsize", UI_func_reverb_roomsize); +LCDML_add(99, LCDML_0_4_1, 2, "Lowpass", UI_func_reverb_lowpass); +LCDML_add(100, LCDML_0_4_1, 3, "Lodamp", UI_func_reverb_lodamp); +LCDML_add(101, LCDML_0_4_1, 4, "Hidamp", UI_func_reverb_hidamp); +LCDML_add(102, LCDML_0_4_1, 5, "Diffusion", UI_func_reverb_diffusion); +LCDML_add(103, LCDML_0_4_1, 6, "Level", UI_func_reverb_level); +LCDML_add(104, LCDML_0_4_1, 7, "Reverb Send", UI_func_reverb_send); +LCDML_add(105, LCDML_0_4, 2, "EQ", NULL); +LCDML_add(106, LCDML_0_4_2, 1, "Low-Cut", UI_func_eq_1); +LCDML_add(107, LCDML_0_4_2, 2, "110Hz", UI_func_eq_2); +LCDML_add(108, LCDML_0_4_2, 3, "220Hz", UI_func_eq_3); +LCDML_add(109, LCDML_0_4_2, 4, "1000Hz", UI_func_eq_4); +LCDML_add(110, LCDML_0_4_2, 5, "2000Hz", UI_func_eq_5); +LCDML_add(111, LCDML_0_4_2, 6, "7000Hz", UI_func_eq_6); +LCDML_add(112, LCDML_0_4_2, 7, "High-Cut", UI_func_eq_7) +LCDML_add(113, LCDML_0, 5, "Load/Save", NULL); +LCDML_add(114, LCDML_0_5, 1, "Load Perf.", UI_func_load_performance); +LCDML_add(115, LCDML_0_5, 2, "Save Perf.", UI_func_save_performance); +LCDML_add(116, LCDML_0_5, 3, "Name Perf.", UI_func_set_performance_name); +LCDML_add(117, LCDML_0_5, 4, "MIDI", NULL); +LCDML_add(118, LCDML_0_5_4, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank); +LCDML_add(119, LCDML_0_5_4, 2, "MIDI Snd Bank", UI_func_sysex_send_bank); +LCDML_add(120, LCDML_0_5_4, 3, "MIDI Snd Voice", UI_func_sysex_send_voice); +LCDML_add(121, LCDML_0, 6, "System", NULL); +LCDML_add(122, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono); +LCDML_add(123, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); +LCDML_add(124, LCDML_0_6, 3, "Favorites", UI_func_favorites); +LCDML_add(125, LCDML_0_6, 4, "Startup", UI_func_startup); +LCDML_add(126, LCDML_0, 7, "Info", UI_func_information); +LCDML_addAdvanced(127, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); +#define _LCDML_DISP_cnt 127 \ No newline at end of file diff --git a/config.h b/config.h index 2a529cd..365e82c 100644 --- a/config.h +++ b/config.h @@ -56,7 +56,7 @@ // // Information about memory layout, etc.: https://www.pjrc.com/store/teensy41.html -#define VERSION "1.2.4" +#define VERSION "1.2.5" //************************************************************************************************* //* DEVICE SETTINGS