|
|
@ -132,6 +132,7 @@ extern uint8_t midi_bpm; |
|
|
|
extern bool save_sys_flag; |
|
|
|
extern bool save_sys_flag; |
|
|
|
extern elapsedMillis save_sys; |
|
|
|
extern elapsedMillis save_sys; |
|
|
|
extern bool save_sys_flag; |
|
|
|
extern bool save_sys_flag; |
|
|
|
|
|
|
|
extern uint8_t midinote_old[NUM_DRUMSET_CONFIG]; |
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
/***********************************************************************
|
|
|
|
GLOBAL |
|
|
|
GLOBAL |
|
|
@ -4427,7 +4428,6 @@ void UI_func_drum_midi_note(uint8_t param) { |
|
|
|
} |
|
|
|
} |
|
|
|
#else |
|
|
|
#else |
|
|
|
static bool display_name; |
|
|
|
static bool display_name; |
|
|
|
static uint8_t midinote_old[NUM_DRUMSET_CONFIG]; |
|
|
|
|
|
|
|
static int8_t ask_before_quit_mode; |
|
|
|
static int8_t ask_before_quit_mode; |
|
|
|
|
|
|
|
|
|
|
|
char tmp_val[4]; |
|
|
|
char tmp_val[4]; |
|
|
@ -4488,8 +4488,10 @@ void UI_func_drum_midi_note(uint8_t param) { |
|
|
|
LCDML.loop_menu(); |
|
|
|
LCDML.loop_menu(); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
if (display_name == true) { |
|
|
|
if (display_name == true) { |
|
|
|
if (active_sample < NUM_DRUMSET_CONFIG - 2) |
|
|
|
if (active_sample < NUM_DRUMSET_CONFIG - 2) { |
|
|
|
|
|
|
|
configuration.drums.midinote[active_sample] = midinote_old[active_sample]; |
|
|
|
active_sample++; |
|
|
|
active_sample++; |
|
|
|
|
|
|
|
} |
|
|
|
} else |
|
|
|
} else |
|
|
|
configuration.drums.midinote[active_sample] = constrain(configuration.drums.midinote[active_sample] + ENCODER[ENC_L].speed(), DRUMS_MIDI_NOTE_MIN, DRUMS_MIDI_NOTE_MAX); |
|
|
|
configuration.drums.midinote[active_sample] = constrain(configuration.drums.midinote[active_sample] + ENCODER[ENC_L].speed(), DRUMS_MIDI_NOTE_MIN, DRUMS_MIDI_NOTE_MAX); |
|
|
|
} |
|
|
|
} |
|
|
@ -4504,8 +4506,10 @@ void UI_func_drum_midi_note(uint8_t param) { |
|
|
|
LCDML.loop_menu(); |
|
|
|
LCDML.loop_menu(); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
if (display_name == true) { |
|
|
|
if (display_name == true) { |
|
|
|
if (active_sample > 0) |
|
|
|
if (active_sample > 0) { |
|
|
|
|
|
|
|
configuration.drums.midinote[active_sample] = midinote_old[active_sample]; |
|
|
|
active_sample--; |
|
|
|
active_sample--; |
|
|
|
|
|
|
|
} |
|
|
|
} else |
|
|
|
} else |
|
|
|
configuration.drums.midinote[active_sample] = constrain(configuration.drums.midinote[active_sample] - ENCODER[ENC_L].speed(), DRUMS_MIDI_NOTE_MIN, DRUMS_MIDI_NOTE_MAX); |
|
|
|
configuration.drums.midinote[active_sample] = constrain(configuration.drums.midinote[active_sample] - ENCODER[ENC_L].speed(), DRUMS_MIDI_NOTE_MIN, DRUMS_MIDI_NOTE_MAX); |
|
|
|
} |
|
|
|
} |
|
|
@ -4533,11 +4537,10 @@ void UI_func_drum_midi_note(uint8_t param) { |
|
|
|
LCDML.OTHER_updateFunc(); |
|
|
|
LCDML.OTHER_updateFunc(); |
|
|
|
LCDML.loop_menu(); |
|
|
|
LCDML.loop_menu(); |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
} else |
|
|
|
display_name = !display_name; |
|
|
|
display_name = !display_name; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (ask_before_quit_mode < 0) { |
|
|
|
if (ask_before_quit_mode < 0) { |
|
|
|
getNoteName(tmp_val, configuration.drums.midinote[active_sample]); |
|
|
|
getNoteName(tmp_val, configuration.drums.midinote[active_sample]); |
|
|
|