From 69a2075de2f001184bb4c47f7ba3c0b5b5fe485e Mon Sep 17 00:00:00 2001 From: Dirk Niggemann Date: Tue, 15 Oct 2019 19:51:36 +0100 Subject: [PATCH] Added freeverb stereo back in --- MicroDexed.ino | 2 +- config.h | 51 +++++++++++++++++++++++++++++++------------------- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/MicroDexed.ino b/MicroDexed.ino index b156ba1..d0fc688 100644 --- a/MicroDexed.ino +++ b/MicroDexed.ino @@ -42,7 +42,7 @@ AudioPlayQueue dexed1; AudioAnalyzePeak peak1; AudioEffectDelay delay_r; AudioEffectDelay delay_l; -iAudioEffectFreeverbStereo freeverbs1; +AudioEffectFreeverbStereo freeverbs1; AudioEffectModulatedDelay modchorus_r; AudioEffectModulatedDelay modchorus_l; #if MOD_FILTER_OUTPUT != MOD_NO_FILTER_OUTPUT diff --git a/config.h b/config.h index a655988..a58b1d1 100644 --- a/config.h +++ b/config.h @@ -45,14 +45,16 @@ //************************************************************************************************* // MIDI -//#define MIDI_DEVICE_DIN Serial1 -#define MIDI_DEVICE_USB 1 -#define MIDI_DEVICE_USB_HOST 1 -#define MIDI_DEVICE_NUMBER 0 +#define MIDI_DEVICE_DIN Serial1 +//#define MIDI_DEVICE_USB 1 +//#define MIDI_DEVICE_USB_HOST 1 +//#define MIDI_DEVICE_NUMBER 0 // AUDIO // If nothing is defined PT8211 is used as audio output device! +//#define AUDIO_DEVICE_USB //#define TEENSY_AUDIO_BOARD 1 +#define I2S_AUDIO_ONLY //#define TGA_AUDIO_BOARD //************************************************************************************************* @@ -107,9 +109,18 @@ //* UI //************************************************************************************************* #define ENABLE_LCD_UI 1 -#define LCD_I2C_ADDRESS 0x27 +#define LCD_I2C_ADDRESS 0x3f #define LCD_cols 16 -#define LCD_rows 2 +#define LCD_rows 4 +// LCD Display + +#define U8X8_DISPLAY +#define U8X8_CS_PIN 9 +#define U8X8_DC_PIN 15 +#define U8X8_RESET_PIN 14 +//#define I2C_DISPLAY +// [I2C] SCL: Pin 19, SDA: Pin 18 (https://www.pjrc.com/teensy/td_libs_Wire.html) +//#define LCD_GFX 1 #define CONTROL_RATE_MS 50 #define BACK_FROM_VOLUME_MS 1000 @@ -118,7 +129,7 @@ //* DEBUG OUTPUT SETTINGS //************************************************************************************************* #define DEBUG 1 -#define SERIAL_SPEED 38400 +#define SERIAL_SPEED 9600 #define SHOW_XRUN 1 #define SHOW_CPU_LOAD_MSEC 5000 @@ -132,7 +143,8 @@ //#define SDCARD_SCK_PIN 14 #define SGTL5000_LINEOUT_LEVEL 29 // Teensy 3.5 & 3.6 SD card -#define SDCARD_CS_PIN BUILTIN_SDCARD +//#define SDCARD_CS_PIN BUILTIN_SDCARD +#define SDCARD_CS_PIN 10 #define SDCARD_MOSI_PIN 11 // not actually used #define SDCARD_SCK_PIN 13 // not actually used @@ -147,19 +159,13 @@ #define ENC_L_PIN_A 3 #define ENC_L_PIN_B 2 #define BUT_L_PIN 4 -#define ENC_R_PIN_A 28 -#define ENC_R_PIN_B 29 -#define BUT_R_PIN 30 +#define ENC_R_PIN_A 6 +#define ENC_R_PIN_B 5 +#define BUT_R_PIN 8 #define BUT_DEBOUNCE_MS 20 #define LONG_BUTTON_PRESS 500 -// LCD Display -#define I2C_DISPLAY 1 -// [I2C] SCL: Pin 19, SDA: Pin 18 (https://www.pjrc.com/teensy/td_libs_Wire.html) -//#define LCD_GFX 1 -#define LCD_I2C_ADDRESS 0x27 -#define LCD_CHARS 16 -#define LCD_LINES 2 + // Internal timer #define AUTOSTORE_MS 5000 @@ -180,11 +186,18 @@ #ifdef MIDI_DEVICE_USB #define USBCON 1 #endif +#if defined(__IMXRT1062__) //Teensy-4.0 +#undef MIDI_DEVICE_USB_HOST +#define MAX_NOTES 16 +#endif + #if defined(__MK66FX1M0__) // Teensy-3.6 // Teensy-3.6 settings #define MIDI_DEVICE_USB_HOST 1 #define MAX_NOTES 16 -#else +#endif + +#if defined (__MK64FX512__) // Teensy-3.5 settings #undef MIDI_DEVICE_USB_HOST #define MAX_NOTES 11