From 19c72a99bb5250203579c475a9d0e6a8ecde726f Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Sun, 5 Feb 2023 18:40:00 +0100 Subject: [PATCH] Small fix for displaying drums notes and names in MIDI note mode. --- UI.hpp | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/UI.hpp b/UI.hpp index 976adbd..ba7f6e2 100644 --- a/UI.hpp +++ b/UI.hpp @@ -4380,17 +4380,12 @@ void UI_func_drum_midi_note(uint8_t param) { else midi_learn_mode = MIDI_LEARN_MODE_ON; - memset(tmp_name, ' ', 8); + getNoteName(tmp_val, configuration.drums.midinote[active_sample]); strlcpy(tmp_name, drum_config[active_sample].name, sizeof(drum_config[active_sample].name)); - tmp_name[8] = '\0'; - display.setCursor(0, 0); display.print(F("MIDI Note")); - display.setCursor(1, 1); - display.print(tmp_name); - display.setCursor(LCD_cols - 4, 1); - getNoteName(tmp_val, configuration.drums.midinote[active_sample]); - display.print(tmp_val); + display.show(1, 1, 8, tmp_name); + display.show(1, LCD_cols - strlen(tmp_val) - 1, strlen(tmp_val), tmp_val); _check_display_name(display_name, 3); } @@ -4420,17 +4415,13 @@ void UI_func_drum_midi_note(uint8_t param) { } getNoteName(tmp_val, configuration.drums.midinote[active_sample]); + strlcpy(tmp_name, drum_config[active_sample].name, sizeof(drum_config[active_sample].name)); + display.show(1, 1, 8, tmp_name); + display.show(1, LCD_cols - strlen(tmp_val) - 1, strlen(tmp_val), tmp_val); + #ifdef DEBUG Serial.printf("Drum midinote for active_sample=%d [%s]=%d (%s)\n", active_sample, drum_config[active_sample].name, configuration.drums.midinote[active_sample], tmp_val); #endif - memset(tmp_name, ' ', 8); - strlcpy(tmp_name, drum_config[active_sample].name, sizeof(drum_config[active_sample].name)); - tmp_name[8] = '\0'; - - display.setCursor(1, 1); - display.print(tmp_name); - display.setCursor(LCD_cols - 4, 1); - display.print(tmp_val); _check_display_name(display_name, 3); if (!display_name)