Fixing usage of TGA board

Fixing some problems with config.h
pull/4/head
Holger Wirtz 6 years ago
parent 3f633544b6
commit 168eedeb8d
  1. 47
      MicroDexed.ino
  2. 28
      config.h

@ -54,35 +54,40 @@ AudioFilterStateVariable filter1;
AudioEffectDelay delay1; AudioEffectDelay delay1;
AudioMixer4 mixer1; AudioMixer4 mixer1;
AudioMixer4 mixer2; AudioMixer4 mixer2;
AudioConnection patchCord1(queue1, peak1); AudioConnection patchCord0(queue1, peak1);
AudioConnection patchCord2(queue1, 0, filter1, 0); AudioConnection patchCord1(queue1, 0, filter1, 0);
AudioConnection patchCord3(filter1, 0, delay1, 0); AudioConnection patchCord2(filter1, 0, delay1, 0);
AudioConnection patchCord4(filter1, 0, mixer1, 0); AudioConnection patchCord3(filter1, 0, mixer1, 0);
AudioConnection patchCord5(filter1, 0, mixer2, 0); AudioConnection patchCord4(filter1, 0, mixer2, 0);
AudioConnection patchCord6(delay1, 0, mixer1, 1); AudioConnection patchCord5(delay1, 0, mixer1, 1);
AudioConnection patchCord7(delay1, 0, mixer2, 2); AudioConnection patchCord6(delay1, 0, mixer2, 2);
AudioConnection patchCord8(mixer1, delay1); AudioConnection patchCord7(mixer1, delay1);
AudioConnection patchCord9(queue1, 0, mixer1, 3); // for disabling the filter AudioConnection patchCord8(queue1, 0, mixer1, 3); // for disabling the filter
AudioConnection patchCord10(mixer1, 0, mixer2, 1); AudioConnection patchCord9(mixer1, 0, mixer2, 1);
#if defined(TEENSY_AUDIO_BOARD) || defined(TGA_AUDIO_BOARD) #if defined(TEENSY_AUDIO_BOARD)
AudioOutputI2S i2s1; AudioOutputI2S i2s1;
AudioConnection patchCord11(mixer2, 0, i2s1, 0); AudioConnection patchCord110(mixer2, 0, i2s1, 0);
AudioConnection patchCord12(mixer2, 0, i2s1, 1); AudioConnection patchCord111(mixer2, 0, i2s1, 1);
#ifdef TEENSY_AUDIO_BOARD
AudioControlSGTL5000 sgtl5000_1; AudioControlSGTL5000 sgtl5000_1;
#else #elif defined(TGA_AUDIO_BOARD)
AudioOutputI2S i2s1;
AudioAmplifier volume_r;
AudioAmplifier volume_l;
AudioConnection patchCord10(mixer2, volume_r);
AudioConnection patchCord11(mixer2, volume_l);
AudioConnection patchCord12(volume_r, 0, i2s1, 1);
AudioConnection patchCord13(volume_l, 0, i2s1, 0);
AudioControlWM8731master wm8731_1; AudioControlWM8731master wm8731_1;
#endif
#else #else
AudioOutputPT8211 pt8211_1; AudioOutputPT8211 pt8211_1;
AudioAmplifier volume_master; AudioAmplifier volume_master;
AudioAmplifier volume_r; AudioAmplifier volume_r;
AudioAmplifier volume_l; AudioAmplifier volume_l;
AudioConnection patchCord11(mixer2, 0, volume_master, 0); AudioConnection patchCord10(mixer2, 0, volume_master, 0);
AudioConnection patchCord12(volume_master, volume_r); AudioConnection patchCord11(volume_master, volume_r);
AudioConnection patchCord13(volume_master, volume_l); AudioConnection patchCord12(volume_master, volume_l);
AudioConnection patchCord14(volume_r, 0, pt8211_1, 0); AudioConnection patchCord13(volume_r, 0, pt8211_1, 0);
AudioConnection patchCord15(volume_l, 0, pt8211_1, 1); AudioConnection patchCord14(volume_l, 0, pt8211_1, 1);
#endif #endif
Dexed* dexed = new Dexed(SAMPLE_RATE); Dexed* dexed = new Dexed(SAMPLE_RATE);

@ -43,7 +43,8 @@
#define MIDI_DEVICE_USB_HOST 1 #define MIDI_DEVICE_USB_HOST 1
// AUDIO // AUDIO
//#define TEENSY_AUDIO_BOARD 1 // If nothing is defined PT8211 is used as audio output device!
#define TEENSY_AUDIO_BOARD 1
//#define TGA_AUDIO_BOARD //#define TGA_AUDIO_BOARD
//************************************************************************************************* //*************************************************************************************************
@ -171,32 +172,21 @@
#ifdef MIDI_DEVICE_USB #ifdef MIDI_DEVICE_USB
#define USBCON 1 #define USBCON 1
#endif #endif
#if !defined(__MK66FX1M0__) // check for Teensy-3.6 #if defined(__MK66FX1M0__) // Teensy-3.6
#define MAX_NOTES 11 // No?
#undef USE_ONBOARD_USB_HOST
#else
#define MAX_NOTES 16 // Yes
#endif
// MIDI
#ifdef MIDI_DEVICE_USB
#define USBCON 1
#endif
#if defined(__MK66FX1M0__)
// Teensy-3.6 settings // Teensy-3.6 settings
#define MIDI_DEVICE_USB_HOST 1 #define MIDI_DEVICE_USB_HOST 1
#define MAX_NOTES 16
#else #else
// Teensy-3.5 settings // Teensy-3.5 settings
#undef MIDI_DEVICE_USB_HOST #undef MIDI_DEVICE_USB_HOST
#endif
// Engine
#if defined(__MK66FX1M0__)
// Teensy-3.6 settings
#define MAX_NOTES 16
#else
#define MAX_NOTES 11 #define MAX_NOTES 11
#endif #endif
// Audio
#ifdef TGA_AUDIO_BOARD
#define REDUCE_LOUDNESS 2
#endif
// Some optimizations // Some optimizations
#define USE_TEENSY_DSP 1 #define USE_TEENSY_DSP 1
#define SUM_UP_AS_INT 1 #define SUM_UP_AS_INT 1

Loading…
Cancel
Save