Several fixes.

chorus
Holger Wirtz 6 years ago
parent ac681b452d
commit 42f309ea0e
  1. 39
      MicroMDAPiano.ino
  2. 10
      config.h

@ -1,6 +1,6 @@
/* /*
MicroMDAEPiano MicroMDAEPiano
MicroDexed is a port of the Dexed sound engine MicroDexed is a port of the Dexed sound engine
(https://github.com/asb2m10/dexed) for the Teensy-3.5/3.6 with audio shield. (https://github.com/asb2m10/dexed) for the Teensy-3.5/3.6 with audio shield.
Dexed ist heavily based on https://github.com/google/music-synthesizer-for-android Dexed ist heavily based on https://github.com/google/music-synthesizer-for-android
@ -74,8 +74,8 @@ AudioConnection patchCord1(queue_r, volume_r);
AudioConnection patchCord2(queue_l, volume_l); AudioConnection patchCord2(queue_l, volume_l);
AudioConnection patchCord3(volume_r, peak_r); AudioConnection patchCord3(volume_r, peak_r);
AudioConnection patchCord4(volume_l, peak_l); AudioConnection patchCord4(volume_l, peak_l);
AudioConnection patchCord5(volume_r, 0, pt8211_1, 0); AudioConnection patchCord5(volume_r, 0, pt8211_1, 1);
AudioConnection patchCord6(volume_l, 0, pt8211_1, 1); AudioConnection patchCord6(volume_l, 0, pt8211_1, 0);
#endif #endif
// GUItool: end automatically generated code // GUItool: end automatically generated code
@ -122,6 +122,8 @@ IntervalTimer sched_note_off;
uint8_t _voice_counter = 0; uint8_t _voice_counter = 0;
#endif #endif
enum MDA_EP_PARAM { DECAY, RELEASE, HARDNESS, TREBLE, PAN_TREM, LFO_RATE, VELOCITY_SENSE, STEREO, MAX_POLY, TUNE, DETUNE, OVERDRIVE };
void setup() void setup()
{ {
//while (!Serial) ; // wait for Arduino Serial Monitor //while (!Serial) ; // wait for Arduino Serial Monitor
@ -135,7 +137,7 @@ void setup()
lcd.noAutoscroll(); lcd.noAutoscroll();
lcd.clear(); lcd.clear();
lcd.display(); lcd.display();
lcd.show(0, 0, 20, "MicroMDAEPiano"); lcd.show(0, 0, 20, " MicroMDAEPiano");
lcd.show(1, 0, 16, "(c)parasiTstudio"); lcd.show(1, 0, 16, "(c)parasiTstudio");
enc1.write(INITIAL_ENC1_VALUE); enc1.write(INITIAL_ENC1_VALUE);
#endif #endif
@ -216,22 +218,15 @@ void setup()
sched_note_off.begin(note_off, 6333333); sched_note_off.begin(note_off, 6333333);
#endif #endif
/* ep->setParameter(HARDNESS, 0.7);
0 decay ep->setParameter(TREBLE, 0.85);
1 release ep->setParameter(DETUNE, 0.1);
2 hardness ep->setParameter(VELOCITY_SENSE, 0.2);
3 treble ep->setParameter(STEREO, 0.7);
4 pan_trem ep->setParameter(MAX_POLY, 1.0);
5 lfo_rate ep->setParameter(OVERDRIVE, 0.3);
6 velocity_sense
7 stereo // DECAY,RELEASE,HARDNESS,TREBLE,PAN_TREM,LFO_RATE,VELOCITY_SENSE,STEREO,MAX_POLY,TUNE,DETUNE,OVERDRIVE
8 max_poly
9 tune
10 detune
11 overdrive
*/
//ep->setParameter(11,1.0); // overdrive
//ep->setParameter(10,1.0); // overdrive
Serial.println(F("<setup end>")); Serial.println(F("<setup end>"));
@ -365,10 +360,6 @@ void print_midi_event(uint8_t type, uint8_t data1, uint8_t data2)
Serial.print(data1, DEC); Serial.print(data1, DEC);
Serial.print(F(", data2: ")); Serial.print(F(", data2: "));
Serial.println(data2, DEC); Serial.println(data2, DEC);
#ifndef MASTER_KEY_MIDI
lcd.show(1, 0, 3, data1);
lcd.show(1, 4, 3, data2);
#endif
} }
#endif #endif
#endif #endif

@ -32,17 +32,17 @@
#define MIDI_DEVICE Serial1 #define MIDI_DEVICE Serial1
#define USE_ONBOARD_USB_HOST 1 #define USE_ONBOARD_USB_HOST 1
//#define TEENSY_AUDIO_BOARD 1 //#define TEENSY_AUDIO_BOARD 1
#define VOLUME 0.3 #define VOLUME 0.8
#define DEFAULT_MIDI_CHANNEL MIDI_CHANNEL_OMNI #define DEFAULT_MIDI_CHANNEL MIDI_CHANNEL_OMNI
#define AUDIO_MEM 300 #define AUDIO_MEM 300
#define SAMPLE_RATE 44100 #define SAMPLE_RATE 44100
#define REDUCE_LOUDNESS 1 #define REDUCE_LOUDNESS 0
#if !defined(__MK66FX1M0__) // check for Teensy-3.6 #if !defined(__MK66FX1M0__) // check for Teensy-3.6
#define NVOCIES 11 // No?
#undef USE_ONBOARD_USB_HOST #undef USE_ONBOARD_USB_HOST
#define NVOICES 32
#else #else
#define NVOICES 16 // Yes #define NVOICES 32
#endif #endif
#define USBCON 1 // enabling onboard MIDI via programing connector #define USBCON 1 // enabling onboard MIDI via programing connector
#define MIDI_MERGE_THRU 1 #define MIDI_MERGE_THRU 1
@ -54,7 +54,7 @@
// Debug output // Debug output
#define SERIAL_SPEED 38400 #define SERIAL_SPEED 38400
#define DEBUG 1 #define DEBUG 1
#define SHOW_MIDI_EVENT 1 //#define SHOW_MIDI_EVENT 1
#define SHOW_XRUN 1 #define SHOW_XRUN 1
#define SHOW_CPU_LOAD_MSEC 5000 #define SHOW_CPU_LOAD_MSEC 5000

Loading…
Cancel
Save