wirtz
/
MicroDexed
mirror of https://codeberg.org/dcoredump/MicroDexed.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Only optical changes for code.

Browse Source
pull/112/head
Holger Wirtz 3 years ago
parent 1938e987a5
commit 07f176f49c
2 changed files with 53 additions and 59 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 59
      MicroDexed.ino
  2. 53
      UI.hpp

59
MicroDexed.ino
Unescape View File

@ -64,83 +64,82 @@ AudioSynthWaveform* chorus_modulator[NUM_DEXED];
AudioFilterBiquad* modchorus_filter[NUM_DEXED]; AudioFilterBiquad* modchorus_filter[NUM_DEXED];
#endif #endif
AudioEffectModulatedDelay* modchorus[NUM_DEXED]; AudioEffectModulatedDelay* modchorus[NUM_DEXED];
AudioMixer<4>* chorus_mixer[NUM_DEXED]; AudioMixer<4>* chorus_mixer[NUM_DEXED];
AudioMixer<4>* delay_fb_mixer[NUM_DEXED]; AudioMixer<4>* delay_fb_mixer[NUM_DEXED];
AudioEffectDelay* delay_fx[NUM_DEXED]; AudioEffectDelay* delay_fx[NUM_DEXED];
AudioMixer<4>* delay_mixer[NUM_DEXED]; AudioMixer<4>* delay_mixer[NUM_DEXED];
#endif #endif
AudioEffectMonoStereo* mono2stereo[NUM_DEXED]; AudioEffectMonoStereo* mono2stereo[NUM_DEXED];
AudioMixer<4> microdexed_peak_mixer; AudioMixer<4> microdexed_peak_mixer;
AudioAnalyzePeak microdexed_peak; AudioAnalyzePeak microdexed_peak;
#if defined(USE_FX) #if defined(USE_FX)
AudioMixer<4> reverb_mixer_r; AudioMixer<4> reverb_mixer_r;
AudioMixer<4> reverb_mixer_l; AudioMixer<4> reverb_mixer_l;
#if defined(USE_PLATEREVERB) #if defined(USE_PLATEREVERB)
AudioEffectPlateReverb reverb; AudioEffectPlateReverb reverb;
#elif defined(USE_FREEVERB_SIMD) #elif defined(USE_FREEVERB_SIMD)
AudioEffectFreeverbSIMDStereo freeverb; AudioEffectFreeverbSIMDStereo freeverb;
#else #else
AudioEffectFreeverbStereoFloat freeverb; AudioEffectFreeverbStereoFloat freeverb;
#endif #endif
#endif #endif
AudioMixer<4> master_mixer_r; AudioMixer<4> master_mixer_r;
AudioMixer<4> master_mixer_l; AudioMixer<4> master_mixer_l;
AudioAmplifier volume_r; AudioAmplifier volume_r;
AudioAmplifier volume_l; AudioAmplifier volume_l;
AudioEffectStereoMono stereo2mono; AudioEffectStereoMono stereo2mono;
AudioAnalyzePeak master_peak_r; AudioAnalyzePeak master_peak_r;
AudioAnalyzePeak master_peak_l; AudioAnalyzePeak master_peak_l;
#if defined(TEENSY_AUDIO_BOARD) && defined(SGTL5000_AUDIO_THRU) #if defined(TEENSY_AUDIO_BOARD) && defined(SGTL5000_AUDIO_THRU)
AudioMixer<4> audio_thru_mixer_r; AudioMixer<4> audio_thru_mixer_r;
AudioMixer<4> audio_thru_mixer_l; AudioMixer<4> audio_thru_mixer_l;
#endif #endif
// Drumset // Drumset
#if NUM_DRUMS > 0 #if NUM_DRUMS > 0
//AudioPlayMemory* Drum[NUM_DRUMS];
AudioPlayArrayResmp* Drum[NUM_DRUMS]; AudioPlayArrayResmp* Drum[NUM_DRUMS];
AudioMixer<NUM_DRUMS> drum_mixer_r; AudioMixer<NUM_DRUMS> drum_mixer_r;
AudioMixer<NUM_DRUMS> drum_mixer_l; AudioMixer<NUM_DRUMS> drum_mixer_l;
#ifdef USE_FX #ifdef USE_FX
#if NUM_DRUMS < 5 #if NUM_DRUMS < 5
AudioMixer<4> drum_reverb_send_mixer_r; AudioMixer<4> drum_reverb_send_mixer_r;
AudioMixer<4> drum_reverb_send_mixer_l; AudioMixer<4> drum_reverb_send_mixer_l;
#else #else
AudioMixer<8> drum_reverb_send_mixer_r; AudioMixer<8> drum_reverb_send_mixer_r;
AudioMixer<8> drum_reverb_send_mixer_l; AudioMixer<8> drum_reverb_send_mixer_l;
#endif #endif
#endif #endif
#endif #endif
// Outputs // Outputs
#if defined(TEENSY_AUDIO_BOARD) #if defined(TEENSY_AUDIO_BOARD)
AudioOutputI2S i2s1; AudioOutputI2S i2s1;
#ifdef SGTL5000_AUDIO_ENHANCE #ifdef SGTL5000_AUDIO_ENHANCE
AudioControlSGTL5000Plus sgtl5000; AudioControlSGTL5000Plus sgtl5000;
#else #else
AudioControlSGTL5000 sgtl5000; AudioControlSGTL5000 sgtl5000;
#endif #endif
#elif defined (I2S_AUDIO_ONLY) #elif defined (I2S_AUDIO_ONLY)
AudioOutputI2S i2s1; AudioOutputI2S i2s1;
#elif defined(TGA_AUDIO_BOARD) #elif defined(TGA_AUDIO_BOARD)
AudioOutputI2S i2s1; AudioOutputI2S i2s1;
AudioControlWM8731master wm8731_1; AudioControlWM8731master wm8731_1;
#elif defined(PT8211_AUDIO) #elif defined(PT8211_AUDIO)
AudioOutputPT8211 pt8211_1; AudioOutputPT8211 pt8211_1;
#elif defined(TEENSY_DAC_SYMMETRIC) #elif defined(TEENSY_DAC_SYMMETRIC)
AudioOutputAnalogStereo dacOut; AudioOutputAnalogStereo dacOut;
AudioMixer<4> invMixer; AudioMixer<4> invMixer;
#elif defined(TEENSY_DAC) #elif defined(TEENSY_DAC)
AudioOutputAnalogStereo dacOut; AudioOutputAnalogStereo dacOut;
#endif #endif
#ifdef AUDIO_DEVICE_USB #ifdef AUDIO_DEVICE_USB
AudioOutputUSB usb1; AudioOutputUSB usb1;
#endif #endif
#if defined(TEENSY_AUDIO_BOARD) && defined(SGTL5000_AUDIO_THRU) #if defined(TEENSY_AUDIO_BOARD) && defined(SGTL5000_AUDIO_THRU)
AudioInputI2S i2s1in; AudioInputI2S i2s1in;
#endif #endif
// //

