From 5dac0ff9dc36e36aba5fee132b90bda8d3a28ff8 Mon Sep 17 00:00:00 2001
From: Holger Wirtz <dcoredump@googlemail.com>
Date: Sat, 28 Mar 2020 16:02:30 +0100
Subject: [PATCH] Fixes.

---
 MicroDexed.ino |  2 +-
 UI.hpp         | 13 ++-----------
 config.h       |  4 ++--
 dexed.cpp      |  1 +
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/MicroDexed.ino b/MicroDexed.ino
index 1d99749..ef4b05c 100644
--- a/MicroDexed.ino
+++ b/MicroDexed.ino
@@ -342,7 +342,7 @@ void setup()
   sgtl5000_1.unmuteLineout();
   sgtl5000_1.volume(SGTL5000_HEADPHONE_VOLUME, SGTL5000_HEADPHONE_VOLUME); // Headphone volume
   //sgtl5000_1.audioPostProcessorEnable();
-  sgtl5000_1.autoVolumeControl(1, 1, 1, 0.9, 0.01, 0.05);
+  //sgtl5000_1.autoVolumeControl(1, 1, 1, 0.9, 0.01, 0.05);
   //sgtl5000_1.autoVolumeEnable();
   sgtl5000_1.autoVolumeDisable();
   //sgtl5000_1.surroundSoundEnable();
diff --git a/UI.hpp b/UI.hpp
index 892c371..2d4e638 100644
--- a/UI.hpp
+++ b/UI.hpp
@@ -1303,9 +1303,6 @@ void UI_func_delay_level(uint8_t param)
       master_mixer_r.gain(DELAY, mapfloat(configuration.delay_level, DELAY_LEVEL_MIN, DELAY_LEVEL_MAX, 0.0, 1.0));
       master_mixer_l.gain(DELAY, mapfloat(configuration.delay_level, DELAY_LEVEL_MIN, DELAY_LEVEL_MAX, 0.0, 1.0));
     }
-
-    lcd.setCursor(0, 1);
-    lcd_display_int(configuration.delay_level, 3, true, true, false);
   }
 
   if (LCDML.FUNC_close())     // ****** STABLE END *********
@@ -1346,9 +1343,6 @@ void UI_func_filter_cutoff(uint8_t param)
 
       MicroDexed[instance_id]->fx.Cutoff = mapfloat(configuration.dexed[instance_id].filter_cutoff, FILTER_CUTOFF_MIN, FILTER_CUTOFF_MAX, 1.0, 0.0);
     }
-
-    lcd.setCursor(0, 1);
-    lcd_display_int(configuration.dexed[instance_id].filter_cutoff, 3, true, true, false);
   }
 
   if (LCDML.FUNC_close())     // ****** STABLE END *********
@@ -1389,9 +1383,6 @@ void UI_func_filter_resonance(uint8_t param)
 
       MicroDexed[instance_id]->fx.Reso = mapfloat(configuration.dexed[instance_id].filter_resonance, FILTER_RESONANCE_MIN, FILTER_RESONANCE_MAX, 1.0, 0.0);
     }
-
-    lcd.setCursor(0, 1);
-    lcd_display_int(configuration.dexed[instance_id].filter_resonance, 3, true, true, false);
   }
 
   if (LCDML.FUNC_close())     // ****** STABLE END *********
@@ -1539,7 +1530,7 @@ void UI_func_sound_intensity(uint8_t param)
   {
     // setup function
     lcd_special_chars(BLOCKBAR);
-    lcd_display_bar_int("Sound Intens.", configuration.dexed[instance_id].sound_intensity, 1.0, SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX, 3, false, false, false, true);
+    lcd_display_bar_float("Sound Intens.", float(configuration.dexed[instance_id].sound_intensity), 1.0, SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX, 3, 0, false, false, false, true);
   }
 
   if (LCDML.FUNC_loop())          // ****** LOOP *********
@@ -1555,7 +1546,7 @@ void UI_func_sound_intensity(uint8_t param)
       else if (LCDML.BT_checkUp())
         configuration.dexed[instance_id].sound_intensity = constrain(configuration.dexed[instance_id].sound_intensity - ENCODER[ENC_R].speed(), SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX);
 
-      lcd_display_bar_int("Sound Intens.", configuration.dexed[instance_id].sound_intensity, 1.0, SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX, 3, false, false, false, false);
+      lcd_display_bar_float("Sound Intens.", float(configuration.dexed[instance_id].sound_intensity), 1.0, SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX, 3, 0, false, false, false, false);
 
       dexed_level[instance_id]->gain(mapfloat(configuration.dexed[instance_id].sound_intensity, SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX, 0.0, SOUND_INTENSITY_AMP_MAX));
     }
diff --git a/config.h b/config.h
index 563a47b..d2f0f77 100644
--- a/config.h
+++ b/config.h
@@ -78,7 +78,7 @@
 //*************************************************************************************************
 //* DEBUG OUTPUT SETTINGS
 //*************************************************************************************************
-#define DEBUG 1
+//#define DEBUG 1
 #define SERIAL_SPEED 230400
 #define SHOW_XRUN 1
 #define SHOW_CPU_LOAD_MSEC 5000
@@ -94,7 +94,7 @@
 #define MOD_FILTER_OUTPUT MOD_NO_FILTER_OUTPUT // MOD_LINKWITZ_RILEY_FILTER_OUTPUT MOD_BUTTERWORTH_FILTER_OUTPUT MOD_NO_FILTER_OUTPUT
 #define MOD_FILTER_CUTOFF_HZ 3000
 // FX-CHAIN ENABLE/DISABLE
-#define USE_FX 1
+//#define USE_FX 1
 
 //*************************************************************************************************
 //* AUDIO SOFTWARE SETTINGS
diff --git a/dexed.cpp b/dexed.cpp
index 04b247e..3c177c5 100644
--- a/dexed.cpp
+++ b/dexed.cpp
@@ -158,6 +158,7 @@ void Dexed::getSamples(uint16_t n_samples, int16_t* buffer)
   fx.process(sumbuf, n_samples);
 #endif
 
+  //arm_scale_f32(sumbuf, 0.8, sumbuf, AUDIO_BLOCK_SAMPLES);
   arm_float_to_q15(sumbuf, buffer, AUDIO_BLOCK_SAMPLES);
 }