From 60d0e984b1545e67483a9fc737ec02eb9f1acd0e Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Thu, 4 Nov 2021 16:14:34 +0100 Subject: [PATCH] Fixes and menu stubs for EP. --- UI.hpp | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++ UI_FX_T4.h | 72 ++++++++++++++++++++++------------ config.h | 8 ++-- 3 files changed, 165 insertions(+), 28 deletions(-) diff --git a/UI.hpp b/UI.hpp index 36d6697..c37892d 100644 --- a/UI.hpp +++ b/UI.hpp @@ -334,6 +334,25 @@ void UI_func_startup(uint8_t param); void UI_function_not_enabled(void); void UI_function_not_implemented(uint8_t param); void UI_func_favorites(uint8_t param); +void UI_func_epiano_sound_intensity(uint8_t param); +void UI_func_epiano_panorama(uint8_t param); +void UI_func_epiano_decay(uint8_t param); +void UI_func_epiano_release(uint8_t param); +void UI_func_epiano_hardness(uint8_t param); +void UI_func_epiano_treble(uint8_t param); +void UI_func_epiano_stereo(uint8_t param); +void UI_func_epiano_tune(uint8_t param); +void UI_func_epiano_detune(uint8_t param); +void UI_func_epiano_pan_tremolo(uint8_t param); +void UI_func_epiano_pan_lfo(uint8_t param); +void UI_func_epiano_overdrive(uint8_t param); +void UI_func_epiano_midi_channel(uint8_t param); +void UI_func_epiano_lowest_note(uint8_t param); +void UI_func_epiano_highest_note(uint8_t param); +void UI_func_epiano_transpose(uint8_t param); +void UI_func_epiano_polyphony(uint8_t param); +void UI_func_epiano_velocity_sense(uint8_t param); +void UI_func_epiano_monopoly(uint8_t param); void UI_update_instance_icons(); bool UI_select_name(uint8_t y, uint8_t x, char* edit_string, uint8_t len, bool init); uint8_t search_accepted_char(uint8_t c); @@ -2271,6 +2290,100 @@ void UI_func_favorites(uint8_t param) } } +void UI_func_epiano_sound_intensity(uint8_t param) +{ + ; +} + +void UI_func_epiano_panorama(uint8_t param) +{ + ; +} + +void UI_func_epiano_decay(uint8_t param) +{ + ; +} + +void UI_func_epiano_release(uint8_t param) +{ + ; +} + +void UI_func_epiano_hardness(uint8_t param) +{ + ; +} + +void UI_func_epiano_treble(uint8_t param) +{ + ; +} + +void UI_func_epiano_stereo(uint8_t param) +{ + ; +} + +void UI_func_epiano_tune(uint8_t param) +{ + ; +} + +void UI_func_epiano_detune(uint8_t param) +{ + ; +} + +void UI_func_epiano_pan_tremolo(uint8_t param) +{ + ; +} + +void UI_func_epiano_pan_lfo(uint8_t param) +{ + ; +} + +void UI_func_epiano_overdrive(uint8_t param) +{ + ; +} + +void UI_func_epiano_midi_channel(uint8_t param) +{ + ; +} + +void UI_func_epiano_lowest_note(uint8_t param) +{ + ; +} + +void UI_func_epiano_highest_note(uint8_t param) +{ + ; +} + +void UI_func_epiano_transpose(uint8_t param) +{ + ; +} + +void UI_func_epiano_polyphony(uint8_t param) +{ + ; +} + +void UI_func_epiano_velocity_sense(uint8_t param) +{ + ; +} + +void UI_func_epiano_monopoly(uint8_t param) +{ + ; +} void UI_func_stereo_mono(uint8_t param) { diff --git a/UI_FX_T4.h b/UI_FX_T4.h index 4f33fcc..3bdaa44 100644 --- a/UI_FX_T4.h +++ b/UI_FX_T4.h @@ -120,28 +120,52 @@ 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); -LCDML_add(109, LCDML_0_5, 3, "Favorites", UI_func_favorites); -LCDML_add(110, LCDML_0_5, 4, "Startup", UI_func_startup); -LCDML_add(111, LCDML_0, 6, "Info", UI_func_information); -LCDML_addAdvanced(112, LCDML_0, 7, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); -#define _LCDML_DISP_cnt 112 +LCDML_add(90, LCDML_0, 4, "E-Piano", NULL); +LCDML_add(91, LCDML_0_4, 1, "Voice Level", UI_func_epiano_sound_intensity); +LCDML_add(92, LCDML_0_4, 2, "Panorama", UI_func_epiano_panorama); +LCDML_add(93, LCDML_0_4, 3, "Audio", NULL); +LCDML_add(94, LCDML_0_4_3, 1, "Decay", UI_func_epiano_decay); // uint8_t decay; +LCDML_add(95, LCDML_0_4_3, 2, "Release", UI_func_epiano_release); // uint8_t release; +LCDML_add(96, LCDML_0_4_3, 3, "Hardness", UI_func_epiano_hardness); // uint8_t hardness; +LCDML_add(97, LCDML_0_4_3, 4, "Treble", UI_func_epiano_treble); // uint8_t treble; +LCDML_add(98, LCDML_0_4_3, 5, "Stereo", UI_func_epiano_stereo); // uint8_t stereo; +LCDML_add(99, LCDML_0_4_3, 6, "Tune", UI_func_epiano_tune); // uint8_t tune; +LCDML_add(100, LCDML_0_4_3, 7, "Detune", UI_func_epiano_detune); // uint8_t detune; +LCDML_add(101, LCDML_0_4, 4, "Effects", NULL); +LCDML_add(102, LCDML_0_4_4, 1, "Pan Tremolo", UI_func_epiano_pan_tremolo); // uint8_t pan_tremolo; +LCDML_add(103, LCDML_0_4_4, 2, "Pan LFO", UI_func_epiano_pan_lfo); // uint8_t pan_lfo; +LCDML_add(104, LCDML_0_4_4, 3, "Overdrive", UI_func_epiano_overdrive); // uint8_t overdrive; +LCDML_add(105, LCDML_0_4, 5, "MIDI", NULL); +LCDML_add(106, LCDML_0_4_5, 1, "MIDI Channel", UI_func_epiano_midi_channel); // uint8_t midi_channel; +LCDML_add(107, LCDML_0_4_5, 2, "Lowest Note", UI_func_epiano_lowest_note); // uint8_t lowest_note; +LCDML_add(108, LCDML_0_4_5, 3, "Highest Note", UI_func_epiano_highest_note); // uint8_t highest_note; +LCDML_add(109, LCDML_0_4, 6, "Setup", NULL); +LCDML_add(110, LCDML_0_4_6, 4, "Transpose", UI_func_epiano_transpose); // uint8_t transpose; +LCDML_add(111, LCDML_0_4_6, 1, "Polyphony", UI_func_epiano_polyphony); // uint8_t polyphony; +LCDML_add(112, LCDML_0_4_6, 2, "Vel. Sense", UI_func_epiano_velocity_sense); // uint8_t velocity_sense; +LCDML_add(113, LCDML_0_4_6, 3, "Mono/Poly", UI_func_epiano_monopoly); // uint8_t monopoly; +LCDML_add(114, LCDML_0, 5, "Sequencer", NULL); +LCDML_add(115, LCDML_0_5, 1, "Pattern Editor", UI_func_seq_pattern_editor); +LCDML_add(116, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor); +LCDML_add(117, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain); +LCDML_add(118, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio); +LCDML_add(119, LCDML_0_5, 5, "Mute Matrix", UI_func_seq_mute_matrix); +LCDML_add(120, LCDML_0_5, 6, "Seq. Settings", NULL); +LCDML_add(121, LCDML_0_5_6, 1, "Tempo", UI_func_seq_tempo); +LCDML_add(122, LCDML_0_5_6, 2, "Seq. Length", UI_func_seq_lenght); +LCDML_add(123, LCDML_0_5_6, 3, "Track Setup", UI_func_seq_track_setup); +LCDML_add(124, LCDML_0_5_6, 4, "Seq.Disp.Style", UI_func_seq_display_style); +LCDML_add(125, LCDML_0_5_6, 5, "Dexed Assign", UI_func_dexed_assign); +LCDML_add(126, LCDML_0_5_6, 6, "Shift&Transp.", UI_func_arp_shift); +LCDML_add(127, LCDML_0_5_6, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct); +LCDML_add(128, LCDML_0_5_6, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount); +LCDML_add(129, LCDML_0_5_6, 9, "Smart Filter", UI_func_smart_filter); +LCDML_add(130, LCDML_0, 6, "System", NULL); +LCDML_add(131, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono); +LCDML_add(132, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); +LCDML_add(133, LCDML_0_6, 3, "Favorites", UI_func_favorites); +LCDML_add(134, LCDML_0_6, 4, "Startup", UI_func_startup); +LCDML_add(135, LCDML_0, 7, "Info", UI_func_information); +LCDML_addAdvanced(136, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); +#define _LCDML_DISP_cnt 136 #endif diff --git a/config.h b/config.h index 27c0481..d7f5222 100644 --- a/config.h +++ b/config.h @@ -184,15 +184,15 @@ #ifdef USE_FX #if defined(USE_EPIANO) -#define AUDIO_MEM (SAMPLE_RATE * NUM_DEXED * DELAY_MAX_TIME / 128000) + (NUM_DEXED * 15) + 18 +#define AUDIO_MEM SAMPLE_RATE * NUM_DEXED * DELAY_MAX_TIME / 128000 + 36 + 14 #else -#define AUDIO_MEM (SAMPLE_RATE * NUM_DEXED * DELAY_MAX_TIME / 128000) + (NUM_DEXED * 15) + 6 +#define AUDIO_MEM SAMPLE_RATE * NUM_DEXED * DELAY_MAX_TIME / 128000 + 36 #endif #else #if defined(USE_EPIANO) -#define AUDIO_MEM (NUM_DEXED * 15) + 2 +#define AUDIO_MEM NUM_DEXED * 15 + 14 #else -#define AUDIO_MEM (NUM_DEXED * 15) +#define AUDIO_MEM NUM_DEXED * 15 #endif #endif