diff --git a/MicroDexed.ino b/MicroDexed.ino index 1434303..98e4728 100644 --- a/MicroDexed.ino +++ b/MicroDexed.ino @@ -2,7 +2,7 @@ MicroDexed 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 (c)2018 H. Wirtz @@ -34,10 +34,10 @@ #ifdef USE_ONBOARD_USB_HOST #include #endif -#ifndef MASTER_KEY_MIDI // selecting sounds by encoder and display +#ifndef MASTER_KEY_MIDI // selecting sounds by encoder, button and display #include #include -//#include +#include #endif #ifndef MASTER_KEY_MIDI @@ -45,7 +45,7 @@ #define LCD_I2C_ADDRESS 0x3f #define LCD_CHARS 20 #define LCD_LINES 4 -//LiquidCrystalPlus_I2C lcd(LCD_I2C_ADDRESS, LCD_CHARS, LCD_LINES); +LiquidCrystalPlus_I2C lcd(LCD_I2C_ADDRESS, LCD_CHARS, LCD_LINES); Encoder enc1(ENC1_PIN_A, ENC1_PIN_B); Bounce but1 = Bounce(BUT1_PIN, 10); // 10 ms debounce #endif @@ -92,16 +92,16 @@ void setup() //while (!Serial) ; // wait for Arduino Serial Monitor Serial.begin(SERIAL_SPEED); delay(200); - + #ifndef MASTER_KEY_MIDI - // lcd.init(); - // lcd.blink_off(); - // lcd.cursor_off(); - // lcd.backlight(); - // lcd.noAutoscroll(); - // lcd.clear(); - // lcd.display(); - // lcd.show(0, 0, 20, "MicroDexed"); + lcd.init(); + lcd.blink_off(); + lcd.cursor_off(); + lcd.backlight(); + lcd.noAutoscroll(); + lcd.clear(); + lcd.display(); + lcd.show(0, 0, 20, "MicroDexed"); enc1.write(INITIAL_ENC1_VALUE); #endif @@ -164,7 +164,7 @@ void setup() Serial.println(F("")); #if defined (DEBUG) && defined (SHOW_CPU_LOAD_MSEC) show_cpu_and_mem_usage(); - cpu_mem_millis=0; + cpu_mem_millis = 0; #endif #ifdef TEST_NOTE diff --git a/README.md b/README.md index c7ba864..0b4cca1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MicroDexed ## Dexed port for Teensy (3.5/3.6 with audio shield) -This is a port of the original Dexed/msfa engine (see https://github.com/asb2m10/dexed) to be used on a Teensy-3.5 or Teensy-3.6. +This is a port of the original Dexed/msfa engine (see https://github.com/asb2m10/dexed and https://github.com/google/music-synthesizer-for-android) to be used on a Teensy-3.5 or Teensy-3.6. The current state is: work in progress... diff --git a/config.h b/config.h index ee8d9f0..6eb0042 100644 --- a/config.h +++ b/config.h @@ -2,7 +2,7 @@ MicroDexed 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 (c)2018 H. Wirtz @@ -27,7 +27,7 @@ // Initial values #define MIDI_DEVICE Serial1 #define USE_ONBOARD_USB_HOST 1 -#define VOLUME 0.2 +#define VOLUME 0.8 #define SAMPLE_RATE 44100 #define DEFAULT_MIDI_CHANNEL MIDI_CHANNEL_OMNI #define DEFAULT_SYSEXBANK 0 diff --git a/dexed.cpp b/dexed.cpp index 9539320..4373644 100644 --- a/dexed.cpp +++ b/dexed.cpp @@ -2,7 +2,7 @@ MicroDexed 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 (c)2018 H. Wirtz diff --git a/dexed.h b/dexed.h index 2e87b36..6419d2b 100644 --- a/dexed.h +++ b/dexed.h @@ -2,7 +2,7 @@ MicroDexed 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 (c)2018 H. Wirtz diff --git a/dexed_sysex.cpp b/dexed_sysex.cpp index fc0bada..f758e96 100644 --- a/dexed_sysex.cpp +++ b/dexed_sysex.cpp @@ -2,7 +2,7 @@ MicroDexed 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 (c)2018 H. Wirtz diff --git a/dexed_sysex.h b/dexed_sysex.h index eaf4d89..70f460e 100644 --- a/dexed_sysex.h +++ b/dexed_sysex.h @@ -2,7 +2,7 @@ MicroDexed 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 (c)2018 H. Wirtz