From 3215fda90b46c1c8eab4e55d276b2b0fdda0679d Mon Sep 17 00:00:00 2001 From: positionhigh Date: Sat, 11 Sep 2021 19:39:35 +0200 Subject: [PATCH] =?UTF-8?q?Dateien=20hochladen=20nach=20=E2=80=9E=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- UI_NO_FX.h | 41 +++++++++++++++++++++-------------------- config.h | 6 ++++-- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/UI_NO_FX.h b/UI_NO_FX.h index 3773492..e73c663 100644 --- a/UI_NO_FX.h +++ b/UI_NO_FX.h @@ -91,27 +91,28 @@ LCDML_add(57, LCDML_0_4, 2, "Drum Volumes", UI_func_drum_volume); LCDML_add(58, LCDML_0_4, 3, "Drum Pan", UI_func_drum_pan); LCDML_add(59, LCDML_0_4, 4, "MIDI Channel", UI_func_drum_midi_channel); LCDML_add(60, LCDML_0, 5, "Sequencer", NULL); -LCDML_add(61, LCDML_0_5, 1, "Sequencer", UI_func_sequencer); +LCDML_add(61, LCDML_0_5, 1, "Pattern Editor", UI_func_seq_pattern_editor); LCDML_add(62, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor); LCDML_add(63, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain); LCDML_add(64, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio); -LCDML_add(65, LCDML_0_5, 5, "Seq. Settings", NULL); -LCDML_add(66, LCDML_0_5_5, 1, "Tempo", UI_func_seq_tempo); -LCDML_add(67, LCDML_0_5_5, 2, "Seq. Length", UI_func_seq_lenght); -LCDML_add(68, LCDML_0_5_5, 3, "Track Setup", UI_func_seq_track_setup); -LCDML_add(69, LCDML_0_5_5, 4, "Seq.Disp.Style", UI_func_seq_display_style); -LCDML_add(70, LCDML_0_5_5, 5, "dexed assign", UI_func_dexed_assign); -LCDML_add(71, LCDML_0_5_5, 6, "shift&transp.", UI_func_arp_shift); -LCDML_add(72, LCDML_0_5_5, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct); -LCDML_add(73, LCDML_0_5_5, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount); -LCDML_add(74, LCDML_0_5, 6, "LOAD Seq.Data", UI_func_seq_state_load); -LCDML_add(75, LCDML_0_5, 7, "SAVE Seq.Data", UI_func_seq_state_save); -LCDML_add(76, LCDML_0, 6, "System", NULL); -LCDML_add(77, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono); -LCDML_add(78, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); -LCDML_add(79, LCDML_0_6, 3, "Favorites", UI_func_favorites); -LCDML_add(80, LCDML_0_6, 4, "EEPROM Reset", UI_func_eeprom_reset); -LCDML_add(81, LCDML_0, 7, "Info", UI_func_information); -LCDML_addAdvanced(82, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); -#define _LCDML_DISP_cnt 82 +LCDML_add(65, LCDML_0_5, 5, "Mute Matrix", UI_func_seq_mute_matrix); +LCDML_add(66, LCDML_0_5, 6, "Seq. Settings", NULL); +LCDML_add(67, LCDML_0_5_6, 1, "Tempo", UI_func_seq_tempo); +LCDML_add(68, LCDML_0_5_6, 2, "Seq. Length", UI_func_seq_lenght); +LCDML_add(69, LCDML_0_5_6, 3, "Track Setup", UI_func_seq_track_setup); +LCDML_add(70, LCDML_0_5_6, 4, "Seq.Disp.Style", UI_func_seq_display_style); +LCDML_add(71, LCDML_0_5_6, 5, "dexed assign", UI_func_dexed_assign); +LCDML_add(72, LCDML_0_5_6, 6, "shift&transp.", UI_func_arp_shift); +LCDML_add(73, LCDML_0_5_6, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct); +LCDML_add(74, LCDML_0_5_6, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount); +LCDML_add(75, LCDML_0_5, 7, "LOAD Seq.Data", UI_func_seq_state_load); +LCDML_add(76, LCDML_0_5, 8, "SAVE Seq.Data", UI_func_seq_state_save); +LCDML_add(77, LCDML_0, 6, "System", NULL); +LCDML_add(78, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono); +LCDML_add(79, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); +LCDML_add(80, LCDML_0_6, 3, "Favorites", UI_func_favorites); +LCDML_add(81, LCDML_0_6, 4, "EEPROM Reset", UI_func_eeprom_reset); +LCDML_add(82, LCDML_0, 7, "Info", UI_func_information); +LCDML_addAdvanced(83, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); +#define _LCDML_DISP_cnt 83 #endif diff --git a/config.h b/config.h index 519f2a2..3a78e7c 100644 --- a/config.h +++ b/config.h @@ -119,10 +119,12 @@ #define DRUM_MIDI_CHANNEL 10 // NUMBER OF SAMPLES IN DRUMSET -#ifdef TEENSY4 +#if defined(ARDUINO_TEENSY41) #define NUM_DRUMSET_CONFIG 71 +#elif defined(TEENSY4) +#define NUM_DRUMSET_CONFIG 47 #else -#define NUM_DRUMSET_CONFIG 43 +#define NUM_DRUMSET_CONFIG 22 #endif // SEQUENCER