Fixed display error.

pull/9/head^2
Holger Wirtz 5 years ago
parent 2112e5c255
commit b49f7088f3
  1. 9
      Disp_Plus.h
  2. 3
      MicroDexed.ino
  3. 4
      UI.hpp

@ -26,7 +26,9 @@
#ifndef DISP_PLUS_H_INCLUDED #ifndef DISP_PLUS_H_INCLUDED
#define DISP_PLUS_H_INCLUDED #define DISP_PLUS_H_INCLUDED
#define STRING_BUFFER_SIZE 21 #include "config.h"
#define STRING_BUFFER_SIZE LCD_cols+1
template <class T> template <class T>
class Disp_Plus : public T class Disp_Plus : public T
@ -59,8 +61,9 @@ class Disp_Plus : public T
if (fill_zero == true) if (fill_zero == true)
memset(tmp, '0', field_size); memset(tmp, '0', field_size);
else else
memset(tmp, 0x20, field_size - 1); // blank memset(tmp, 0x20, field_size); // blank
tmp[field_size+1]='\0';
if (l > field_size) if (l > field_size)
l = field_size; l = field_size;

@ -337,7 +337,8 @@ void setup()
// INIT DELAY // INIT DELAY
delay1.delay(0, mapfloat(configuration.delay_time, DELAY_TIME_MIN, DELAY_TIME_MAX, 0.0, float(DELAY_TIME_MAX))); delay1.delay(0, mapfloat(configuration.delay_time, DELAY_TIME_MIN, DELAY_TIME_MAX, 0.0, float(DELAY_TIME_MAX)));
// delay_fb_mixer is the feedback-adding mixer // delay_fb_mixer is the feedback-adding mixer
delay_fb_mixer.gain(0, 1.0 - (mapfloat(configuration.delay_feedback, DELAY_FEEDBACK_MIN, DELAY_FEEDBACK_MAX, 0.0, 1.0))); // original signal //delay_fb_mixer.gain(0, 1.0 - (mapfloat(configuration.delay_feedback, DELAY_FEEDBACK_MIN, DELAY_FEEDBACK_MAX, 0.0, 1.0))); // original signal
delay_fb_mixer.gain(0, 1.0); // original signal
delay_fb_mixer.gain(1, mapfloat(configuration.delay_feedback, DELAY_FEEDBACK_MIN, DELAY_FEEDBACK_MAX, 0.0, 1.0)); // amount of feedback delay_fb_mixer.gain(1, mapfloat(configuration.delay_feedback, DELAY_FEEDBACK_MIN, DELAY_FEEDBACK_MAX, 0.0, 1.0)); // amount of feedback
master_mixer_r.gain(2, mapfloat(configuration.delay_level, DELAY_LEVEL_MIN, DELAY_LEVEL_MAX, 0.0, 1.0)); master_mixer_r.gain(2, mapfloat(configuration.delay_level, DELAY_LEVEL_MIN, DELAY_LEVEL_MAX, 0.0, 1.0));
master_mixer_l.gain(2, mapfloat(configuration.delay_level, DELAY_LEVEL_MIN, DELAY_LEVEL_MAX, 0.0, 1.0)); master_mixer_l.gain(2, mapfloat(configuration.delay_level, DELAY_LEVEL_MIN, DELAY_LEVEL_MAX, 0.0, 1.0));

@ -1181,7 +1181,7 @@ void UI_func_delay_feedback(uint8_t param)
lcd_display_int(configuration.delay_feedback, 3, true, true, false); lcd_display_int(configuration.delay_feedback, 3, true, true, false);
delay_fb_mixer.gain(1, configuration.delay_feedback / 100.0 ); // amount of feedback delay_fb_mixer.gain(1, configuration.delay_feedback / 100.0 ); // amount of feedback
delay_fb_mixer.gain(0, 1.0 - configuration.delay_feedback / 100.0); // original signal //delay_fb_mixer.gain(0, 1.0 - configuration.delay_feedback / 200.0); // original signal
} }
if (LCDML.FUNC_close()) // ****** STABLE END ********* if (LCDML.FUNC_close()) // ****** STABLE END *********
@ -1812,7 +1812,7 @@ void lcd_display_int(int16_t var, uint8_t size, bool zeros, bool brackets, bool
var -= (tmp * p); var -= (tmp * p);
} }
} }
if (brackets == true) if (brackets == true)
lcd.print(F("]")); lcd.print(F("]"));
} }

Loading…
Cancel
Save