wirtz
/
MicroDexed
mirror of https://codeberg.org/dcoredump/MicroDexed.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Added checking for midi channel when midi learning is activated.

Browse Source
dev
Holger Wirtz 2 years ago
parent a6b4e56048
commit acc4740ff8
1 changed files with 19 additions and 12 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 31
      MicroDexed.ino

31
MicroDexed.ino
Unescape View File

@ -908,16 +908,23 @@ void handleNoteOn(byte inChannel, byte inNumber, byte inVelocity) {
// check for MIDI learn mode // check for MIDI learn mode
if (midi_learn_var != NULL) { if (midi_learn_var != NULL) {
*midi_learn_var = inNumber; *midi_learn_var = inNumber;
if (LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_drum_midi_note)) if (LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_drum_midi_note) && inChannel == configuration.drums.drum_midi_channel)
LCDML.OTHER_jumpToFunc(UI_func_drum_midi_note); LCDML.OTHER_jumpToFunc(UI_func_drum_midi_note);
else if (LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_lowest_note)) { else {
if (inNumber > configuration.dexed[selected_instance_id].highest_note) for (uint8_t instance_id = 0; instance_id < NUM_DEXED; instance_id++) {
configuration.dexed[selected_instance_id].highest_note = inNumber; if (inChannel == configuration.dexed[selected_instance_id].midi_channel) {
LCDML.OTHER_jumpToFunc(UI_func_lowest_note); if (LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_lowest_note)) {
} else if (LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_highest_note)) if (inNumber > configuration.dexed[selected_instance_id].highest_note)
if (inNumber < configuration.dexed[selected_instance_id].lowest_note) configuration.dexed[selected_instance_id].highest_note = inNumber;
configuration.dexed[selected_instance_id].lowest_note = inNumber; LCDML.OTHER_jumpToFunc(UI_func_lowest_note);
LCDML.OTHER_jumpToFunc(UI_func_highest_note); } else if (LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_highest_note)) {
if (inNumber < configuration.dexed[selected_instance_id].lowest_note)
configuration.dexed[selected_instance_id].lowest_note = inNumber;
LCDML.OTHER_jumpToFunc(UI_func_highest_note);
}
}
}
}
} }
// Check for MicroDexed // Check for MicroDexed
@ -1006,9 +1013,9 @@ void handleNoteOn(byte inChannel, byte inNumber, byte inVelocity) {
} }
#endif #endif
// //
// E-Piano // 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) {

Write Preview
Loading…
Cancel
Save