|
|
@ -73,7 +73,7 @@ extern void eeprom_update(void); |
|
|
|
#if NUM_DRUMS > 0 |
|
|
|
#if NUM_DRUMS > 0 |
|
|
|
#include "midinotes.h" |
|
|
|
#include "midinotes.h" |
|
|
|
#include "drumset.h" |
|
|
|
#include "drumset.h" |
|
|
|
extern void get_sd_performance_name_json(uint8_t number,char* name, uint8_t len); |
|
|
|
extern void get_sd_performance_name_json(uint8_t number, char* name, uint8_t len); |
|
|
|
extern bool save_sd_performance_json(uint8_t p); |
|
|
|
extern bool save_sd_performance_json(uint8_t p); |
|
|
|
extern uint8_t drum_midi_channel; |
|
|
|
extern uint8_t drum_midi_channel; |
|
|
|
//extern drum_config_t drum_config[NUM_DRUMSET_CONFIG];
|
|
|
|
//extern drum_config_t drum_config[NUM_DRUMSET_CONFIG];
|
|
|
@ -206,7 +206,7 @@ const uint8_t meter_bar[5][8] = { |
|
|
|
{ B00001, B00001, B00001, B00001, B00001, B00001, B00001, B00001 } |
|
|
|
{ B00001, B00001, B00001, B00001, B00001, B00001, B00001, B00001 } |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
const uint8_t special_chars[22][8] = { |
|
|
|
const uint8_t special_chars[20][8] = { |
|
|
|
{ B11111, B11011, B10011, B11011, B11011, B11011, B11011, B11111 }, // [0] 1 small invers
|
|
|
|
{ B11111, B11011, B10011, B11011, B11011, B11011, B11011, B11111 }, // [0] 1 small invers
|
|
|
|
{ B11111, B11011, B10101, B11101, B11011, B10111, B10001, B11111 }, // [1] 2 small invers
|
|
|
|
{ B11111, B11011, B10101, B11101, B11011, B10111, B10001, B11111 }, // [1] 2 small invers
|
|
|
|
{ B11111, B11011, B10011, B11011, B11011, B11011, B11011, B11111 }, // [2] 1 OP invers
|
|
|
|
{ B11111, B11011, B10011, B11011, B11011, B11011, B11011, B11111 }, // [2] 1 OP invers
|
|
|
@ -226,6 +226,7 @@ const uint8_t special_chars[22][8] = { |
|
|
|
{ B00100, B00110, B00101, B00101, B01101, B11101, B11100, B11000 }, // [16] Note
|
|
|
|
{ B00100, B00110, B00101, B00101, B01101, B11101, B11100, B11000 }, // [16] Note
|
|
|
|
{ B01110, B10001, B10001, B01110, B00100, B00100, B00110, B00110 }, // [17] Disabled 2nd instance symbol
|
|
|
|
{ B01110, B10001, B10001, B01110, B00100, B00100, B00110, B00110 }, // [17] Disabled 2nd instance symbol
|
|
|
|
{ B11111, B10001, B10111, B10001, B10111, B10111, B10111, B11111 }, // [18] Favorites Icon
|
|
|
|
{ B11111, B10001, B10111, B10001, B10111, B10111, B10111, B11111 }, // [18] Favorites Icon
|
|
|
|
|
|
|
|
{ B11111, B10001, B10111, B10001, B10111, B10001, B11111, B00000 } // [19] Edit Icon
|
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
enum { SCROLLBAR, |
|
|
|
enum { SCROLLBAR, |
|
|
@ -5527,6 +5528,8 @@ void UI_func_set_performance_name(uint8_t param) { |
|
|
|
static uint8_t ui_select_name_state; |
|
|
|
static uint8_t ui_select_name_state; |
|
|
|
if (LCDML.FUNC_setup()) // ****** SETUP *********
|
|
|
|
if (LCDML.FUNC_setup()) // ****** SETUP *********
|
|
|
|
{ |
|
|
|
{ |
|
|
|
|
|
|
|
display.createChar(0, (uint8_t*)special_chars[19]); // edit symbol
|
|
|
|
|
|
|
|
|
|
|
|
encoderDir[ENC_R].reset(); |
|
|
|
encoderDir[ENC_R].reset(); |
|
|
|
mode = 0; |
|
|
|
mode = 0; |
|
|
|
display.setCursor(0, 0); |
|
|
|
display.setCursor(0, 0); |
|
|
@ -5573,8 +5576,10 @@ void UI_func_set_performance_name(uint8_t param) { |
|
|
|
display.blink(); |
|
|
|
display.blink(); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (LCDML.FUNC_close()) // ****** STABLE END *********
|
|
|
|
if (LCDML.FUNC_close()) // ****** STABLE END *********
|
|
|
|
{ |
|
|
|
{ |
|
|
|
|
|
|
|
lcd_special_chars(SCROLLBAR); |
|
|
|
encoderDir[ENC_R].reset(); |
|
|
|
encoderDir[ENC_R].reset(); |
|
|
|
display.noBlink(); |
|
|
|
display.noBlink(); |
|
|
|
} |
|
|
|
} |
|
|
@ -6267,7 +6272,7 @@ bool UI_select_name(uint8_t y, uint8_t x, char* edit_string, uint8_t len, bool i |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
edit_mode = !edit_mode; |
|
|
|
edit_mode = !edit_mode; |
|
|
|
display.setCursor(LCD_cols - 1, 0); |
|
|
|
display.setCursor(LCD_cols - 1, 0); |
|
|
|
display.print(F("*")); |
|
|
|
display.write(0); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|