Small fixes.

pull/46/head
Holger Wirtz 3 years ago
parent 61eebb1272
commit 758ef64788
  1. 2
      MicroDexed.ino
  2. 2
      UI.hpp
  3. 26
      config.h
  4. 2
      dexed_sd.cpp

@ -282,7 +282,7 @@ extern void getNoteName(char* noteName, uint8_t noteNumber);
SETUP SETUP
***********************************************************************/ ***********************************************************************/
void setup() void setup()
{ {
#ifdef DISPLAY_LCD_SPI #ifdef DISPLAY_LCD_SPI
pinMode(SDCARD_CS_PIN, OUTPUT); pinMode(SDCARD_CS_PIN, OUTPUT);
pinMode(U8X8_CS_PIN, OUTPUT); pinMode(U8X8_CS_PIN, OUTPUT);

@ -5386,7 +5386,7 @@ void UI_func_sysex_send_voice(uint8_t param)
sysex.seek(6 + (voice_number * 128)); sysex.seek(6 + (voice_number * 128));
sysex.read(encoded_voice_data, 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"); lcd.show(1, 0, 16, "Sending Ch");
if (configuration.dexed[selected_instance_id].midi_channel == MIDI_CHANNEL_OMNI) if (configuration.dexed[selected_instance_id].midi_channel == MIDI_CHANNEL_OMNI)

@ -136,21 +136,19 @@
// DELAYTIME // DELAYTIME
#if NUM_DEXED > 1 #if NUM_DEXED > 1
#if defined(TEENSY3_6) # if defined(TEENSY4)
#define DELAY_MAX_TIME 200 # define DELAY_MAX_TIME 500
#elif defined(TEENSY4) # else
#define DELAY_MAX_TIME 500 # define DELAY_MAX_TIME 100
#else # endif
#define DELAY_MAX_TIME 100
#endif
#else #else
#if defined(TEENSY3_6) # if defined(TEENSY3_6)
#define DELAY_MAX_TIME 400 # define DELAY_MAX_TIME 400
#elif defined(TEENSY4) # elif defined(TEENSY4)
#define DELAY_MAX_TIME 1000 # define DELAY_MAX_TIME 1000
#else # else
#define DELAY_MAX_TIME 200 # define DELAY_MAX_TIME 200
#endif # endif
#endif #endif
//************************************************************************************************* //*************************************************************************************************

@ -74,7 +74,7 @@ bool load_sd_voice(uint8_t b, uint8_t v, uint8_t instance_id)
Serial.println(F("]")); Serial.println(F("]"));
#endif #endif
uint8_t tmp_data[156]; 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); MicroDexed[instance_id]->loadVoiceParameters(tmp_data);
#ifdef DEBUG #ifdef DEBUG
show_patch(instance_id); show_patch(instance_id);

Loading…
Cancel
Save