53
UI.hpp
Unescape View File

@ -46,11 +46,11 @@
#define _LCDML_DISP_rows LCD_rows #define _LCDML_DISP_rows LCD_rows
#ifdef I2C_DISPLAY #ifdef I2C_DISPLAY
#define _LCDML_DISP_cfg_cursor 0x7E // cursor Symbol #define _LCDML_DISP_cfg_cursor 0x7E // cursor Symbol
#else #else
#define _LCDML_DISP_cfg_cursor 0x8d // cursor Symbol #define _LCDML_DISP_cfg_cursor 0x8d // cursor Symbol
#endif #endif
#define _LCDML_DISP_cfg_scrollbar 1 // enable a scrollbar #define _LCDML_DISP_cfg_scrollbar 1 // enable a scrollbar
extern PeriodicTimer timer1; extern PeriodicTimer timer1;
extern void sequencer(void); extern void sequencer(void);
@ -121,38 +121,38 @@ extern void change_disp_sd(bool d);
#ifdef SGTL5000_AUDIO_ENHANCE #ifdef SGTL5000_AUDIO_ENHANCE
#include "control_sgtl5000plus.h" #include "control_sgtl5000plus.h"
extern AudioControlSGTL5000Plus sgtl5000; extern AudioControlSGTL5000Plus sgtl5000;
#else #else
extern AudioControlSGTL5000 sgtl5000; extern AudioControlSGTL5000 sgtl5000;
#endif #endif
#if defined(USE_FX) #if defined(USE_FX)
extern AudioSynthWaveform* chorus_modulator[NUM_DEXED]; extern AudioSynthWaveform* chorus_modulator[NUM_DEXED];
extern AudioEffectModulatedDelay* modchorus[NUM_DEXED]; extern AudioEffectModulatedDelay* modchorus[NUM_DEXED];
extern AudioMixer<4>* chorus_mixer[NUM_DEXED]; extern AudioMixer<4>* chorus_mixer[NUM_DEXED];
extern AudioMixer<4>* delay_fb_mixer[NUM_DEXED]; extern AudioMixer<4>* delay_fb_mixer[NUM_DEXED];
extern AudioEffectDelay* delay_fx[NUM_DEXED]; extern AudioEffectDelay* delay_fx[NUM_DEXED];
extern AudioMixer<4>* delay_mixer[NUM_DEXED]; extern AudioMixer<4>* delay_mixer[NUM_DEXED];
#endif #endif
extern AudioEffectMonoStereo* mono2stereo[NUM_DEXED]; extern AudioEffectMonoStereo* mono2stereo[NUM_DEXED];
extern AudioMixer<4> microdexed_peak_mixer; extern AudioMixer<4> microdexed_peak_mixer;
extern AudioAnalyzePeak microdexed_peak; extern AudioAnalyzePeak microdexed_peak;
#if defined(USE_FX) #if defined(USE_FX)
extern AudioMixer<4> reverb_mixer_r; extern AudioMixer<4> reverb_mixer_r;
extern AudioMixer<4> reverb_mixer_l; extern AudioMixer<4> reverb_mixer_l;
#if defined(USE_PLATEREVERB) #if defined(USE_PLATEREVERB)
extern AudioEffectPlateReverb reverb; extern AudioEffectPlateReverb reverb;
#elif defined(USE_FREEVERB_SIMD) #elif defined(USE_FREEVERB_SIMD)
extern AudioEffectFreeverbSIMDStereo freeverb; extern AudioEffectFreeverbSIMDStereo freeverb;
#else #else
extern AudioEffectFreeverbStereoFloat freeverb; extern AudioEffectFreeverbStereoFloat freeverb;
#endif #endif
#endif #endif
extern AudioMixer<4> master_mixer_r; extern AudioMixer<4> master_mixer_r;
extern AudioMixer<4> master_mixer_l; extern AudioMixer<4> master_mixer_l;
extern AudioEffectStereoMono stereo2mono; extern AudioEffectStereoMono stereo2mono;
extern AudioAnalyzePeak master_peak_r; extern AudioAnalyzePeak master_peak_r;
extern AudioAnalyzePeak master_peak_l; extern AudioAnalyzePeak master_peak_l;
extern char sd_string[LCD_cols + 1]; extern char sd_string[LCD_cols + 1];
extern char g_voice_name[NUM_DEXED][VOICE_NAME_LEN]; extern char g_voice_name[NUM_DEXED][VOICE_NAME_LEN];
@ -523,7 +523,6 @@ class EncoderDirection
bool down; 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)}; 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]; EncoderDirection encoderDir[NUM_ENCODER];
@ -626,10 +625,6 @@ void setup_ui(void)
lcd_special_chars(SCROLLBAR); lcd_special_chars(SCROLLBAR);
// LCDMenuLib Setup // LCDMenuLib Setup
LCDML_setup(_LCDML_DISP_cnt); 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 #ifdef DEBUG

Write Preview
Loading…
Cancel
Save