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

Fixed issue #30: UI screens for selecting voice/bank are inconsistent

Browse Source
pull/32/head
Holger Wirtz 4 years ago
parent 617a1095c3
commit 620577833c
1 changed files with 17 additions and 15 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. 32
      UI.hpp

32
UI.hpp
Unescape View File

@ -2041,7 +2041,7 @@ void UI_func_polyphony(uint8_t param)
{ {
if (LCDML.BT_checkDown()) if (LCDML.BT_checkDown())
{ {
configuration.dexed[selected_instance_id].polyphony = constrain(configuration.dexed[selected_instance_id].polyphony + 1, POLYPHONY_MIN, POLYPHONY_MAX); configuration.dexed[selected_instance_id].polyphony = constrain(configuration.dexed[selected_instance_id].polyphony + 1, POLYPHONY_MIN, POLYPHONY_MAX);
} }
else if (LCDML.BT_checkUp()) else if (LCDML.BT_checkUp())
{ {
@ -3529,7 +3529,7 @@ void UI_func_velocity_level(uint8_t param)
lcd_special_chars(BLOCKBAR); lcd_special_chars(BLOCKBAR);
lcd_display_bar_int("Velocity Lvl", configuration.dexed[selected_instance_id].velocity_level, 1.0, VELOCITY_LEVEL_MIN, VELOCITY_LEVEL_MAX, 3, false, false, true); lcd_display_bar_int("Velocity Lvl", configuration.dexed[selected_instance_id].velocity_level, 1.0, VELOCITY_LEVEL_MIN, VELOCITY_LEVEL_MAX, 3, false, false, true);
lcd_active_instance_number(selected_instance_id); lcd_active_instance_number(selected_instance_id);
lcd.setCursor(14, 0); lcd.setCursor(14, 0);
lcd.write(0); lcd.write(0);
@ -4731,12 +4731,14 @@ void UI_func_sysex_receive_bank(uint8_t param)
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
lcd.print(F("MIDI Recv Bank")); lcd.print(F("MIDI Recv Bank"));
lcd.setCursor(0, 1); lcd.setCursor(3, 1);
lcd.print(F("[ ]")); lcd.print(F("["));
lcd.setCursor(15, 1);
lcd.print(F("]"));
if (!get_bank_name(configuration.performance.bank[selected_instance_id], receive_bank_filename, sizeof(receive_bank_filename))) if (!get_bank_name(configuration.performance.bank[selected_instance_id], receive_bank_filename, sizeof(receive_bank_filename)))
strcpy(receive_bank_filename, "*ERROR*"); strcpy(receive_bank_filename, "*ERROR*");
lcd.show(1, 1, 2, bank_number); lcd.show(1, 0, 2, bank_number);
lcd.show(1, 5, 10, receive_bank_filename); lcd.show(1, 4, 10, receive_bank_filename);
} }
if (LCDML.FUNC_loop()) // ****** LOOP ********* if (LCDML.FUNC_loop()) // ****** LOOP *********
@ -4751,7 +4753,7 @@ void UI_func_sysex_receive_bank(uint8_t param)
bank_number = constrain(bank_number + ENCODER[ENC_R].speed(), 0, MAX_BANKS - 1); bank_number = constrain(bank_number + ENCODER[ENC_R].speed(), 0, MAX_BANKS - 1);
if (!get_bank_name(bank_number, receive_bank_filename, sizeof(receive_bank_filename))) if (!get_bank_name(bank_number, receive_bank_filename, sizeof(receive_bank_filename)))
strcpy(receive_bank_filename, "*ERROR*"); strcpy(receive_bank_filename, "*ERROR*");
lcd.show(1, 1, 2, bank_number); lcd.show(1, 0, 2, bank_number);
lcd.show(1, 5, 10, receive_bank_filename); lcd.show(1, 5, 10, receive_bank_filename);
break; break;
case 1: case 1:
@ -4774,8 +4776,8 @@ void UI_func_sysex_receive_bank(uint8_t param)
bank_number = constrain(bank_number - ENCODER[ENC_R].speed(), 0, MAX_BANKS - 1); bank_number = constrain(bank_number - ENCODER[ENC_R].speed(), 0, MAX_BANKS - 1);
if (!get_bank_name(bank_number, receive_bank_filename, sizeof(receive_bank_filename))) if (!get_bank_name(bank_number, receive_bank_filename, sizeof(receive_bank_filename)))
strcpy(receive_bank_filename, "*ERROR*"); strcpy(receive_bank_filename, "*ERROR*");
lcd.show(1, 1, 2, bank_number); lcd.show(1, 0, 2, bank_number);
lcd.show(1, 5, 10, receive_bank_filename); lcd.show(1, 4, 10, receive_bank_filename);
break; break;
case 1: case 1:
yesno = !yesno; yesno = !yesno;
@ -4893,10 +4895,10 @@ void UI_func_sysex_send_bank(uint8_t param)
lcd.print(F("MIDI Send Bank")); lcd.print(F("MIDI Send Bank"));
if (!get_bank_name(configuration.performance.bank[selected_instance_id], bank_name, sizeof(bank_name))) if (!get_bank_name(configuration.performance.bank[selected_instance_id], bank_name, sizeof(bank_name)))
strncpy(bank_name, "*ERROR*", sizeof(bank_name)); strncpy(bank_name, "*ERROR*", sizeof(bank_name));
lcd.show(1, 0, 1, "["); lcd.show(1, 3, 1, "[");
lcd.show(1, 3, 1, "]"); lcd.show(1, 15, 1, "]");
lcd.show(1, 1, 2, configuration.performance.bank[selected_instance_id]); lcd.show(1, 0, 2, configuration.performance.bank[selected_instance_id]);
lcd.show(1, 5, 10, bank_name); lcd.show(1, 4, 10, bank_name);
} }
if (LCDML.FUNC_loop()) // ****** LOOP ********* if (LCDML.FUNC_loop()) // ****** LOOP *********
@ -4914,8 +4916,8 @@ void UI_func_sysex_send_bank(uint8_t param)
} }
if (!get_bank_name(bank_number, bank_name, sizeof(bank_name))) if (!get_bank_name(bank_number, bank_name, sizeof(bank_name)))
strcpy(bank_name, "*ERROR*"); strcpy(bank_name, "*ERROR*");
lcd.show(1, 1, 2, bank_number); lcd.show(1, 0, 2, bank_number);
lcd.show(1, 5, 10, bank_name); lcd.show(1, 4, 10, bank_name);
} }
else if (LCDML.BT_checkEnter() && encoderDir[ENC_R].ButtonShort()) else if (LCDML.BT_checkEnter() && encoderDir[ENC_R].ButtonShort())
{ {

Write Preview
Loading…
Cancel
Save