diff --git a/UI_FX.h b/UI_FX.h index 889b388..e2e5383 100644 --- a/UI_FX.h +++ b/UI_FX.h @@ -119,28 +119,29 @@ LCDML_add(84, LCDML_0_4, 1, "Drums Main Vol", UI_func_drum_main_volume); LCDML_add(85, LCDML_0_4, 2, "Drum Volumes", UI_func_drum_volume); LCDML_add(86, LCDML_0_4, 3, "Drum Pan", UI_func_drum_pan); LCDML_add(87, LCDML_0_4, 4, "Drum Rev.Send", UI_func_drum_reverb_send); -LCDML_add(88, LCDML_0, 5, "Sequencer", NULL); -LCDML_add(89, LCDML_0_5, 1, "Sequencer", UI_func_sequencer); -LCDML_add(90, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor); -LCDML_add(91, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain); -LCDML_add(92, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio); -LCDML_add(93, LCDML_0_5, 5, "Seq. Settings", NULL); -LCDML_add(94, LCDML_0_5_5, 1, "Tempo", UI_func_seq_tempo); -LCDML_add(95, LCDML_0_5_5, 2, "Seq. Length", UI_func_seq_lenght); -LCDML_add(96, LCDML_0_5_5, 3, "Track Setup", UI_func_seq_track_setup); -LCDML_add(97, LCDML_0_5_5, 4, "Seq.Disp.Style", UI_func_seq_display_style); -LCDML_add(98, LCDML_0_5_5, 5, "dexed assign", UI_func_dexed_assign); -LCDML_add(99, LCDML_0_5_5, 6, "shift&transp.", UI_func_arp_shift); -LCDML_add(100, LCDML_0_5_5, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount); -LCDML_add(101, LCDML_0_5_5, 6, "L.Transp.Key", UI_func_seq_live_transpose_oct); -LCDML_add(102, LCDML_0_5, 6, "LOAD Seq.Data", UI_func_seq_state_load); -LCDML_add(103, LCDML_0_5, 7, "SAVE Seq.Data", UI_func_seq_state_save); -LCDML_add(104, LCDML_0, 6, "System", NULL); -LCDML_add(105, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono); -LCDML_add(106, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); -LCDML_add(107, LCDML_0_6, 3, "Favorites", UI_func_favorites); -LCDML_add(108, LCDML_0_6, 4, "EEPROM Reset", UI_func_eeprom_reset); -LCDML_add(109, LCDML_0, 7, "Info", UI_func_information); -LCDML_addAdvanced(110, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); -#define _LCDML_DISP_cnt 110 +LCDML_add(88, LCDML_0_4, 5, "MIDI Channel", UI_func_drum_midi_channel); +LCDML_add(89, LCDML_0, 5, "Sequencer", NULL); +LCDML_add(90, LCDML_0_5, 1, "Sequencer", UI_func_sequencer); +LCDML_add(91, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor); +LCDML_add(92, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain); +LCDML_add(93, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio); +LCDML_add(94, LCDML_0_5, 5, "Seq. Settings", NULL); +LCDML_add(95, LCDML_0_5_5, 1, "Tempo", UI_func_seq_tempo); +LCDML_add(96, LCDML_0_5_5, 2, "Seq. Length", UI_func_seq_lenght); +LCDML_add(97, LCDML_0_5_5, 3, "Track Setup", UI_func_seq_track_setup); +LCDML_add(98, LCDML_0_5_5, 4, "Seq.Disp.Style", UI_func_seq_display_style); +LCDML_add(99, LCDML_0_5_5, 5, "dexed assign", UI_func_dexed_assign); +LCDML_add(100, LCDML_0_5_5, 6, "shift&transp.", UI_func_arp_shift); +LCDML_add(101, LCDML_0_5_5, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount); +LCDML_add(102, LCDML_0_5_5, 6, "L.Transp.Key", UI_func_seq_live_transpose_oct); +LCDML_add(103, LCDML_0_5, 6, "LOAD Seq.Data", UI_func_seq_state_load); +LCDML_add(104, LCDML_0_5, 7, "SAVE Seq.Data", UI_func_seq_state_save); +LCDML_add(105, LCDML_0, 6, "System", NULL); +LCDML_add(106, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono); +LCDML_add(107, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); +LCDML_add(108, LCDML_0_6, 3, "Favorites", UI_func_favorites); +LCDML_add(109, LCDML_0_6, 4, "EEPROM Reset", UI_func_eeprom_reset); +LCDML_add(110, LCDML_0, 7, "Info", UI_func_information); +LCDML_addAdvanced(111, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); +#define _LCDML_DISP_cnt 111 #endif diff --git a/UI_FX_T4.h b/UI_FX_T4.h index 4f6d9ef..7c407b3 100644 --- a/UI_FX_T4.h +++ b/UI_FX_T4.h @@ -122,28 +122,29 @@ LCDML_add(88, LCDML_0_4, 1, "Drums Main Vol", UI_func_drums_main_volume); LCDML_add(89, LCDML_0_4, 2, "Drum Volumes", UI_func_drum_volume); LCDML_add(90, LCDML_0_4, 3, "Drum Pan", UI_func_drum_pan); LCDML_add(91, LCDML_0_4, 4, "Drum Rev.Send", UI_func_drum_reverb_send); -LCDML_add(92, LCDML_0, 5, "Sequencer", NULL); -LCDML_add(93, LCDML_0_5, 1, "Sequencer", UI_func_sequencer); -LCDML_add(94, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor); -LCDML_add(95, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain); -LCDML_add(96, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio); -LCDML_add(97, LCDML_0_5, 5, "Seq. Settings", NULL); -LCDML_add(98, LCDML_0_5_5, 1, "Tempo", UI_func_seq_tempo); -LCDML_add(99, LCDML_0_5_5, 2, "Seq. Length", UI_func_seq_lenght); -LCDML_add(100, LCDML_0_5_5, 3, "Track Setup", UI_func_seq_track_setup); -LCDML_add(101, LCDML_0_5_5, 4, "Seq.Disp.Style", UI_func_seq_display_style); -LCDML_add(102, LCDML_0_5_5, 5, "dexed assign", UI_func_dexed_assign); -LCDML_add(103, LCDML_0_5_5, 6, "shift&transp.", UI_func_arp_shift); -LCDML_add(104, LCDML_0_5_5, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct); -LCDML_add(105, LCDML_0_5_5, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount); -LCDML_add(106, LCDML_0_5, 6, "LOAD Seq.Data", UI_func_seq_state_load); -LCDML_add(107, LCDML_0_5, 7, "SAVE Seq.Data", UI_func_seq_state_save); -LCDML_add(108, LCDML_0, 6, "System", NULL); -LCDML_add(109, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono); -LCDML_add(110, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); -LCDML_add(111, LCDML_0_6, 3, "Favorites", UI_func_favorites); -LCDML_add(112, LCDML_0_6, 4, "EEPROM Reset", UI_func_eeprom_reset); -LCDML_add(113, LCDML_0, 7, "Info", UI_func_information); -LCDML_addAdvanced(114, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); -#define _LCDML_DISP_cnt 114 +LCDML_add(92, LCDML_0_4, 5, "MIDI Channel", UI_func_drum_midi_channel); +LCDML_add(93, LCDML_0, 5, "Sequencer", NULL); +LCDML_add(94, LCDML_0_5, 1, "Sequencer", UI_func_sequencer); +LCDML_add(95, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor); +LCDML_add(96, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain); +LCDML_add(97, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio); +LCDML_add(98, LCDML_0_5, 5, "Seq. Settings", NULL); +LCDML_add(99, LCDML_0_5_5, 1, "Tempo", UI_func_seq_tempo); +LCDML_add(100, LCDML_0_5_5, 2, "Seq. Length", UI_func_seq_lenght); +LCDML_add(101, LCDML_0_5_5, 3, "Track Setup", UI_func_seq_track_setup); +LCDML_add(102, LCDML_0_5_5, 4, "Seq.Disp.Style", UI_func_seq_display_style); +LCDML_add(103, LCDML_0_5_5, 5, "dexed assign", UI_func_dexed_assign); +LCDML_add(104, LCDML_0_5_5, 6, "shift&transp.", UI_func_arp_shift); +LCDML_add(105, LCDML_0_5_5, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct); +LCDML_add(106, LCDML_0_5_5, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount); +LCDML_add(107, LCDML_0_5, 6, "LOAD Seq.Data", UI_func_seq_state_load); +LCDML_add(108, LCDML_0_5, 7, "SAVE Seq.Data", UI_func_seq_state_save); +LCDML_add(109, LCDML_0, 6, "System", NULL); +LCDML_add(110, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono); +LCDML_add(111, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); +LCDML_add(112, LCDML_0_6, 3, "Favorites", UI_func_favorites); +LCDML_add(113, LCDML_0_6, 4, "EEPROM Reset", UI_func_eeprom_reset); +LCDML_add(114, LCDML_0, 7, "Info", UI_func_information); +LCDML_addAdvanced(115, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); +#define _LCDML_DISP_cnt 115 #endif diff --git a/UI_NO_FX.h b/UI_NO_FX.h index cc75e6c..fa20f11 100644 --- a/UI_NO_FX.h +++ b/UI_NO_FX.h @@ -90,28 +90,29 @@ LCDML_add(56, LCDML_0_4, 1, "Drums Main Vol", UI_func_drums_main_volume); 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, "Drum Rev.Send", UI_func_drum_reverb_send); -LCDML_add(60, LCDML_0, 5, "Sequencer", NULL); -LCDML_add(61, LCDML_0_5, 1, "Sequencer", UI_func_sequencer); -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, "L.Transp.Key", UI_func_seq_live_transpose_oct); -LCDML_add(72, LCDML_0_5_5, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount); -LCDML_add(73, LCDML_0_5, 6, "LOAD Seq.Data", UI_func_seq_state_load); -LCDML_add(74, LCDML_0_5, 7, "SAVE Seq.Data", UI_func_seq_state_save); -LCDML_add(75, LCDML_0, 5, "System", NULL); -LCDML_add(76, LCDML_0_5, 1, "Stereo/Mono", UI_func_stereo_mono); -LCDML_add(77, LCDML_0_5, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); -LCDML_add(78, LCDML_0_5, 3, "Favorites", UI_func_favorites); -LCDML_add(79, LCDML_0_5, 4, "EEPROM Reset", UI_func_eeprom_reset); -LCDML_add(80, LCDML_0, 6, "Info", UI_func_information); -LCDML_addAdvanced(81, LCDML_0, 5, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); -#define _LCDML_DISP_cnt 81 +LCDML_add(60, LCDML_0_4, 5, "MIDI Channel", UI_func_drum_midi_channel); +LCDML_add(61, LCDML_0, 5, "Sequencer", NULL); +LCDML_add(62, LCDML_0_5, 1, "Sequencer", UI_func_sequencer); +LCDML_add(63, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor); +LCDML_add(64, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain); +LCDML_add(65, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio); +LCDML_add(66, LCDML_0_5, 5, "Seq. Settings", NULL); +LCDML_add(67, LCDML_0_5_5, 1, "Tempo", UI_func_seq_tempo); +LCDML_add(68, LCDML_0_5_5, 2, "Seq. Length", UI_func_seq_lenght); +LCDML_add(69, LCDML_0_5_5, 3, "Track Setup", UI_func_seq_track_setup); +LCDML_add(70, LCDML_0_5_5, 4, "Seq.Disp.Style", UI_func_seq_display_style); +LCDML_add(71, LCDML_0_5_5, 5, "dexed assign", UI_func_dexed_assign); +LCDML_add(72, LCDML_0_5_5, 6, "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, 5, "System", NULL); +LCDML_add(77, LCDML_0_5, 1, "Stereo/Mono", UI_func_stereo_mono); +LCDML_add(78, LCDML_0_5, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); +LCDML_add(79, LCDML_0_5, 3, "Favorites", UI_func_favorites); +LCDML_add(80, LCDML_0_5, 4, "EEPROM Reset", UI_func_eeprom_reset); +LCDML_add(81, LCDML_0, 6, "Info", UI_func_information); +LCDML_addAdvanced(82, LCDML_0, 5, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); +#define _LCDML_DISP_cnt 82 #endif diff --git a/config.h b/config.h index 48309ed..c78af9d 100644 --- a/config.h +++ b/config.h @@ -111,8 +111,6 @@ // NUMBER OF PARALLEL SAMPLEDRUMS #define NUM_DRUMS 8 -// DEFULT MIDI CHANNEL FOR SAMPLEDRUMS -#define DRUM_MIDI_CHANNEL 1 // CHORUS parameters #define MOD_DELAY_SAMPLE_BUFFER int32_t(TIME_MS2SAMPLES(20.0)) // 20.0 ms delay buffer. diff --git a/drums.h b/drums.h index cdeaa49..f5a893a 100644 --- a/drums.h +++ b/drums.h @@ -46,6 +46,9 @@ typedef struct drum_config_s { enum {DRUM_NONE, DRUM_BASS, DRUM_SNARE, DRUM_HIHAT, DRUM_HANDCLAP, DRUM_RIDE, DRUM_CHRASH, DRUM_LOWTOM, DRUM_MIDTOM, DRUM_HIGHTOM, DRUM_PERCUSSION}; +// DEFAULT MIDI CHANNEL FOR SAMPLEDRUMS +uint8_t drum_midi_channel=10; + #define NUM_DRUMSET_CONFIG 20 drum_config_t drum_config[NUM_DRUMSET_CONFIG] = {