Fixes for bank selection between 0 and 99.

pull/4/head
Holger Wirtz 6 years ago
parent df888cf2f8
commit 187f178a19
  1. 4
      MicroDexed.ino
  2. 11
      UI.cpp
  3. BIN
      addon/SD/0/sonus1.syx
  4. 6
      config.h

@ -432,13 +432,13 @@ bool handle_master_key(uint8_t data)
if (get_voice_names_from_bank(bank)) if (get_voice_names_from_bank(bank))
{ {
strip_extension(bank_names[bank], bank_name); strip_extension(bank_names[bank], bank_name);
lcd.show(0, 0, 2, bank + 1); lcd.show(0, 0, 2, bank);
lcd.show(0, 2, 1, " "); lcd.show(0, 2, 1, " ");
lcd.show(0, 3, 10, bank_name); lcd.show(0, 3, 10, bank_name);
} }
else else
{ {
lcd.show(0, 0, 2, bank + 1); lcd.show(0, 0, 2, bank);
lcd.show(0, 2, 10, " *ERROR*"); lcd.show(0, 2, 10, " *ERROR*");
} }
#endif #endif

@ -177,9 +177,12 @@ void handle_ui(void)
void ui_show_main(void) void ui_show_main(void)
{ {
ui_state = UI_MAIN; if (ui_state != UI_MAIN)
{
lcd.clear();
}
lcd.show(0, 0, 2, bank + 1); lcd.show(0, 0, 2, bank);
lcd.show(0, 2, 1, " "); lcd.show(0, 2, 1, " ");
strip_extension(bank_names[bank], bank_name); strip_extension(bank_names[bank], bank_name);
@ -222,6 +225,8 @@ void ui_show_main(void)
lcd.show(1, 3, 10, voice_names[voice]); lcd.show(1, 3, 10, voice_names[voice]);
lcd.show(1, 14, 1, " "); lcd.show(1, 14, 1, " ");
} }
ui_state = UI_MAIN;
} }
void ui_show_midichannel(void) void ui_show_midichannel(void)
@ -242,6 +247,7 @@ void ui_show_midichannel(void)
if (midi_channel == 1) if (midi_channel == 1)
lcd.show(1, 2, 2, " "); lcd.show(1, 2, 2, " ");
} }
ui_state = UI_MIDICHANNEL; ui_state = UI_MIDICHANNEL;
} }
@ -270,6 +276,7 @@ void ui_show_volume(void)
lcd.show(1, i, 1, " "); lcd.show(1, i, 1, " ");
} }
} }
ui_state = UI_VOLUME; ui_state = UI_VOLUME;
} }
#endif #endif

Binary file not shown.

@ -47,7 +47,7 @@
#define AUDIO_MEM 80 #define AUDIO_MEM 80
#endif #endif
#define SAMPLE_RATE 44100 #define SAMPLE_RATE 44100
#define MAX_BANKS 99 #define MAX_BANKS 100
#define MAX_VOICES 32 // voices per bank #define MAX_VOICES 32 // voices per bank
#define BANK_NAME_LEN 13 // FAT12 filenames (plus '\0') #define BANK_NAME_LEN 13 // FAT12 filenames (plus '\0')
#define VOICE_NAME_LEN 11 // 10 (plus '\0') #define VOICE_NAME_LEN 11 // 10 (plus '\0')
@ -65,7 +65,7 @@
// Debug output // Debug output
#define SERIAL_SPEED 38400 #define SERIAL_SPEED 38400
#define DEBUG 1 //#define DEBUG 1
#define SHOW_MIDI_EVENT 1 #define SHOW_MIDI_EVENT 1
#define SHOW_XRUN 1 #define SHOW_XRUN 1
#define SHOW_CPU_LOAD_MSEC 5000 #define SHOW_CPU_LOAD_MSEC 5000
@ -95,7 +95,7 @@
#define LCD_I2C_ADDRESS 0x27 #define LCD_I2C_ADDRESS 0x27
#define LCD_CHARS 16 #define LCD_CHARS 16
#define LCD_LINES 2 #define LCD_LINES 2
#define UI_AUTO_BACK_MS 2000 #define UI_AUTO_BACK_MS 3000
#define AUTOSTORE_MS 5000 #define AUTOSTORE_MS 5000
// Encoder with button // Encoder with button

Loading…
Cancel
Save