From 07f176f49cd4056e8b48a769e4fc74ed61b09f26 Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Mon, 18 Oct 2021 10:55:47 +0200 Subject: [PATCH] Only optical changes for code. --- MicroDexed.ino | 59 +++++++++++++++++++++++++------------------------- UI.hpp | 53 ++++++++++++++++++++------------------------- 2 files changed, 53 insertions(+), 59 deletions(-) diff --git a/MicroDexed.ino b/MicroDexed.ino index 7acf98e..16c7619 100644 --- a/MicroDexed.ino +++ b/MicroDexed.ino @@ -64,83 +64,82 @@ AudioSynthWaveform* chorus_modulator[NUM_DEXED]; AudioFilterBiquad* modchorus_filter[NUM_DEXED]; #endif AudioEffectModulatedDelay* modchorus[NUM_DEXED]; -AudioMixer<4>* chorus_mixer[NUM_DEXED]; -AudioMixer<4>* delay_fb_mixer[NUM_DEXED]; +AudioMixer<4>* chorus_mixer[NUM_DEXED]; +AudioMixer<4>* delay_fb_mixer[NUM_DEXED]; AudioEffectDelay* delay_fx[NUM_DEXED]; -AudioMixer<4>* delay_mixer[NUM_DEXED]; +AudioMixer<4>* delay_mixer[NUM_DEXED]; #endif AudioEffectMonoStereo* mono2stereo[NUM_DEXED]; -AudioMixer<4> microdexed_peak_mixer; +AudioMixer<4> microdexed_peak_mixer; AudioAnalyzePeak microdexed_peak; #if defined(USE_FX) -AudioMixer<4> reverb_mixer_r; -AudioMixer<4> reverb_mixer_l; +AudioMixer<4> reverb_mixer_r; +AudioMixer<4> reverb_mixer_l; #if defined(USE_PLATEREVERB) AudioEffectPlateReverb reverb; #elif defined(USE_FREEVERB_SIMD) -AudioEffectFreeverbSIMDStereo freeverb; +AudioEffectFreeverbSIMDStereo freeverb; #else AudioEffectFreeverbStereoFloat freeverb; #endif #endif -AudioMixer<4> master_mixer_r; -AudioMixer<4> master_mixer_l; +AudioMixer<4> master_mixer_r; +AudioMixer<4> master_mixer_l; AudioAmplifier volume_r; AudioAmplifier volume_l; AudioEffectStereoMono stereo2mono; AudioAnalyzePeak master_peak_r; AudioAnalyzePeak master_peak_l; #if defined(TEENSY_AUDIO_BOARD) && defined(SGTL5000_AUDIO_THRU) -AudioMixer<4> audio_thru_mixer_r; -AudioMixer<4> audio_thru_mixer_l; +AudioMixer<4> audio_thru_mixer_r; +AudioMixer<4> audio_thru_mixer_l; #endif // Drumset #if NUM_DRUMS > 0 -//AudioPlayMemory* Drum[NUM_DRUMS]; AudioPlayArrayResmp* Drum[NUM_DRUMS]; -AudioMixer drum_mixer_r; -AudioMixer drum_mixer_l; +AudioMixer drum_mixer_r; +AudioMixer drum_mixer_l; #ifdef USE_FX #if NUM_DRUMS < 5 -AudioMixer<4> drum_reverb_send_mixer_r; -AudioMixer<4> drum_reverb_send_mixer_l; +AudioMixer<4> drum_reverb_send_mixer_r; +AudioMixer<4> drum_reverb_send_mixer_l; #else -AudioMixer<8> drum_reverb_send_mixer_r; -AudioMixer<8> drum_reverb_send_mixer_l; +AudioMixer<8> drum_reverb_send_mixer_r; +AudioMixer<8> drum_reverb_send_mixer_l; #endif #endif #endif // Outputs #if defined(TEENSY_AUDIO_BOARD) -AudioOutputI2S i2s1; +AudioOutputI2S i2s1; #ifdef SGTL5000_AUDIO_ENHANCE -AudioControlSGTL5000Plus sgtl5000; +AudioControlSGTL5000Plus sgtl5000; #else -AudioControlSGTL5000 sgtl5000; +AudioControlSGTL5000 sgtl5000; #endif #elif defined (I2S_AUDIO_ONLY) -AudioOutputI2S i2s1; +AudioOutputI2S i2s1; #elif defined(TGA_AUDIO_BOARD) -AudioOutputI2S i2s1; -AudioControlWM8731master wm8731_1; +AudioOutputI2S i2s1; +AudioControlWM8731master wm8731_1; #elif defined(PT8211_AUDIO) -AudioOutputPT8211 pt8211_1; +AudioOutputPT8211 pt8211_1; #elif defined(TEENSY_DAC_SYMMETRIC) -AudioOutputAnalogStereo dacOut; -AudioMixer<4> invMixer; +AudioOutputAnalogStereo dacOut; +AudioMixer<4> invMixer; #elif defined(TEENSY_DAC) -AudioOutputAnalogStereo dacOut; +AudioOutputAnalogStereo dacOut; #endif #ifdef AUDIO_DEVICE_USB -AudioOutputUSB usb1; +AudioOutputUSB usb1; #endif #if defined(TEENSY_AUDIO_BOARD) && defined(SGTL5000_AUDIO_THRU) -AudioInputI2S i2s1in; +AudioInputI2S i2s1in; #endif // diff --git a/UI.hpp b/UI.hpp index 6d6b34a..1945e7b 100644 --- a/UI.hpp +++ b/UI.hpp @@ -46,11 +46,11 @@ #define _LCDML_DISP_rows LCD_rows #ifdef I2C_DISPLAY -#define _LCDML_DISP_cfg_cursor 0x7E // cursor Symbol +#define _LCDML_DISP_cfg_cursor 0x7E // cursor Symbol #else -#define _LCDML_DISP_cfg_cursor 0x8d // cursor Symbol +#define _LCDML_DISP_cfg_cursor 0x8d // cursor Symbol #endif -#define _LCDML_DISP_cfg_scrollbar 1 // enable a scrollbar +#define _LCDML_DISP_cfg_scrollbar 1 // enable a scrollbar extern PeriodicTimer timer1; extern void sequencer(void); @@ -121,38 +121,38 @@ extern void change_disp_sd(bool d); #ifdef SGTL5000_AUDIO_ENHANCE #include "control_sgtl5000plus.h" -extern AudioControlSGTL5000Plus sgtl5000; +extern AudioControlSGTL5000Plus sgtl5000; #else -extern AudioControlSGTL5000 sgtl5000; +extern AudioControlSGTL5000 sgtl5000; #endif #if defined(USE_FX) -extern AudioSynthWaveform* chorus_modulator[NUM_DEXED]; -extern AudioEffectModulatedDelay* modchorus[NUM_DEXED]; -extern AudioMixer<4>* chorus_mixer[NUM_DEXED]; -extern AudioMixer<4>* delay_fb_mixer[NUM_DEXED]; -extern AudioEffectDelay* delay_fx[NUM_DEXED]; -extern AudioMixer<4>* delay_mixer[NUM_DEXED]; -#endif -extern AudioEffectMonoStereo* mono2stereo[NUM_DEXED]; -extern AudioMixer<4> microdexed_peak_mixer; -extern AudioAnalyzePeak microdexed_peak; +extern AudioSynthWaveform* chorus_modulator[NUM_DEXED]; +extern AudioEffectModulatedDelay* modchorus[NUM_DEXED]; +extern AudioMixer<4>* chorus_mixer[NUM_DEXED]; +extern AudioMixer<4>* delay_fb_mixer[NUM_DEXED]; +extern AudioEffectDelay* delay_fx[NUM_DEXED]; +extern AudioMixer<4>* delay_mixer[NUM_DEXED]; +#endif +extern AudioEffectMonoStereo* mono2stereo[NUM_DEXED]; +extern AudioMixer<4> microdexed_peak_mixer; +extern AudioAnalyzePeak microdexed_peak; #if defined(USE_FX) -extern AudioMixer<4> reverb_mixer_r; -extern AudioMixer<4> reverb_mixer_l; +extern AudioMixer<4> reverb_mixer_r; +extern AudioMixer<4> reverb_mixer_l; #if defined(USE_PLATEREVERB) -extern AudioEffectPlateReverb reverb; +extern AudioEffectPlateReverb reverb; #elif defined(USE_FREEVERB_SIMD) extern AudioEffectFreeverbSIMDStereo freeverb; #else -extern AudioEffectFreeverbStereoFloat freeverb; +extern AudioEffectFreeverbStereoFloat freeverb; #endif #endif -extern AudioMixer<4> master_mixer_r; -extern AudioMixer<4> master_mixer_l; -extern AudioEffectStereoMono stereo2mono; -extern AudioAnalyzePeak master_peak_r; -extern AudioAnalyzePeak master_peak_l; +extern AudioMixer<4> master_mixer_r; +extern AudioMixer<4> master_mixer_l; +extern AudioEffectStereoMono stereo2mono; +extern AudioAnalyzePeak master_peak_r; +extern AudioAnalyzePeak master_peak_l; extern char sd_string[LCD_cols + 1]; extern char g_voice_name[NUM_DEXED][VOICE_NAME_LEN]; @@ -523,7 +523,6 @@ class EncoderDirection bool down; }; -//Encoder ENCODER[NUM_ENCODER] = {Encoder(ENC_R_PIN_B, ENC_R_PIN_A), Encoder(ENC_L_PIN_B, ENC_L_PIN_A)}; MD_REncoder ENCODER[NUM_ENCODER] = {MD_REncoder(ENC_R_PIN_B, ENC_R_PIN_A), MD_REncoder(ENC_L_PIN_B, ENC_L_PIN_A)}; EncoderDirection encoderDir[NUM_ENCODER]; @@ -626,10 +625,6 @@ void setup_ui(void) lcd_special_chars(SCROLLBAR); // LCDMenuLib Setup LCDML_setup(_LCDML_DISP_cnt); - // Enable Menu Rollover - //LCDML.MENU_enRollover(); - // Enable Screensaver (screensaver menu function, time to activate in ms) - //LCDML.SCREEN_enable(UI_func_voice_select, VOICE_SELECTION_MS); } #ifdef DEBUG