diff --git a/Disp_Plus.h b/Disp_Plus.h index 851c044..cc5bd90 100644 --- a/Disp_Plus.h +++ b/Disp_Plus.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/4.x/4.x with audio shield. Dexed ist heavily based on https://github.com/google/music-synthesizer-for-android (c)2018 H. Wirtz diff --git a/MicroDexed.ino b/MicroDexed.ino index 1a3b21d..28c15ae 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/4.x/4.x with audio shield. Dexed ist heavily based on https://github.com/google/music-synthesizer-for-android (c)2018-2020 H. Wirtz @@ -371,7 +371,6 @@ void setup() { // load default SYSEX data load_sd_voice(configuration.performance.bank[instance_id], configuration.performance.voice[instance_id], instance_id); - memset(g_voice_name[instance_id], 0, VOICE_NAME_LEN); memset(g_bank_name[instance_id], 0, BANK_NAME_LEN); memset(receive_bank_filename, 0, FILENAME_LEN); diff --git a/UI.hpp b/UI.hpp index 9a95d76..b2c71b7 100644 --- a/UI.hpp +++ b/UI.hpp @@ -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/4.x with audio shield. Dexed ist heavily based on https://github.com/google/music-synthesizer-for-android (c)2018-2020 H. Wirtz @@ -91,7 +91,6 @@ extern AudioAnalyzePeak master_peak_l; extern char sd_string[LCD_cols + 1]; extern char g_voice_name[NUM_DEXED][VOICE_NAME_LEN]; extern char g_bank_name[NUM_DEXED][BANK_NAME_LEN]; -extern char receive_bank_filename[FILENAME_LEN]; /*********************************************************************** GLOBAL @@ -166,7 +165,7 @@ const uint8_t inverse_num[8][8] = { {B11111, B10001, B11101, B11011, B11101, B10101, B11011, B11111}, // 3 OP invers {B11111, B10111, B10111, B10101, B10001, B11101, B11101, B11111}, // 4 OP invers {B11111, B10001, B10111, B10011, B11101, B11101, B10011, B11111}, // 5 OP invers - {B11111, B11011, B10101, B10011, B10101, B10101, B11011, B11111} // 6 OP invers + {B11111, B11001, B10111, B10011, B10101, B10101, B11011, B11111} // 6 OP invers }; enum { SCROLLBAR, BLOCKBAR, METERBAR }; @@ -446,7 +445,6 @@ void setup_ui(void) lcd.print(F("(c)parasiTstudio")); lcd_special_chars(SCROLLBAR); - // LCDMenuLib Setup LCDML_setup(_LCDML_DISP_cnt); // Enable Menu Rollover @@ -3477,6 +3475,7 @@ void UI_handle_OP(uint8_t param) if (LCDML.FUNC_close()) // ****** STABLE END ********* { + lcd.noBlink(); lcd.noCursor(); lcd_special_chars(SCROLLBAR); diff --git a/UI_FX.h b/UI_FX.h index e823557..a72dbd9 100644 --- a/UI_FX.h +++ b/UI_FX.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/4.x with audio shield. Dexed ist heavily based on https://github.com/google/music-synthesizer-for-android (c)2018-2020 H. Wirtz diff --git a/UI_NO_FX.h b/UI_NO_FX.h index aa89a09..29f8dc2 100644 --- a/UI_NO_FX.h +++ b/UI_NO_FX.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/4.x with audio shield. Dexed ist heavily based on https://github.com/google/music-synthesizer-for-android (c)2018-2020 H. Wirtz diff --git a/config.h b/config.h index c3c9536..a2e148a 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/4.x with audio shield. Dexed ist heavily based on https://github.com/google/music-synthesizer-for-android (c)2018-2020 H. Wirtz @@ -47,7 +47,7 @@ // amidi -p hw:2,0,0 -d -r /tmp/bkup1.syx // -#define VERSION "0.9.9f" +#define VERSION "0.9.9g" //************************************************************************************************* //* DEVICE SETTINGS diff --git a/dexed.cpp b/dexed.cpp index 971c3f6..b1725f2 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/4.x with audio shield. Dexed ist heavily based on https://github.com/google/music-synthesizer-for-android (c)2018-2020 H. Wirtz @@ -397,19 +397,18 @@ bool Dexed::getSustain(void) void Dexed::panic(void) { - AudioNoInterrupts(); for (uint8_t i = 0; i < MAX_ACTIVE_NOTES; i++) { if (voices[i].live == true) { voices[i].keydown = false; voices[i].live = false; voices[i].sustained = false; + voices[i].key_pressed_timer = 0; if ( voices[i].dx7_note != NULL ) { voices[i].dx7_note->oscSync(); } } } - AudioInterrupts(); } void Dexed::resetControllers(void) @@ -563,7 +562,6 @@ bool Dexed::decodeVoice(uint8_t* encoded_data) *(p_data + DEXED_VOICE_OFFSET + DEXED_LFO_SYNC) = (tmp & 0x01); *(p_data + DEXED_VOICE_OFFSET + DEXED_TRANSPOSE) = encoded_data[117]; memcpy(&data[DEXED_VOICE_OFFSET + DEXED_NAME], &encoded_data[118], 10); - panic(); doRefreshVoice(); //activate(); diff --git a/dexed.h b/dexed.h index 7544a6c..7edef95 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/4.x with audio shield. Dexed ist heavily based on https://github.com/google/music-synthesizer-for-android (c)2018-2020 H. Wirtz diff --git a/dexed_sd.cpp b/dexed_sd.cpp index 5d5eeb3..ea14ead 100644 --- a/dexed_sd.cpp +++ b/dexed_sd.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/4.x with audio shield. Dexed ist heavily based on https://github.com/google/music-synthesizer-for-android (c)2018-2020 H. Wirtz diff --git a/dexed_sd.h b/dexed_sd.h index 9ed47ec..655dd4e 100644 --- a/dexed_sd.h +++ b/dexed_sd.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/4.x with audio shield. Dexed ist heavily based on https://github.com/google/music-synthesizer-for-android (c)2018-2020 H. Wirtz diff --git a/midi_devices.hpp b/midi_devices.hpp index f4f2cff..2a10971 100644 --- a/midi_devices.hpp +++ b/midi_devices.hpp @@ -2,7 +2,7 @@ MicroDexed MicroMDAEPiano is a port of the MDA-EPiano sound engine - (https://sourceforge.net/projects/mda-vst/) for the Teensy-3.5/3.6 with audio shield. + (https://sourceforge.net/projects/mda-vst/) for the Teensy-3.5/3.6/4.x with audio shield. (c)2019-2020 H. Wirtz