From 5fd014f017f5885c9cf56b2a820f2c404bb46868 Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Mon, 12 Jul 2021 15:37:11 +0200 Subject: [PATCH] Fixes for menu structure. --- UI_FX.h | 50 ++++++++++++++++++++++++-------------------------- UI_FX_T4.h | 50 ++++++++++++++++++++++++-------------------------- UI_NO_FX.h | 44 +++++++++++++++++++++----------------------- 3 files changed, 69 insertions(+), 75 deletions(-) diff --git a/UI_FX.h b/UI_FX.h index 0577950..3de9800 100644 --- a/UI_FX.h +++ b/UI_FX.h @@ -93,30 +93,28 @@ LCDML_add(59, LCDML_0_1_5, 5, "Mono/Poly", UI_func_mono_poly); LCDML_add(60, LCDML_0_1, 6, "Internal", NULL); LCDML_add(61, LCDML_0_1_6, 1, "Note Refresh", UI_func_note_refresh); LCDML_add(62, LCDML_0_1_6, 2, "Velocity Lvl", UI_func_velocity_level); -LCDML_add(63, LCDML_0_1_6, 3, "Engine", UI_func_engine); -LCDML_add(64, LCDML_0_1, 7, "Operator", UI_handle_OP); -LCDML_add(65, LCDML_0_1, 8, "Save Voice", UI_func_save_voice); -LCDML_add(66, LCDML_0, 3, "Load/Save", NULL); -LCDML_add(67, LCDML_0_3, 1, "Performance", NULL); -LCDML_add(68, LCDML_0_3_1, 1, "Load Perf.", UI_func_load_performance); -LCDML_add(69, LCDML_0_3_1, 2, "Save Perf.", UI_func_save_performance); -LCDML_add(70, LCDML_0_3, 2, "Voice Config", NULL); -LCDML_add(71, LCDML_0_3_2, 1, "Load Voice Cfg", UI_func_load_voiceconfig); -LCDML_add(72, LCDML_0_3_2, 2, "Save Voice Cfg", UI_func_save_voiceconfig); -LCDML_add(73, LCDML_0_3, 3, "Effects", NULL); -LCDML_add(74, LCDML_0_3_3, 1, "Load Effects", UI_func_load_fx); -LCDML_add(75, LCDML_0_3_3, 2, "Save Effects", UI_func_save_fx); -LCDML_add(76, LCDML_0_3, 5, "MIDI", NULL); -LCDML_add(77, LCDML_0_3_5, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank); -LCDML_add(78, LCDML_0_3_5, 2, "MIDI Snd Bank", UI_func_sysex_send_bank); -LCDML_add(79, LCDML_0_3_5, 3, "MIDI Snd Voice", UI_func_sysex_send_voice); -LCDML_add(80, LCDML_0, 4, "System", NULL); -//LCDML_add(81, LCDML_0_4, 1, "Volume", UI_func_volume); -LCDML_add(81, LCDML_0_4, 1, "Stereo/Mono", UI_func_stereo_mono); -LCDML_add(82, LCDML_0_4, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); -LCDML_add(83, LCDML_0_4, 3, "Favorites", UI_func_favorites); -LCDML_add(84, LCDML_0_4, 4, "EEPROM Reset", UI_func_eeprom_reset); -LCDML_add(85, LCDML_0, 6, "Info", UI_func_information); -LCDML_addAdvanced(86, LCDML_0, 7, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); -#define _LCDML_DISP_cnt 86 +LCDML_add(63, LCDML_0_1, 7, "Operator", UI_handle_OP); +LCDML_add(64, LCDML_0_1, 8, "Save Voice", UI_func_save_voice); +LCDML_add(65, LCDML_0, 3, "Load/Save", NULL); +LCDML_add(66, LCDML_0_3, 1, "Performance", NULL); +LCDML_add(67, LCDML_0_3_1, 1, "Load Perf.", UI_func_load_performance); +LCDML_add(68, LCDML_0_3_1, 2, "Save Perf.", UI_func_save_performance); +LCDML_add(69, LCDML_0_3, 2, "Voice Config", NULL); +LCDML_add(70, LCDML_0_3_2, 1, "Load Voice Cfg", UI_func_load_voiceconfig); +LCDML_add(71, LCDML_0_3_2, 2, "Save Voice Cfg", UI_func_save_voiceconfig); +LCDML_add(72, LCDML_0_3, 3, "Effects", NULL); +LCDML_add(73, LCDML_0_3_3, 1, "Load Effects", UI_func_load_fx); +LCDML_add(74, LCDML_0_3_3, 2, "Save Effects", UI_func_save_fx); +LCDML_add(75, LCDML_0_3, 5, "MIDI", NULL); +LCDML_add(76, LCDML_0_3_5, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank); +LCDML_add(77, LCDML_0_3_5, 2, "MIDI Snd Bank", UI_func_sysex_send_bank); +LCDML_add(78, LCDML_0_3_5, 3, "MIDI Snd Voice", UI_func_sysex_send_voice); +LCDML_add(79, LCDML_0, 4, "System", NULL); +LCDML_add(80, LCDML_0_4, 1, "Stereo/Mono", UI_func_stereo_mono); +LCDML_add(81, LCDML_0_4, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); +LCDML_add(82, LCDML_0_4, 3, "Favorites", UI_func_favorites); +LCDML_add(83, LCDML_0_4, 4, "EEPROM Reset", UI_func_eeprom_reset); +LCDML_add(84, LCDML_0, 6, "Info", UI_func_information); +LCDML_addAdvanced(85, LCDML_0, 7, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); +#define _LCDML_DISP_cnt 85 #endif diff --git a/UI_FX_T4.h b/UI_FX_T4.h index de61f48..15b6722 100644 --- a/UI_FX_T4.h +++ b/UI_FX_T4.h @@ -96,30 +96,28 @@ LCDML_add(62, LCDML_0_1_5, 5, "Mono/Poly", UI_func_mono_poly); LCDML_add(63, LCDML_0_1, 6, "Internal", NULL); LCDML_add(64, LCDML_0_1_6, 1, "Note Refresh", UI_func_note_refresh); LCDML_add(65, LCDML_0_1_6, 2, "Velocity Lvl", UI_func_velocity_level); -LCDML_add(66, LCDML_0_1_6, 3, "Engine", UI_func_engine); -LCDML_add(67, LCDML_0_1, 7, "Operator", UI_handle_OP); -LCDML_add(68, LCDML_0_1, 8, "Save Voice", UI_func_save_voice); -LCDML_add(69, LCDML_0, 3, "Load/Save", NULL); -LCDML_add(70, LCDML_0_3, 1, "Performance", NULL); -LCDML_add(71, LCDML_0_3_1, 1, "Load Perf.", UI_func_load_performance); -LCDML_add(72, LCDML_0_3_1, 2, "Save Perf.", UI_func_save_performance); -LCDML_add(73, LCDML_0_3, 2, "Voice Config", NULL); -LCDML_add(74, LCDML_0_3_2, 1, "Load Voice Cfg", UI_func_load_voiceconfig); -LCDML_add(75, LCDML_0_3_2, 2, "Save Voice Cfg", UI_func_save_voiceconfig); -LCDML_add(76, LCDML_0_3, 3, "Effects", NULL); -LCDML_add(77, LCDML_0_3_3, 1, "Load Effects", UI_func_load_fx); -LCDML_add(78, LCDML_0_3_3, 2, "Save Effects", UI_func_save_fx); -LCDML_add(79, LCDML_0_3, 5, "MIDI", NULL); -LCDML_add(80, LCDML_0_3_5, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank); -LCDML_add(81, LCDML_0_3_5, 2, "MIDI Snd Bank", UI_func_sysex_send_bank); -LCDML_add(82, LCDML_0_3_5, 3, "MIDI Snd Voice", UI_func_sysex_send_voice); -LCDML_add(83, LCDML_0, 4, "System", NULL); -//LCDML_add81, LCDML_0_4, 1, "Volume", UI_func_volume); -LCDML_add(84, LCDML_0_4, 1, "Stereo/Mono", UI_func_stereo_mono); -LCDML_add(85, LCDML_0_4, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); -LCDML_add(86, LCDML_0_4, 3, "Favorites", UI_func_favorites); -LCDML_add(87, LCDML_0_4, 4, "EEPROM Reset", UI_func_eeprom_reset); -LCDML_add(88, LCDML_0, 6, "Info", UI_func_information); -LCDML_addAdvanced(89, LCDML_0, 7, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); -#define _LCDML_DISP_cnt 89 +LCDML_add(66, LCDML_0_1, 7, "Operator", UI_handle_OP); +LCDML_add(67, LCDML_0_1, 8, "Save Voice", UI_func_save_voice); +LCDML_add(68, LCDML_0, 3, "Load/Save", NULL); +LCDML_add(69, LCDML_0_3, 1, "Performance", NULL); +LCDML_add(70, LCDML_0_3_1, 1, "Load Perf.", UI_func_load_performance); +LCDML_add(71, LCDML_0_3_1, 2, "Save Perf.", UI_func_save_performance); +LCDML_add(72, LCDML_0_3, 2, "Voice Config", NULL); +LCDML_add(73, LCDML_0_3_2, 1, "Load Voice Cfg", UI_func_load_voiceconfig); +LCDML_add(74, LCDML_0_3_2, 2, "Save Voice Cfg", UI_func_save_voiceconfig); +LCDML_add(75, LCDML_0_3, 3, "Effects", NULL); +LCDML_add(76, LCDML_0_3_3, 1, "Load Effects", UI_func_load_fx); +LCDML_add(77, LCDML_0_3_3, 2, "Save Effects", UI_func_save_fx); +LCDML_add(78, LCDML_0_3, 5, "MIDI", NULL); +LCDML_add(79, LCDML_0_3_5, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank); +LCDML_add(80, LCDML_0_3_5, 2, "MIDI Snd Bank", UI_func_sysex_send_bank); +LCDML_add(81, LCDML_0_3_5, 3, "MIDI Snd Voice", UI_func_sysex_send_voice); +LCDML_add(82, LCDML_0, 4, "System", NULL); +LCDML_add(83, LCDML_0_4, 1, "Stereo/Mono", UI_func_stereo_mono); +LCDML_add(84, LCDML_0_4, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); +LCDML_add(85, LCDML_0_4, 3, "Favorites", UI_func_favorites); +LCDML_add(86, LCDML_0_4, 4, "EEPROM Reset", UI_func_eeprom_reset); +LCDML_add(87, LCDML_0, 6, "Info", UI_func_information); +LCDML_addAdvanced(88, LCDML_0, 7, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); +#define _LCDML_DISP_cnt 88 #endif diff --git a/UI_NO_FX.h b/UI_NO_FX.h index 157b347..7b45e5f 100644 --- a/UI_NO_FX.h +++ b/UI_NO_FX.h @@ -72,28 +72,26 @@ LCDML_add(38, LCDML_0_1_5, 5, "Mono/Poly", UI_func_mono_poly); LCDML_add(39, LCDML_0_1, 6, "Internal", NULL); LCDML_add(40, LCDML_0_1_6, 1, "Note Refresh", UI_func_note_refresh); LCDML_add(41, LCDML_0_1_6, 2, "Velocity Lvl", UI_func_velocity_level); -LCDML_add(42, LCDML_0_1_6, 3, "Engine", UI_func_engine); -LCDML_add(43, LCDML_0_1, 7, "Operator", UI_handle_OP); -LCDML_add(44, LCDML_0_1, 8, "Save Voice", UI_func_save_voice); -LCDML_add(45, LCDML_0, 2, "Load/Save", NULL); -LCDML_add(46, LCDML_0_2, 1, "Performance", NULL); -LCDML_add(47, LCDML_0_2_1, 1, "Load Perf.", UI_func_load_performance); -LCDML_add(48, LCDML_0_2_1, 2, "Save Perf.", UI_func_save_performance); -LCDML_add(49, LCDML_0_2, 2, "Voice Config", NULL); -LCDML_add(50, LCDML_0_2_2, 1, "Load Voice Cfg", UI_func_load_voiceconfig); -LCDML_add(51, LCDML_0_2_2, 2, "Save Voice Cfg", UI_func_save_voiceconfig); -LCDML_add(52, LCDML_0_2, 4, "MIDI", NULL); -LCDML_add(53, LCDML_0_2_4, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank); -LCDML_add(54, LCDML_0_2_4, 2, "MIDI Snd Bank", UI_func_sysex_send_bank); -LCDML_add(55, LCDML_0_2_4, 3, "MIDI Snd Voice", UI_func_sysex_send_voice); -LCDML_add(56, LCDML_0, 3, "System", NULL); -LCDML_add(57, LCDML_0_3, 1, "Stereo/Mono", UI_func_stereo_mono); -LCDML_add(58, LCDML_0_3, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); -LCDML_add(59, LCDML_0_3, 3, "Favorites", UI_func_favorites); -LCDML_add(60, LCDML_0_3, 4, "EEPROM Reset", UI_func_eeprom_reset); -LCDML_add(61, LCDML_0, 4, "Info", UI_func_information); - -LCDML_addAdvanced(62, LCDML_0, 5, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); -#define _LCDML_DISP_cnt 62 +LCDML_add(42, LCDML_0_1, 7, "Operator", UI_handle_OP); +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, "Performance", NULL); +LCDML_add(46, LCDML_0_2_1, 1, "Load Perf.", UI_func_load_performance); +LCDML_add(47, LCDML_0_2_1, 2, "Save Perf.", UI_func_save_performance); +LCDML_add(48, LCDML_0_2, 2, "Voice Config", NULL); +LCDML_add(49, LCDML_0_2_2, 1, "Load Voice Cfg", UI_func_load_voiceconfig); +LCDML_add(50, LCDML_0_2_2, 2, "Save Voice Cfg", UI_func_save_voiceconfig); +LCDML_add(51, LCDML_0_2, 4, "MIDI", NULL); +LCDML_add(52, LCDML_0_2_4, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank); +LCDML_add(53, LCDML_0_2_4, 2, "MIDI Snd Bank", UI_func_sysex_send_bank); +LCDML_add(54, LCDML_0_2_4, 3, "MIDI Snd Voice", UI_func_sysex_send_voice); +LCDML_add(55, LCDML_0, 3, "System", NULL); +LCDML_add(56, LCDML_0_3, 1, "Stereo/Mono", UI_func_stereo_mono); +LCDML_add(57, LCDML_0_3, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); +LCDML_add(58, LCDML_0_3, 3, "Favorites", UI_func_favorites); +LCDML_add(59, LCDML_0_3, 4, "EEPROM Reset", UI_func_eeprom_reset); +LCDML_add(60, LCDML_0, 4, "Info", UI_func_information); +LCDML_addAdvanced(61, LCDML_0, 5, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); +#define _LCDML_DISP_cnt 61 #endif