diff --git a/MicroMDAPiano.ino b/MicroMDAPiano.ino index 3eaf2d2..42378c3 100644 --- a/MicroMDAPiano.ino +++ b/MicroMDAPiano.ino @@ -1,6 +1,6 @@ /* MicroMDAEPiano - + MicroDexed is a port of the Dexed sound engine (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 @@ -74,8 +74,8 @@ AudioConnection patchCord1(queue_r, volume_r); AudioConnection patchCord2(queue_l, volume_l); AudioConnection patchCord3(volume_r, peak_r); AudioConnection patchCord4(volume_l, peak_l); -AudioConnection patchCord5(volume_r, 0, pt8211_1, 0); -AudioConnection patchCord6(volume_l, 0, pt8211_1, 1); +AudioConnection patchCord5(volume_r, 0, pt8211_1, 1); +AudioConnection patchCord6(volume_l, 0, pt8211_1, 0); #endif // GUItool: end automatically generated code @@ -122,6 +122,8 @@ IntervalTimer sched_note_off; uint8_t _voice_counter = 0; #endif +enum MDA_EP_PARAM { DECAY, RELEASE, HARDNESS, TREBLE, PAN_TREM, LFO_RATE, VELOCITY_SENSE, STEREO, MAX_POLY, TUNE, DETUNE, OVERDRIVE }; + void setup() { //while (!Serial) ; // wait for Arduino Serial Monitor @@ -135,7 +137,7 @@ void setup() lcd.noAutoscroll(); lcd.clear(); lcd.display(); - lcd.show(0, 0, 20, "MicroMDAEPiano"); + lcd.show(0, 0, 20, " MicroMDAEPiano"); lcd.show(1, 0, 16, "(c)parasiTstudio"); enc1.write(INITIAL_ENC1_VALUE); #endif @@ -216,22 +218,15 @@ void setup() sched_note_off.begin(note_off, 6333333); #endif -/* -0 decay -1 release -2 hardness -3 treble -4 pan_trem -5 lfo_rate -6 velocity_sense -7 stereo -8 max_poly -9 tune -10 detune -11 overdrive -*/ -//ep->setParameter(11,1.0); // overdrive -//ep->setParameter(10,1.0); // overdrive + ep->setParameter(HARDNESS, 0.7); + ep->setParameter(TREBLE, 0.85); + ep->setParameter(DETUNE, 0.1); + ep->setParameter(VELOCITY_SENSE, 0.2); + ep->setParameter(STEREO, 0.7); + ep->setParameter(MAX_POLY, 1.0); + ep->setParameter(OVERDRIVE, 0.3); + + // DECAY,RELEASE,HARDNESS,TREBLE,PAN_TREM,LFO_RATE,VELOCITY_SENSE,STEREO,MAX_POLY,TUNE,DETUNE,OVERDRIVE Serial.println(F("")); @@ -365,10 +360,6 @@ void print_midi_event(uint8_t type, uint8_t data1, uint8_t data2) Serial.print(data1, DEC); Serial.print(F(", data2: ")); Serial.println(data2, DEC); -#ifndef MASTER_KEY_MIDI - lcd.show(1, 0, 3, data1); - lcd.show(1, 4, 3, data2); -#endif } #endif #endif diff --git a/config.h b/config.h index 6b23591..e3cf7a1 100644 --- a/config.h +++ b/config.h @@ -32,17 +32,17 @@ #define MIDI_DEVICE Serial1 #define USE_ONBOARD_USB_HOST 1 //#define TEENSY_AUDIO_BOARD 1 -#define VOLUME 0.3 +#define VOLUME 0.8 #define DEFAULT_MIDI_CHANNEL MIDI_CHANNEL_OMNI #define AUDIO_MEM 300 #define SAMPLE_RATE 44100 -#define REDUCE_LOUDNESS 1 +#define REDUCE_LOUDNESS 0 #if !defined(__MK66FX1M0__) // check for Teensy-3.6 -#define NVOCIES 11 // No? #undef USE_ONBOARD_USB_HOST +#define NVOICES 32 #else -#define NVOICES 16 // Yes +#define NVOICES 32 #endif #define USBCON 1 // enabling onboard MIDI via programing connector #define MIDI_MERGE_THRU 1 @@ -54,7 +54,7 @@ // Debug output #define SERIAL_SPEED 38400 #define DEBUG 1 -#define SHOW_MIDI_EVENT 1 +//#define SHOW_MIDI_EVENT 1 #define SHOW_XRUN 1 #define SHOW_CPU_LOAD_MSEC 5000