From 758ef64788f6bc893973b6d503432f0d98785e71 Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Thu, 15 Jul 2021 09:55:45 +0200 Subject: [PATCH] Small fixes. --- MicroDexed.ino | 2 +- UI.hpp | 2 +- config.h | 26 ++++++++++++-------------- dexed_sd.cpp | 2 +- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/MicroDexed.ino b/MicroDexed.ino index 2c44451..99fe769 100644 --- a/MicroDexed.ino +++ b/MicroDexed.ino @@ -282,7 +282,7 @@ extern void getNoteName(char* noteName, uint8_t noteNumber); SETUP ***********************************************************************/ void setup() -{ +{ #ifdef DISPLAY_LCD_SPI pinMode(SDCARD_CS_PIN, OUTPUT); pinMode(U8X8_CS_PIN, OUTPUT); diff --git a/UI.hpp b/UI.hpp index 3e27922..f4b87a1 100644 --- a/UI.hpp +++ b/UI.hpp @@ -5386,7 +5386,7 @@ void UI_func_sysex_send_voice(uint8_t param) sysex.seek(6 + (voice_number * 128)); sysex.read(encoded_voice_data, 128); - MicroDexed[selected_instance_id]->decodeVoice(encoded_voice_data, voice_data); + MicroDexed[selected_instance_id]->decodeVoice(voice_data, encoded_voice_data); lcd.show(1, 0, 16, "Sending Ch"); if (configuration.dexed[selected_instance_id].midi_channel == MIDI_CHANNEL_OMNI) diff --git a/config.h b/config.h index 33ada28..0e3ae5e 100644 --- a/config.h +++ b/config.h @@ -136,21 +136,19 @@ // DELAYTIME #if NUM_DEXED > 1 -#if defined(TEENSY3_6) -#define DELAY_MAX_TIME 200 -#elif defined(TEENSY4) -#define DELAY_MAX_TIME 500 -#else -#define DELAY_MAX_TIME 100 -#endif +# if defined(TEENSY4) +# define DELAY_MAX_TIME 500 +# else +# define DELAY_MAX_TIME 100 +# endif #else -#if defined(TEENSY3_6) -#define DELAY_MAX_TIME 400 -#elif defined(TEENSY4) -#define DELAY_MAX_TIME 1000 -#else -#define DELAY_MAX_TIME 200 -#endif +# if defined(TEENSY3_6) +# define DELAY_MAX_TIME 400 +# elif defined(TEENSY4) +# define DELAY_MAX_TIME 1000 +# else +# define DELAY_MAX_TIME 200 +# endif #endif //************************************************************************************************* diff --git a/dexed_sd.cpp b/dexed_sd.cpp index fa1197b..7601c14 100644 --- a/dexed_sd.cpp +++ b/dexed_sd.cpp @@ -74,7 +74,7 @@ bool load_sd_voice(uint8_t b, uint8_t v, uint8_t instance_id) Serial.println(F("]")); #endif uint8_t tmp_data[156]; - bool ret = MicroDexed[instance_id]->decodeVoice(data, tmp_data); + bool ret = MicroDexed[instance_id]->decodeVoice(tmp_data, tmp); MicroDexed[instance_id]->loadVoiceParameters(tmp_data); #ifdef DEBUG show_patch(instance_id);