From 67d99a3c97e1a5082b5b12ae56871bd063155b0e Mon Sep 17 00:00:00 2001 From: positionhigh Date: Wed, 18 Aug 2021 18:23:51 +0200 Subject: [PATCH] =?UTF-8?q?Dateien=20hochladen=20nach=20=E2=80=9E=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- UI.hpp | 33 +++++++++++++++++++++++++++------ config.h | 28 ++++++++++++++-------------- 2 files changed, 41 insertions(+), 20 deletions(-) diff --git a/UI.hpp b/UI.hpp index 83950c2..2379480 100644 --- a/UI.hpp +++ b/UI.hpp @@ -7717,8 +7717,11 @@ void UI_func_eq_1(uint8_t param) } } lcd_display_meter_float("EQ 50Hz", configuration.fx.eq_1, 0.1, 0.0, EQ_1_MIN, EQ_1_MAX, 1, 1, false, true, true); - sgtl5000.setEQGain(1, mapfloat(configuration.fx.eq_1, EQ_1_MIN, EQ_1_MAX, 0.0, 1.0)); + sgtl5000.setEQGain(1, mapfloat(configuration.fx.eq_1, EQ_1_MIN, EQ_1_MAX, -9.9, 9.9)); sgtl5000.commitFilter(1); +#ifdef DEBUG + sgtl5000.show_params(1); +#endif } if (LCDML.FUNC_close()) // ****** STABLE END ********* @@ -7762,8 +7765,11 @@ void UI_func_eq_2(uint8_t param) } } lcd_display_meter_float("EQ 120Hz", configuration.fx.eq_2, 0.1, 0.0, EQ_2_MIN, EQ_2_MAX, 1, 1, false, true, true); - sgtl5000.setEQGain(2, mapfloat(configuration.fx.eq_2, EQ_2_MIN, EQ_2_MAX, 0.0, 1.0)); + sgtl5000.setEQGain(2, mapfloat(configuration.fx.eq_2, EQ_2_MIN, EQ_2_MAX, -9.9, 9.9)); sgtl5000.commitFilter(2); +#ifdef DEBUG + sgtl5000.show_params(2); +#endif } if (LCDML.FUNC_close()) // ****** STABLE END ********* @@ -7807,8 +7813,11 @@ void UI_func_eq_3(uint8_t param) } } lcd_display_meter_float("EQ 220Hz", configuration.fx.eq_3, 0.1, 0.0, EQ_3_MIN, EQ_3_MAX, 1, 1, false, true, true); - sgtl5000.setEQGain(3, mapfloat(configuration.fx.eq_3, EQ_3_MIN, EQ_3_MAX, 0.0, 1.0)); + sgtl5000.setEQGain(3, mapfloat(configuration.fx.eq_3, EQ_3_MIN, EQ_3_MAX, -9.9, 9.9)); sgtl5000.commitFilter(3); +#ifdef DEBUG + sgtl5000.show_params(3); +#endif } if (LCDML.FUNC_close()) // ****** STABLE END ********* @@ -7852,8 +7861,11 @@ void UI_func_eq_4(uint8_t param) } } lcd_display_meter_float("EQ 1000Hz", configuration.fx.eq_4, 0.1, 0.0, EQ_4_MIN, EQ_4_MAX, 1, 1, false, true, true); - sgtl5000.setEQGain(4, mapfloat(configuration.fx.eq_4, EQ_4_MIN, EQ_4_MAX, 0.0, 1.0)); + sgtl5000.setEQGain(4, mapfloat(configuration.fx.eq_4, EQ_4_MIN, EQ_4_MAX, -9.9, 9.9)); sgtl5000.commitFilter(4); +#ifdef DEBUG + sgtl5000.show_params(4); +#endif } if (LCDML.FUNC_close()) // ****** STABLE END ********* @@ -7897,8 +7909,11 @@ void UI_func_eq_5(uint8_t param) } } lcd_display_meter_float("EQ 2000Hz", configuration.fx.eq_5, 0.1, 0.0, EQ_5_MIN, EQ_5_MAX, 1, 1, false, true, true); - sgtl5000.setEQGain(5, mapfloat(configuration.fx.eq_5, EQ_5_MIN, EQ_5_MAX, 0.0, 1.0)); + sgtl5000.setEQGain(5, mapfloat(configuration.fx.eq_5, EQ_5_MIN, EQ_5_MAX, -9.9, 9.9)); sgtl5000.commitFilter(5); +#ifdef DEBUG + sgtl5000.show_params(5); +#endif } if (LCDML.FUNC_close()) // ****** STABLE END ********* @@ -7942,8 +7957,11 @@ void UI_func_eq_6(uint8_t param) } } lcd_display_meter_float("EQ 7000Hz", configuration.fx.eq_6, 0.1, 0.0, EQ_6_MIN, EQ_6_MAX, 1, 1, false, true, true); - sgtl5000.setEQGain(6, mapfloat(configuration.fx.eq_6, EQ_6_MIN, EQ_6_MAX, 0.0, 1.0)); + sgtl5000.setEQGain(6, mapfloat(configuration.fx.eq_6, EQ_6_MIN, EQ_6_MAX, -9.9, 9.9)); sgtl5000.commitFilter(6); +#ifdef DEBUG + sgtl5000.show_params(1); +#endif } if (LCDML.FUNC_close()) // ****** STABLE END ********* @@ -7989,6 +8007,9 @@ void UI_func_eq_7(uint8_t param) lcd_display_meter_float("EQ 10000Hz", configuration.fx.eq_7, 0.1, 0.0, EQ_7_MIN, EQ_7_MAX, 1, 1, false, true, true); sgtl5000.setEQGain(7, mapfloat(configuration.fx.eq_7, EQ_7_MIN, EQ_7_MAX, 0.0, 1.0)); sgtl5000.commitFilter(7); +#ifdef DEBUG + sgtl5000.show_params(7); +#endif } if (LCDML.FUNC_close()) // ****** STABLE END ********* diff --git a/config.h b/config.h index ff8408b..3d3dc33 100644 --- a/config.h +++ b/config.h @@ -602,32 +602,32 @@ #define VOICECONFIG_NUM_MAX MAX_VOICECONFIG #define VOICECONFIG_NUM_DEFAULT -1 -#define EQ_1_MIN -10 -#define EQ_1_MAX 10 +#define EQ_1_MIN -99 +#define EQ_1_MAX 99 #define EQ_1_DEFAULT 0 -#define EQ_2_MIN -10 -#define EQ_2_MAX 10 +#define EQ_2_MIN -99 +#define EQ_2_MAX 99 #define EQ_2_DEFAULT 0 -#define EQ_3_MIN -10 -#define EQ_3_MAX 10 +#define EQ_3_MIN -99 +#define EQ_3_MAX 99 #define EQ_3_DEFAULT 0 -#define EQ_4_MIN -10 -#define EQ_4_MAX 10 +#define EQ_4_MIN -99 +#define EQ_4_MAX 99 #define EQ_4_DEFAULT 0 -#define EQ_5_MIN -10 -#define EQ_5_MAX 10 +#define EQ_5_MIN -99 +#define EQ_5_MAX 99 #define EQ_5_DEFAULT 0 -#define EQ_6_MIN -10 -#define EQ_6_MAX 10 +#define EQ_6_MIN -99 +#define EQ_6_MAX 99 #define EQ65_DEFAULT 0 -#define EQ_7_MIN -10 -#define EQ_7_MAX 10 +#define EQ_7_MIN -99 +#define EQ_7_MAX 99 #define EQ_7_DEFAULT 0 // Buffer-size define for load/save configuration as JSON