Fix and DEBUG output.

pull/112/head
Holger Wirtz 3 years ago
parent 8ac058fa60
commit 6532d29d85
  1. 8
      MicroDexed.ino
  2. 18
      dexed_sd.cpp

@ -932,6 +932,9 @@ void loop()
******************************************************************************/ ******************************************************************************/
void handleNoteOn(byte inChannel, byte inNumber, byte inVelocity) void handleNoteOn(byte inChannel, byte inNumber, byte inVelocity)
{ {
//
// Drum Sampler
//
#if NUM_DRUMS > 0 #if NUM_DRUMS > 0
if (activesample < 6 && seq.seq_running == false && LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_seq_pattern_editor) ) // live play pitched sample if (activesample < 6 && seq.seq_running == false && LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_seq_pattern_editor) ) // live play pitched sample
{ {
@ -1054,12 +1057,15 @@ void handleNoteOn(byte inChannel, byte inNumber, byte inVelocity)
#endif #endif
} }
//
// E-Piano
//
#if defined(USE_EPIANO) #if defined(USE_EPIANO)
if (configuration.epiano.midi_channel == MIDI_CHANNEL_OMNI || configuration.epiano.midi_channel == inChannel) if (configuration.epiano.midi_channel == MIDI_CHANNEL_OMNI || configuration.epiano.midi_channel == inChannel)
{ {
if (inNumber >= configuration.epiano.lowest_note && inNumber <= configuration.epiano.highest_note) if (inNumber >= configuration.epiano.lowest_note && inNumber <= configuration.epiano.highest_note)
{ {
ep.noteOn(inNumber + configuration.epiano.transpose - 12, inVelocity); ep.noteOn(inNumber + configuration.epiano.transpose, inVelocity);
#ifdef DEBUG #ifdef DEBUG
char note_name[4]; char note_name[4];
getNoteName(note_name, inNumber); getNoteName(note_name, inNumber);

@ -1537,8 +1537,22 @@ void get_sd_performance_name_json(uint8_t number)
for (uint8_t i = 0; i < FILENAME_LEN; i++) { for (uint8_t i = 0; i < FILENAME_LEN; i++) {
seq.seq_name_temp[i] = data_json["seq_name"][i]; seq.seq_name_temp[i] = data_json["seq_name"][i];
} }
#ifdef DEBUG
Serial.print(F("Get performance name for "));
Serial.print(number);
Serial.print(F(": "));
Serial.print(seq.seq_name_temp);
Serial.println();
#endif
} }
#ifdef DEBUG
else
{
Serial.print(F("Cannot get performance name for "));
Serial.print(number);
Serial.println();
}
#endif
} }
} }
} }
@ -1595,7 +1609,7 @@ bool load_sd_seq_sub_vel_json(uint8_t number)
#ifdef DEBUG #ifdef DEBUG
else else
{ {
Serial.print(F("E : Cannot open ")); Serial.print(F("E: Cannot open "));
Serial.print(filename); Serial.print(filename);
Serial.println(F(" on SD.")); Serial.println(F(" on SD."));
} }

Loading…
Cancel
Save