diff --git a/MicroDexed.ino b/MicroDexed.ino index 4c851ad..f7be7a4 100644 --- a/MicroDexed.ino +++ b/MicroDexed.ino @@ -643,6 +643,7 @@ void setup() Serial.println(F("")); #endif + strcpy(seq_name, "INIT Perf"); LCDML.OTHER_jumpToFunc(UI_func_voice_select); timer1.begin(sequencer, seq_tempo_ms / 2, false); } diff --git a/UI.hpp b/UI.hpp index ecd2b41..572d048 100644 --- a/UI.hpp +++ b/UI.hpp @@ -313,7 +313,7 @@ void UI_func_seq_mute_matrix(uint8_t param); void UI_func_seq_track_setup(uint8_t param); void UI_func_dexed_assign(uint8_t param); void UI_func_seq_display_style(uint8_t param); -void UI_func_set_sequence_name(uint8_t param); +void UI_func_set_performance_name(uint8_t param); void UI_func_volume(uint8_t param); void UI_func_smart_filter(uint8_t param); void UI_func_drum_midi_channel(uint8_t param); @@ -6273,7 +6273,7 @@ void UI_func_dexed_assign(uint8_t param) seq_temp_active_menu = 99; seq_temp_select_menu = 0; lcd.setCursor(0 , 0); - lcd.print("dexed assign"); + lcd.print("Dexed Assign"); lcd.setCursor(0 , 1); lcd.print("Track "); } @@ -7616,7 +7616,7 @@ void UI_func_sysex_receive_bank(uint8_t param) } } -void UI_func_set_sequence_name(uint8_t param) +void UI_func_set_performance_name(uint8_t param) { static uint8_t mode; static uint8_t ui_select_name_state; @@ -7625,7 +7625,7 @@ void UI_func_set_sequence_name(uint8_t param) encoderDir[ENC_R].reset(); mode = 0; lcd.setCursor(0, 0); - lcd.print(F("Sequence Name")); + lcd.print(F("Perf. Name")); } if (LCDML.FUNC_loop()) // ****** LOOP ********* { diff --git a/UI_FX.h b/UI_FX.h index 1d0a503..99eaaf7 100644 --- a/UI_FX.h +++ b/UI_FX.h @@ -103,36 +103,37 @@ LCDML_add(69, LCDML_0_1, 8, "Save Voice", UI_func_save_voice); LCDML_add(70, LCDML_0, 3, "Load/Save", NULL); LCDML_add(71, LCDML_0_3, 1, "Load Perf.", UI_func_load_performance); LCDML_add(72, LCDML_0_3, 2, "Save Perf.", UI_func_save_performance); -LCDML_add(73, LCDML_0_3, 3, "MIDI", NULL); -LCDML_add(74, LCDML_0_3_3, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank); -LCDML_add(75, LCDML_0_3_3, 2, "MIDI Snd Bank", UI_func_sysex_send_bank); -LCDML_add(76, LCDML_0_3_3, 3, "MIDI Snd Voice", UI_func_sysex_send_voice); -LCDML_add(77, LCDML_0, 4, "Drums", NULL); -LCDML_add(78, LCDML_0_4, 1, "Drums Main Vol", UI_func_drums_main_volume); -LCDML_add(79, LCDML_0_4, 2, "Drum Volumes", UI_func_drum_volume); -LCDML_add(80, LCDML_0_4, 3, "Drum Pan", UI_func_drum_pan); -LCDML_add(81, LCDML_0_4, 4, "Drum Rev.Send", UI_func_drum_reverb_send); -LCDML_add(82, LCDML_0_4, 5, "MIDI Channel", UI_func_drum_midi_channel); -LCDML_add(83, LCDML_0, 5, "Sequencer", NULL); -LCDML_add(84, LCDML_0_5, 1, "Pattern Editor", UI_func_seq_pattern_editor); -LCDML_add(85, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor); -LCDML_add(86, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain); -LCDML_add(87, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio); -LCDML_add(88, LCDML_0_5, 5, "Seq. Settings", NULL); -LCDML_add(89, LCDML_0_5_5, 1, "Tempo", UI_func_seq_tempo); -LCDML_add(90, LCDML_0_5_5, 2, "Seq. Length", UI_func_seq_lenght); -LCDML_add(91, LCDML_0_5_5, 3, "Track Setup", UI_func_seq_track_setup); -LCDML_add(92, LCDML_0_5_5, 4, "Seq.Disp.Style", UI_func_seq_display_style); -LCDML_add(93, LCDML_0_5_5, 5, "dexed assign", UI_func_dexed_assign); -LCDML_add(94, LCDML_0_5_5, 6, "shift&transp.", UI_func_arp_shift); -LCDML_add(95, LCDML_0_5_5, 7, "ChordTrack Keys", UI_func_seq_chord_keys_ammount); -LCDML_add(96, LCDML_0_5_5, 8, "L.Transp.Key", UI_func_seq_live_transpose_oct); -LCDML_add(97, LCDML_0, 6, "System", NULL); -LCDML_add(98, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono); -LCDML_add(99, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); -LCDML_add(100, LCDML_0_6, 3, "Favorites", UI_func_favorites); -LCDML_add(101, LCDML_0_6, 4, "EEPROM Reset", UI_func_eeprom_reset); -LCDML_add(102, LCDML_0, 7, "Info", UI_func_information); -LCDML_addAdvanced(103, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); -#define _LCDML_DISP_cnt 103 +LCDML_add(73, LCDML_0_2, 3, "Name Perf.", UI_func_set_performance_name); +LCDML_add(74, LCDML_0_3, 4, "MIDI", NULL); +LCDML_add(75, LCDML_0_3_4, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank); +LCDML_add(76, LCDML_0_3_4, 2, "MIDI Snd Bank", UI_func_sysex_send_bank); +LCDML_add(77, LCDML_0_3_4, 3, "MIDI Snd Voice", UI_func_sysex_send_voice); +LCDML_add(78, LCDML_0, 4, "Drums", NULL); +LCDML_add(79, LCDML_0_4, 1, "Drums Main Vol", UI_func_drums_main_volume); +LCDML_add(80, LCDML_0_4, 2, "Drum Volumes", UI_func_drum_volume); +LCDML_add(81, LCDML_0_4, 3, "Drum Pan", UI_func_drum_pan); +LCDML_add(82, LCDML_0_4, 4, "Drum Rev.Send", UI_func_drum_reverb_send); +LCDML_add(83, LCDML_0_4, 5, "MIDI Channel", UI_func_drum_midi_channel); +LCDML_add(84, LCDML_0, 5, "Sequencer", NULL); +LCDML_add(85, LCDML_0_5, 1, "Pattern Editor", UI_func_seq_pattern_editor); +LCDML_add(86, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor); +LCDML_add(87, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain); +LCDML_add(88, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio); +LCDML_add(89, LCDML_0_5, 5, "Seq. Settings", NULL); +LCDML_add(90, LCDML_0_5_5, 1, "Tempo", UI_func_seq_tempo); +LCDML_add(91, LCDML_0_5_5, 2, "Seq. Length", UI_func_seq_lenght); +LCDML_add(92, LCDML_0_5_5, 3, "Track Setup", UI_func_seq_track_setup); +LCDML_add(93, LCDML_0_5_5, 4, "Seq.Disp.Style", UI_func_seq_display_style); +LCDML_add(94, LCDML_0_5_5, 5, "Dexed Assign", UI_func_dexed_assign); +LCDML_add(95, LCDML_0_5_5, 6, "Shift&Transp.", UI_func_arp_shift); +LCDML_add(96, LCDML_0_5_5, 7, "ChordTrack Keys", UI_func_seq_chord_keys_ammount); +LCDML_add(97, LCDML_0_5_5, 8, "L.Transp.Key", UI_func_seq_live_transpose_oct); +LCDML_add(98, LCDML_0, 6, "System", NULL); +LCDML_add(99, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono); +LCDML_add(100, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); +LCDML_add(101, LCDML_0_6, 3, "Favorites", UI_func_favorites); +LCDML_add(102, LCDML_0_6, 4, "EEPROM Reset", UI_func_eeprom_reset); +LCDML_add(103, LCDML_0, 7, "Info", UI_func_information); +LCDML_addAdvanced(104, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); +#define _LCDML_DISP_cnt 104 #endif diff --git a/UI_FX_T4.h b/UI_FX_T4.h index f013ba9..59785ed 100644 --- a/UI_FX_T4.h +++ b/UI_FX_T4.h @@ -106,36 +106,36 @@ LCDML_add(72, LCDML_0_1, 8, "Save Voice", UI_func_save_voice); LCDML_add(73, LCDML_0, 2, "Load/Save", NULL); LCDML_add(74, LCDML_0_2, 1, "Load Perf.", UI_func_load_performance); LCDML_add(75, LCDML_0_2, 2, "Save Perf.", UI_func_save_performance); -LCDML_add(76, LCDML_0_2, 3, "MIDI", NULL); -LCDML_add(77, LCDML_0_2_3, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank); -LCDML_add(78, LCDML_0_2_3, 2, "MIDI Snd Bank", UI_func_sysex_send_bank); -LCDML_add(79, LCDML_0_2_3, 3, "MIDI Snd Voice", UI_func_sysex_send_voice); -LCDML_add(80, LCDML_0, 3, "Drums", NULL); -LCDML_add(81, LCDML_0_3, 1, "Drums Main Vol", UI_func_drums_main_volume); -LCDML_add(82, LCDML_0_3, 2, "Drum Volumes", UI_func_drum_volume); -LCDML_add(83, LCDML_0_3, 3, "Drum Pan", UI_func_drum_pan); -LCDML_add(84, LCDML_0_3, 4, "Drum Rev.Send", UI_func_drum_reverb_send); -LCDML_add(85, LCDML_0_3, 5, "Drum Pitch", UI_func_drum_pitch); -LCDML_add(86, LCDML_0_3, 6, "Drum Tune", UI_func_drum_tune_offset); -LCDML_add(87, LCDML_0_3, 7, "MIDI Channel", UI_func_drum_midi_channel); -LCDML_add(88, LCDML_0_3, 8, "Smart Filter", UI_func_smart_filter); -LCDML_add(89, LCDML_0, 4, "Sequencer", NULL); -LCDML_add(90, LCDML_0_4, 1, "Pattern Editor", UI_func_seq_pattern_editor); -LCDML_add(91, LCDML_0_4, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor); -LCDML_add(92, LCDML_0_4, 3, "Pattern Chain", UI_func_seq_pat_chain); -LCDML_add(93, LCDML_0_4, 4, "Arpeggio", UI_func_arpeggio); -LCDML_add(94, LCDML_0_4, 5, "Mute Matrix", UI_func_seq_mute_matrix); -LCDML_add(95, LCDML_0_4, 6, "Seq. Settings", NULL); -LCDML_add(96, LCDML_0_4_6, 1, "Tempo", UI_func_seq_tempo); -LCDML_add(97, LCDML_0_4_6, 2, "Seq. Length", UI_func_seq_lenght); -LCDML_add(98, LCDML_0_4_6, 3, "Track Setup", UI_func_seq_track_setup); -LCDML_add(99, LCDML_0_4_6, 4, "Seq.Disp.Style", UI_func_seq_display_style); -LCDML_add(100, LCDML_0_4_6, 5, "dexed assign", UI_func_dexed_assign); -LCDML_add(101, LCDML_0_4_6, 6, "shift&transp.", UI_func_arp_shift); -LCDML_add(102, LCDML_0_4_6, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct); -LCDML_add(103, LCDML_0_4_6, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount); -LCDML_add(104, LCDML_0_4_6, 9, "Smart Filter", UI_func_smart_filter); -LCDML_add(105, LCDML_0_4_6, 10, "Name Sequence", UI_func_set_sequence_name); +LCDML_add(76, LCDML_0_2, 3, "Name Perf.", UI_func_set_performance_name); +LCDML_add(77, LCDML_0_2, 4, "MIDI", NULL); +LCDML_add(78, LCDML_0_2_4, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank); +LCDML_add(79, LCDML_0_2_4, 2, "MIDI Snd Bank", UI_func_sysex_send_bank); +LCDML_add(80, LCDML_0_2_4, 3, "MIDI Snd Voice", UI_func_sysex_send_voice); +LCDML_add(81, LCDML_0, 3, "Drums", NULL); +LCDML_add(82, LCDML_0_3, 1, "Drums Main Vol", UI_func_drums_main_volume); +LCDML_add(83, LCDML_0_3, 2, "Drum Volumes", UI_func_drum_volume); +LCDML_add(84, LCDML_0_3, 3, "Drum Pan", UI_func_drum_pan); +LCDML_add(85, LCDML_0_3, 4, "Drum Rev.Send", UI_func_drum_reverb_send); +LCDML_add(86, LCDML_0_3, 5, "Drum Pitch", UI_func_drum_pitch); +LCDML_add(87, LCDML_0_3, 6, "Drum Tune", UI_func_drum_tune_offset); +LCDML_add(88, LCDML_0_3, 7, "MIDI Channel", UI_func_drum_midi_channel); +LCDML_add(89, LCDML_0_3, 8, "Smart Filter", UI_func_smart_filter); +LCDML_add(90, LCDML_0, 4, "Sequencer", NULL); +LCDML_add(91, LCDML_0_4, 1, "Pattern Editor", UI_func_seq_pattern_editor); +LCDML_add(92, LCDML_0_4, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor); +LCDML_add(93, LCDML_0_4, 3, "Pattern Chain", UI_func_seq_pat_chain); +LCDML_add(94, LCDML_0_4, 4, "Arpeggio", UI_func_arpeggio); +LCDML_add(95, LCDML_0_4, 5, "Mute Matrix", UI_func_seq_mute_matrix); +LCDML_add(96, LCDML_0_4, 6, "Seq. Settings", NULL); +LCDML_add(97, LCDML_0_4_6, 1, "Tempo", UI_func_seq_tempo); +LCDML_add(98, LCDML_0_4_6, 2, "Seq. Length", UI_func_seq_lenght); +LCDML_add(99, LCDML_0_4_6, 3, "Track Setup", UI_func_seq_track_setup); +LCDML_add(100, LCDML_0_4_6, 4, "Seq.Disp.Style", UI_func_seq_display_style); +LCDML_add(101, LCDML_0_4_6, 5, "Dexed Assign", UI_func_dexed_assign); +LCDML_add(102, LCDML_0_4_6, 6, "Shift&Transp.", UI_func_arp_shift); +LCDML_add(103, LCDML_0_4_6, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct); +LCDML_add(104, LCDML_0_4_6, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount); +LCDML_add(105, LCDML_0_4_6, 9, "Smart Filter", UI_func_smart_filter); LCDML_add(106, LCDML_0, 5, "System", NULL); LCDML_add(107, LCDML_0_5, 1, "Stereo/Mono", UI_func_stereo_mono); LCDML_add(108, LCDML_0_5, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); diff --git a/UI_NO_FX.h b/UI_NO_FX.h index 9e8becf..a6b31a3 100644 --- a/UI_NO_FX.h +++ b/UI_NO_FX.h @@ -77,36 +77,37 @@ LCDML_add(43, LCDML_0_1, 8, "Save Voice", UI_func_save_voice); LCDML_add(44, LCDML_0, 2, "Load/Save", NULL); LCDML_add(45, LCDML_0_2, 1, "Load Perf.", UI_func_load_performance); LCDML_add(46, LCDML_0_2, 2, "Save Perf.", UI_func_save_performance); -LCDML_add(47, LCDML_0_2, 3, "MIDI", NULL); -LCDML_add(48, LCDML_0_2_3, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank); -LCDML_add(49, LCDML_0_2_3, 2, "MIDI Snd Bank", UI_func_sysex_send_bank); -LCDML_add(50, LCDML_0_2_3, 3, "MIDI Snd Voice", UI_func_sysex_send_voice); -LCDML_add(51, LCDML_0, 3, "Drums", NULL); -LCDML_add(52, LCDML_0_3, 1, "Drums Main Vol", UI_func_drums_main_volume); -LCDML_add(53, LCDML_0_3, 2, "Drum Volumes", UI_func_drum_volume); -LCDML_add(54, LCDML_0_3, 3, "Drum Pan", UI_func_drum_pan); -LCDML_add(55, LCDML_0_3, 4, "MIDI Channel", UI_func_drum_midi_channel); -LCDML_add(56, LCDML_0, 4, "Sequencer", NULL); -LCDML_add(57, LCDML_0_4, 1, "Pattern Editor", UI_func_seq_pattern_editor); -LCDML_add(58, LCDML_0_4, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor); -LCDML_add(59, LCDML_0_4, 3, "Pattern Chain", UI_func_seq_pat_chain); -LCDML_add(60, LCDML_0_4, 4, "Arpeggio", UI_func_arpeggio); -LCDML_add(61, LCDML_0_4, 5, "Mute Matrix", UI_func_seq_mute_matrix); -LCDML_add(62, LCDML_0_4, 6, "Seq. Settings", NULL); -LCDML_add(63, LCDML_0_4_6, 1, "Tempo", UI_func_seq_tempo); -LCDML_add(64, LCDML_0_4_6, 2, "Seq. Length", UI_func_seq_lenght); -LCDML_add(65, LCDML_0_4_6, 3, "Track Setup", UI_func_seq_track_setup); -LCDML_add(66, LCDML_0_4_6, 4, "Seq.Disp.Style", UI_func_seq_display_style); -LCDML_add(67, LCDML_0_4_6, 5, "dexed assign", UI_func_dexed_assign); -LCDML_add(68, LCDML_0_4_6, 6, "shift&transp.", UI_func_arp_shift); -LCDML_add(69, LCDML_0_4_6, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct); -LCDML_add(70, LCDML_0_4_6, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount); -LCDML_add(71, LCDML_0, 5, "System", NULL); -LCDML_add(72, LCDML_0_5, 1, "Stereo/Mono", UI_func_stereo_mono); -LCDML_add(73, LCDML_0_5, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); -LCDML_add(74, LCDML_0_5, 3, "Favorites", UI_func_favorites); -LCDML_add(75, LCDML_0_5, 4, "EEPROM Reset", UI_func_eeprom_reset); -LCDML_add(76, LCDML_0, 6, "Info", UI_func_information); -LCDML_addAdvanced(77, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); -#define _LCDML_DISP_cnt 77 +LCDML_add(47, LCDML_0_2, 3, "Name Perf.", UI_func_set_performance_name); +LCDML_add(48, LCDML_0_2, 4, "MIDI", NULL); +LCDML_add(49, LCDML_0_2_4, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank); +LCDML_add(50, LCDML_0_2_4, 2, "MIDI Snd Bank", UI_func_sysex_send_bank); +LCDML_add(51, LCDML_0_2_4, 3, "MIDI Snd Voice", UI_func_sysex_send_voice); +LCDML_add(52, LCDML_0, 3, "Drums", NULL); +LCDML_add(53, LCDML_0_3, 1, "Drums Main Vol", UI_func_drums_main_volume); +LCDML_add(54, LCDML_0_3, 2, "Drum Volumes", UI_func_drum_volume); +LCDML_add(55, LCDML_0_3, 3, "Drum Pan", UI_func_drum_pan); +LCDML_add(56, LCDML_0_3, 4, "MIDI Channel", UI_func_drum_midi_channel); +LCDML_add(57, LCDML_0, 4, "Sequencer", NULL); +LCDML_add(58, LCDML_0_4, 1, "Pattern Editor", UI_func_seq_pattern_editor); +LCDML_add(59, LCDML_0_4, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor); +LCDML_add(60, LCDML_0_4, 3, "Pattern Chain", UI_func_seq_pat_chain); +LCDML_add(61, LCDML_0_4, 4, "Arpeggio", UI_func_arpeggio); +LCDML_add(62, LCDML_0_4, 5, "Mute Matrix", UI_func_seq_mute_matrix); +LCDML_add(63, LCDML_0_4, 6, "Seq. Settings", NULL); +LCDML_add(64, LCDML_0_4_6, 1, "Tempo", UI_func_seq_tempo); +LCDML_add(65, LCDML_0_4_6, 2, "Seq. Length", UI_func_seq_lenght); +LCDML_add(66, LCDML_0_4_6, 3, "Track Setup", UI_func_seq_track_setup); +LCDML_add(67, LCDML_0_4_6, 4, "Seq.Disp.Style", UI_func_seq_display_style); +LCDML_add(68, LCDML_0_4_6, 5, "Dexed Assign", UI_func_dexed_assign); +LCDML_add(69, LCDML_0_4_6, 6, "Shift&Transp.", UI_func_arp_shift); +LCDML_add(70, LCDML_0_4_6, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct); +LCDML_add(71, LCDML_0_4_6, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount); +LCDML_add(72, LCDML_0, 5, "System", NULL); +LCDML_add(73, LCDML_0_5, 1, "Stereo/Mono", UI_func_stereo_mono); +LCDML_add(74, LCDML_0_5, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); +LCDML_add(75, LCDML_0_5, 3, "Favorites", UI_func_favorites); +LCDML_add(76, LCDML_0_5, 4, "EEPROM Reset", UI_func_eeprom_reset); +LCDML_add(77, LCDML_0, 6, "Info", UI_func_information); +LCDML_addAdvanced(78, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); +#define _LCDML_DISP_cnt 78 #endif diff --git a/config.h b/config.h index b4a2095..f77b5b4 100644 --- a/config.h +++ b/config.h @@ -107,7 +107,7 @@ #endif // FX-CHAIN ENABLE/DISABLE -//#define USE_FX 1 +#define USE_FX 1 // NUMBER OF PARALLEL SAMPLEDRUMS #ifdef TEENSY4