From 10f75c8a6118a8495979f624ef520774302ec229 Mon Sep 17 00:00:00 2001
From: Holger Wirtz <dcoredump@googlemail.com>
Date: Sun, 1 Mar 2020 15:53:44 +0100
Subject: [PATCH] Small fixes.

---
 MicroDexed.ino | 16 ++++++++--------
 UI.hpp         | 43 +++++++++++++++++++++++--------------------
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/MicroDexed.ino b/MicroDexed.ino
index e009561..a93bd5a 100644
--- a/MicroDexed.ino
+++ b/MicroDexed.ino
@@ -968,35 +968,35 @@ void handleSystemExclusive(byte * sysex, uint len)
             MicroDexed[instance_id]->setPortamentoMode(configuration.dexed[instance_id].portamento_mode, configuration.dexed[instance_id].portamento_glissando, configuration.dexed[instance_id].portamento_time);
             break;
           case 70:
-            configuration.dexed[instance_id].mw_range = constrain(sysex[4], MW_RANGE_MIN, MW_RANGE_MIN);
+            configuration.dexed[instance_id].mw_range = constrain(sysex[4], MW_RANGE_MIN, MW_RANGE_MAX);
             MicroDexed[instance_id]->controllers.wheel.setRange(configuration.dexed[instance_id].mw_range);
             break;
           case 71:
-            configuration.dexed[instance_id].mw_assign = constrain(sysex[4], MW_ASSIGN_MIN, MW_ASSIGN_MIN);
+            configuration.dexed[instance_id].mw_assign = constrain(sysex[4], MW_ASSIGN_MIN, MW_ASSIGN_MAX);
             MicroDexed[instance_id]->controllers.wheel.setTarget(configuration.dexed[instance_id].mw_assign);
             break;
           case 72:
-            configuration.dexed[instance_id].fc_range = constrain(sysex[4], FC_RANGE_MIN, FC_RANGE_MIN);
+            configuration.dexed[instance_id].fc_range = constrain(sysex[4], FC_RANGE_MIN, FC_RANGE_MAX);
             MicroDexed[instance_id]->controllers.foot.setRange(configuration.dexed[instance_id].fc_range);
             break;
           case 73:
-            configuration.dexed[instance_id].fc_assign = constrain(sysex[4], FC_ASSIGN_MIN, FC_ASSIGN_MIN);
+            configuration.dexed[instance_id].fc_assign = constrain(sysex[4], FC_ASSIGN_MIN, FC_ASSIGN_MAX);
             MicroDexed[instance_id]->controllers.foot.setTarget(configuration.dexed[instance_id].fc_assign);
             break;
           case 74:
-            configuration.dexed[instance_id].bc_range = constrain(sysex[4], BC_RANGE_MIN, BC_RANGE_MIN);
+            configuration.dexed[instance_id].bc_range = constrain(sysex[4], BC_RANGE_MIN, BC_RANGE_MAX);
             MicroDexed[instance_id]->controllers.breath.setRange(configuration.dexed[instance_id].bc_range);
             break;
           case 75:
-            configuration.dexed[instance_id].bc_assign = constrain(sysex[4], BC_ASSIGN_MIN, BC_ASSIGN_MIN);
+            configuration.dexed[instance_id].bc_assign = constrain(sysex[4], BC_ASSIGN_MIN, BC_ASSIGN_MAX);
             MicroDexed[instance_id]->controllers.breath.setTarget(configuration.dexed[instance_id].bc_assign);
             break;
           case 76:
-            configuration.dexed[instance_id].at_range = constrain(sysex[4], AT_RANGE_MIN, AT_RANGE_MIN);
+            configuration.dexed[instance_id].at_range = constrain(sysex[4], AT_RANGE_MIN, AT_RANGE_MAX);
             MicroDexed[instance_id]->controllers.at.setRange(configuration.dexed[instance_id].at_range);
             break;
           case 77:
-            configuration.dexed[instance_id].at_assign = constrain(sysex[4], AT_ASSIGN_MIN, AT_ASSIGN_MIN);
+            configuration.dexed[instance_id].at_assign = constrain(sysex[4], AT_ASSIGN_MIN, AT_ASSIGN_MAX);
             MicroDexed[instance_id]->controllers.at.setTarget(configuration.dexed[instance_id].at_assign);
             break;
           default:
diff --git a/UI.hpp b/UI.hpp
index eb12932..33eef72 100644
--- a/UI.hpp
+++ b/UI.hpp
@@ -1629,7 +1629,7 @@ void UI_func_transpose(uint8_t param)
     }
 
     lcd.setCursor(0, 1);
-    lcd_display_int(configuration.dexed[instance_id].transpose-24, 1, false, true, true);
+    lcd_display_int(configuration.dexed[instance_id].transpose - 24, 1, false, true, true);
   }
 
   if (LCDML.FUNC_close())     // ****** STABLE END *********
@@ -3087,25 +3087,28 @@ void UI_func_voice_selection(uint8_t param)
   lcd.show(1, 4, 10, voice_names[selected_dexed_instance][configuration.dexed[selected_dexed_instance].voice]);
 
   // display selected Dexed instance
-  if (selected_dexed_instance == 1)
-  {
-#if NUM_DEXED > 1
-    lcd.show(0, 15, 1, "o");
-#else
-    lcd.show(0, 15, 1, " ");
-#endif
-    lcd.show(1, 15, 1, "*");
-  }
-  else
-  {
-    selected_dexed_instance = 0;
-    lcd.show(0, 15, 1, "*");
-#if NUM_DEXED > 1
-    lcd.show(1, 15, 1, "o");
-#else
-    lcd.show(1, 15, 1, " ");
-#endif
-  }
+  /*  if (selected_dexed_instance == 1)
+    {
+    #if NUM_DEXED > 1
+      lcd.show(0, 15, 1, "o");
+    #else
+      lcd.show(0, 15, 1, " ");
+    #endif
+      lcd.show(1, 15, 1, "*");
+    }
+    else
+    {
+      selected_dexed_instance = 0;
+      lcd.show(0, 15, 1, "*");
+    #if NUM_DEXED > 1
+      lcd.show(1, 15, 1, "o");
+    #else
+      lcd.show(1, 15, 1, " ");
+    #endif
+    } */
+
+  lcd.show(0, 15, 1, " ");
+  lcd.show(1, 15, 1, " ");
 
   // display selections
   switch (menu_voice)