Rewrite of menu structure and parts of menu control. Not yet ready.

pull/32/head
Holger Wirtz 5 years ago
parent 235e328395
commit 5f0fde17c2
  1. 11
      MicroDexed.ino
  2. 1299
      UI.hpp
  3. 8
      UI_1_FX.h
  4. 4
      config.h
  5. 2
      doc/LCDMenu-functions.txt

@ -219,7 +219,6 @@ uint32_t peak_r = 0;
uint32_t peak_l = 0;
bool eeprom_update_flag = false;
config_t configuration;
uint8_t selected_dexed_instance = 0;
const uint8_t cs_pins[] = { SDCARD_TEENSY_CS_PIN, SDCARD_AUDIO_CS_PIN };
const uint8_t mosi_pins[] = { SDCARD_TEENSY_MOSI_PIN, SDCARD_AUDIO_MOSI_PIN };
const uint8_t sck_pins[] = { SDCARD_TEENSY_SCK_PIN, SDCARD_AUDIO_SCK_PIN };
@ -237,7 +236,6 @@ int16_t delayline_l[MOD_DELAY_SAMPLE_BUFFER];
LCDMenuLib2
***********************************************************************/
extern LCDMenuLib2 LCDML;
extern uint8_t menu_state;
#endif
void setup()
@ -604,6 +602,8 @@ void setup()
#ifdef DEBUG
Serial.println(F("<setup end>"));
#endif
LCDML.OTHER_jumpToFunc(UI_func_voice_select);
}
void loop()
@ -623,13 +623,6 @@ void loop()
#ifdef ENABLE_LCD_UI
// LCD Menu
LCDML.loop();
// initial starts voice selection menu as default
if (menu_state == MENU_START)
{
menu_state = MENU_VOICE;
UI_func_voice_selection(0);
}
#endif
// EEPROM update handling

1299
UI.hpp

File diff suppressed because it is too large Load Diff

@ -26,7 +26,7 @@
#define _UI_H_
LCDML_add(0, LCDML_0, 1, "Voice", NULL);
LCDML_add(1, LCDML_0_1, 1, "Select", NULL); // UI_func_voice_select
LCDML_add(1, LCDML_0_1, 1, "Select", UI_func_voice_select);
LCDML_add(2, LCDML_0_1, 2, "Audio", NULL);
LCDML_add(3, LCDML_0_1_2, 1, "Volume", UI_func_sound_intensity);
LCDML_add(4, LCDML_0_1_2, 2, "Panorama", UI_func_panorama);
@ -102,7 +102,9 @@ LCDML_add(73, LCDML_0_3, 3, "Firmware Reset", UI_func_firmware_reset);
LCDML_add(74, LCDML_0, 4, "System", NULL);
LCDML_add(75, LCDML_0_4, 1, "Stereo/Mono", UI_func_stereo_mono);
LCDML_add(76, LCDML_0_4, 2, "MIDI Soft THRU", UI_func_midi_soft_thru);
LCDML_add(77, LCDML_0, 5, "Info", UI_func_information);
#define _LCDML_DISP_cnt 77
LCDML_add(77, LCDML_0, 5, "Volume", UI_func_volume);
LCDML_add(78, LCDML_0, 6, "Info", UI_func_information);
#define _LCDML_DISP_cnt 78
#define MENU_ID_OF_INSTANCE_2 56
#define VOLUME_MENU_ID 77
#endif

@ -174,7 +174,7 @@
#define U8X8_RESET_PIN 14
#endif
#define CONTROL_RATE_MS 30
#define VOICE_SELECTION_MS 60000
#define BACK_FROM_VOLUME_MS 2000
//*************************************************************************************************
@ -234,6 +234,8 @@
#define CPU_OVERLOAD_THROTTLE_TIMER 100 // timer (in ms) when next throttling is possible
enum { DEXED, CHORUS, DELAY, REVERB};
#define CONTROL_RATE_MS 30
// MIDI
#ifdef MIDI_DEVICE_USB
#define USBCON 1

@ -9,3 +9,5 @@ void OTHER_setCursorToID(uint8_t p_search);
// set the cursor to a defined function based on the function name
void OTHER_setCursorToFunc(LCDML_FuncPtr_pu8 p_search);
LCDML.MENU_goRoot()

Loading…
Cancel
Save