From 187f178a1996c4215088cc7857ac248486384fbd Mon Sep 17 00:00:00 2001
From: Holger Wirtz <wirtz@parasitstudio.de>
Date: Tue, 2 Oct 2018 14:11:08 +0200
Subject: [PATCH] Fixes for bank selection between 0 and 99.

---
 MicroDexed.ino        |   4 ++--
 UI.cpp                |  11 +++++++++--
 addon/SD/0/sonus1.syx | Bin 0 -> 4104 bytes
 config.h              |   6 +++---
 4 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 addon/SD/0/sonus1.syx

diff --git a/MicroDexed.ino b/MicroDexed.ino
index 9d9b323..a7fd540 100644
--- a/MicroDexed.ino
+++ b/MicroDexed.ino
@@ -432,13 +432,13 @@ bool handle_master_key(uint8_t data)
       if (get_voice_names_from_bank(bank))
       {
         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, 3, 10, bank_name);
       }
       else
       {
-        lcd.show(0, 0, 2, bank + 1);
+        lcd.show(0, 0, 2, bank);
         lcd.show(0, 2, 10, " *ERROR*");
       }
 #endif
diff --git a/UI.cpp b/UI.cpp
index 694f104..d4b1dbd 100644
--- a/UI.cpp
+++ b/UI.cpp
@@ -177,9 +177,12 @@ void handle_ui(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, " ");
   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, 14, 1, " ");
   }
+
+  ui_state = UI_MAIN;
 }
 
 void ui_show_midichannel(void)
@@ -242,6 +247,7 @@ void ui_show_midichannel(void)
     if (midi_channel == 1)
       lcd.show(1, 2, 2, "  ");
   }
+  
   ui_state = UI_MIDICHANNEL;
 }
 
@@ -270,6 +276,7 @@ void ui_show_volume(void)
         lcd.show(1, i, 1, " ");
     }
   }
+  
   ui_state = UI_VOLUME;
 }
 #endif
diff --git a/addon/SD/0/sonus1.syx b/addon/SD/0/sonus1.syx
new file mode 100644
index 0000000000000000000000000000000000000000..3b2ae0a2195a7ffc76ff215db284d434b5c74799
GIT binary patch
literal 4104
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
J+x1s}`yDp{y>b8m

literal 0
HcmV?d00001

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