Added class for softening value changes.

pull/3/head
Holger Wirtz 5 years ago
parent 0764e99395
commit 65bc71a03e
  1. 76
      MicroDexed.ino
  2. 46
      SoftenValue.hpp
  3. 32
      UI.hpp
  4. 5
      config.h

@ -130,9 +130,9 @@ uint8_t midi_timing_counter = 0; // 24 per qarter
elapsedMillis midi_timing_timestep; elapsedMillis midi_timing_timestep;
uint16_t midi_timing_quarter = 0; uint16_t midi_timing_quarter = 0;
elapsedMillis long_button_pressed; elapsedMillis long_button_pressed;
//SoftenValue <uint8_t> effect_filter_volume[NUM_DEXED](SOFTEN_VALUE_CHANGE_STEPS); SoftenValue <float> soften_volume;
//SoftenValue <uint8_t> soften_filter_res[NUM_DEXED](SOFTEN_VALUE_CHANGE_STEPS); SoftenValue <float> soften_filter_res[NUM_DEXED];
//SoftenValue <uint8_t> soften_filter_cut[NUM_DEXED](SOFTEN_VALUE_CHANGE_STEPS); SoftenValue <float> soften_filter_cut[NUM_DEXED];
uint8_t effect_filter_cutoff = 0; uint8_t effect_filter_cutoff = 0;
uint8_t effect_filter_resonance = 0; uint8_t effect_filter_resonance = 0;
uint8_t effect_delay_time = 0; uint8_t effect_delay_time = 0;
@ -147,9 +147,6 @@ elapsedMillis cpu_mem_millis;
#endif #endif
config_t configuration = {0xffff, 0, 0, VOLUME, 0.5f, 0, DEFAULT_MIDI_CHANNEL}; config_t configuration = {0xffff, 0, 0, VOLUME, 0.5f, 0, DEFAULT_MIDI_CHANNEL};
bool eeprom_update_flag = false; bool eeprom_update_flag = false;
value_change_t soften_volume = {0.0, 0};
value_change_t soften_filter_res = {0.0, 0};
value_change_t soften_filter_cut = {0.0, 0};
// Allocate the delay lines for left and right channels // Allocate the delay lines for left and right channels
short delayline[MOD_DELAY_SAMPLE_BUFFER]; short delayline[MOD_DELAY_SAMPLE_BUFFER];
@ -348,13 +345,16 @@ void setup()
for (uint8_t i = 0; i < NUM_DEXED; i++) for (uint8_t i = 0; i < NUM_DEXED; i++)
{ {
soften_filter_res[i].init(1.0, 0.0, 1.0);
soften_filter_cut[i].init(1.0, 0.0, 1.0);
MicroDexed[i]->fx.Gain = 1.0; MicroDexed[i]->fx.Gain = 1.0;
MicroDexed[i]->fx.Reso = 1.0 - float(effect_filter_resonance) / ENC_FILTER_RES_STEPS; MicroDexed[i]->fx.Reso = 1.0;
MicroDexed[i]->fx.Cutoff = 1.0 - float(effect_filter_cutoff) / ENC_FILTER_CUT_STEPS; MicroDexed[i]->fx.Cutoff = 1.0;
} }
// set initial volume and pan (read from EEPROM) // set initial volume and pan (read from EEPROM)
set_volume(configuration.vol, configuration.pan); set_volume(configuration.vol, configuration.pan);
soften_volume.init(configuration.vol, 0.0, 1.0);
#if defined (DEBUG) && defined (SHOW_CPU_LOAD_MSEC) #if defined (DEBUG) && defined (SHOW_CPU_LOAD_MSEC)
// Initialize processor and memory measurements // Initialize processor and memory measurements
@ -447,62 +447,56 @@ void loop()
#endif #endif
control_rate = 0; control_rate = 0;
// Shutdown unused voices // check for value changes and unused voices
soften_volume.tick();
for (uint8_t i = 0; i < NUM_DEXED; i++) for (uint8_t i = 0; i < NUM_DEXED; i++)
{ {
active_voices = MicroDexed[i]->getNumNotesPlaying(); active_voices = MicroDexed[i]->getNumNotesPlaying();
}
// check for value changes soften_filter_res[i].tick();
if (soften_volume.steps > 0) soften_filter_cut[i].tick();
{
// soften volume value if (soften_filter_res[i].running())
soften_volume.steps--;
set_volume(configuration.vol + soften_volume.diff, configuration.pan);
#ifdef DEBUG
Serial.print(F("Volume: "));
Serial.print(configuration.vol, 5);
Serial.print(F(" Volume step: "));
Serial.print(soften_volume.steps);
Serial.print(F(" Volume diff: "));
Serial.println(soften_volume.diff, 5);
#endif
}
if (soften_filter_res.steps > 0)
{
// soften filter resonance value
soften_filter_res.steps--;
for (uint8_t i = 0; i < NUM_DEXED; i++)
{ {
MicroDexed[i]->fx.Reso = MicroDexed[i]->fx.Reso + soften_filter_res.diff; // soften filter resonance value
MicroDexed[i]->fx.Reso = soften_filter_res[i].value();
#ifdef DEBUG #ifdef DEBUG
Serial.print(F("Filter-Resonance: ")); Serial.print(F("Filter-Resonance: "));
Serial.print(MicroDexed[i]->fx.Reso, 5); Serial.print(MicroDexed[i]->fx.Reso, 5);
Serial.print(F(" Filter-Resonance step: ")); Serial.print(F(" Filter-Resonance step: "));
Serial.print(soften_filter_res.steps); Serial.print(soften_filter_res[i].steps());
Serial.print(F(" Filter-Resonance diff: ")); Serial.print(F(" Filter-Resonance diff: "));
Serial.println(soften_filter_res.diff, 5); Serial.println(soften_filter_res[i].diff(), 5);
#endif #endif
} }
}
if (soften_filter_cut.steps > 0)
{
// soften filter cutoff value // soften filter cutoff value
soften_filter_cut.steps--; if (soften_filter_cut[i].running())
for (uint8_t i = 0; i < NUM_DEXED; i++)
{ {
MicroDexed[i]->fx.Cutoff = MicroDexed[i]->fx.Cutoff + soften_filter_cut.diff; MicroDexed[i]->fx.Cutoff = soften_filter_cut[i].value();
#ifdef DEBUG #ifdef DEBUG
Serial.print(F("Filter-Cutoff: ")); Serial.print(F("Filter-Cutoff: "));
Serial.print(MicroDexed[i]->fx.Cutoff, 5); Serial.print(MicroDexed[i]->fx.Cutoff, 5);
Serial.print(F(" Filter-Cutoff step: ")); Serial.print(F(" Filter-Cutoff step: "));
Serial.print(soften_filter_cut.steps); Serial.print(soften_filter_cut[i].steps());
Serial.print(F(" Filter-Cutoff diff: ")); Serial.print(F(" Filter-Cutoff diff: "));
Serial.println(soften_filter_cut.diff, 5); Serial.println(soften_filter_cut[i].diff(), 5);
#endif #endif
} }
} }
if (soften_volume.running())
{
set_volume(soften_volume.value(), configuration.pan);
#ifdef DEBUG
Serial.print(F("Volume: "));
Serial.print(configuration.vol, 5);
Serial.print(F(" step: "));
Serial.print(soften_volume.steps());
Serial.print(F(" diff: "));
Serial.println(soften_volume.diff(), 5);
#endif
}
} }
#if defined (DEBUG) && defined (SHOW_CPU_LOAD_MSEC) #if defined (DEBUG) && defined (SHOW_CPU_LOAD_MSEC)

@ -24,19 +24,26 @@
*/ */
#ifndef SOFTEN_VALUE_H_INCLUDED #ifndef SOFTEN_VALUE_H_INCLUDED
#define SOFTEN_VALUE_H_INCLUDED 1
template <class T> template <class T>
class SoftenValue class SoftenValue
{ {
public: public:
SoftenValue(uint16_t steps = 10); init(T value, T minimum, T maximum)
SoftenValue(T from, T to, uint16_t steps = 10) {
_from = value;
_to = value;
_steps = 0;
_diff = 0.0;
_min = minimum;
_max = maximum;
}
void update(T to, uint16_t steps)
{ {
_from = from;
_to = to; _to = to;
_steps = steps; _steps = steps;
_diff = (from - to) / _steps;
_calculate(); _calculate();
} }
@ -58,6 +65,12 @@ class SoftenValue
{ {
_from -= _diff; _from -= _diff;
_steps--; _steps--;
#ifdef DEBUG
Serial.print(F("Steps: "));
Serial.print(_steps, DEC);
Serial.print(F(" Diff="));
Serial.println(_diff, 5);
#endif
} }
} }
@ -74,11 +87,21 @@ class SoftenValue
return (_steps); return (_steps);
} }
T diff(void)
{
return (_diff);
}
T value(void) T value(void)
{ {
if (_steps == 0) if (_steps == 0)
return (_to); return (_to);
if (_from < _min)
_from = _min;
else if (_from > _max)
_from = _max;
if (std::is_same<T, float>::value) if (std::is_same<T, float>::value)
return (_from); return (_from);
else else
@ -90,6 +113,8 @@ class SoftenValue
float _to; float _to;
uint16_t _steps; uint16_t _steps;
float _diff; float _diff;
T _min;
T _max;
void _calculate(void) void _calculate(void)
{ {
@ -100,6 +125,17 @@ class SoftenValue
} }
else else
_diff = (_from - _to) / _steps; _diff = (_from - _to) / _steps;
#ifdef DEBUG
Serial.print(F("Update SoftenValue: from="));
Serial.print(_from, 5);
Serial.print(F(" to="));
Serial.print(_to, 5);
Serial.print(F(" diff="));
Serial.print(_diff, 5);
Serial.print(F(" steps="));
Serial.println(_steps, DEC);
#endif
} }
}; };

@ -28,6 +28,8 @@
#include "config.h" #include "config.h"
#include "LiquidCrystalPlus_I2C.h" #include "LiquidCrystalPlus_I2C.h"
#include "SoftenValue.hpp"
#include <LCDMenuLib2.h> #include <LCDMenuLib2.h>
#include <Encoder.h> #include <Encoder.h>
@ -47,9 +49,9 @@ extern void strip_extension(char* s, char *target);
extern void eeprom_write(void); extern void eeprom_write(void);
extern bool get_voice_names_from_bank(uint8_t b); extern bool get_voice_names_from_bank(uint8_t b);
extern bool load_sysex(uint8_t b, uint8_t v); extern bool load_sysex(uint8_t b, uint8_t v);
extern value_change_t soften_volume; extern SoftenValue <float> soften_volume;
extern value_change_t soften_filter_res; extern SoftenValue <float> soften_filter_res[NUM_DEXED];
extern value_change_t soften_filter_cut; extern SoftenValue <float> soften_filter_cut[NUM_DEXED];
/*********************************************************************** /***********************************************************************
GLOBAL GLOBAL
@ -331,7 +333,7 @@ void encoder_right_up(void)
} }
break; break;
case MENU_VOICE_SOUND: case MENU_VOICE_SOUND:
if (configuration.voice < MAX_VOICES-1) if (configuration.voice < MAX_VOICES - 1)
configuration.voice++; configuration.voice++;
else else
{ {
@ -432,12 +434,11 @@ void encoder_left_up(void)
#ifdef DEBUG #ifdef DEBUG
Serial.println(F("Volume +")); Serial.println(F("Volume +"));
#endif #endif
if (configuration.vol < 0.96) if (configuration.vol < 1.0)
{ soften_volume.update(soften_volume.value() + 0.05, SOFTEN_VALUE_CHANGE_STEPS);
soften_volume.diff = 0.05 / SOFTEN_VALUE_CHANGE_STEPS; else
soften_volume.steps = SOFTEN_VALUE_CHANGE_STEPS; soften_volume.update(1.0, SOFTEN_VALUE_CHANGE_STEPS);
eeprom_write(); eeprom_write();
}
UI_func_volume(0); UI_func_volume(0);
} }
@ -446,12 +447,11 @@ void encoder_left_down(void)
#ifdef DEBUG #ifdef DEBUG
Serial.println(F("Volume -")); Serial.println(F("Volume -"));
#endif #endif
if (configuration.vol > 0.04) if (configuration.vol > 0.0)
{ soften_volume.update(soften_volume.value() - 0.05, SOFTEN_VALUE_CHANGE_STEPS);
soften_volume.diff = -0.05 / SOFTEN_VALUE_CHANGE_STEPS; else
soften_volume.steps = SOFTEN_VALUE_CHANGE_STEPS; soften_volume.update(0.0, SOFTEN_VALUE_CHANGE_STEPS);
eeprom_write(); eeprom_write();
}
UI_func_volume(0); UI_func_volume(0);
} }

@ -69,14 +69,12 @@
//************************************************************************************************* //*************************************************************************************************
#define DEXED_ENGINE DEXED_ENGINE_MODERN // DEXED_ENGINE_MARKI // DEXED_ENGINE_OPL #define DEXED_ENGINE DEXED_ENGINE_MODERN // DEXED_ENGINE_MARKI // DEXED_ENGINE_OPL
// EFFECTS
#define FILTER_MAX_FREQ 10000
// CHORUS parameters // CHORUS parameters
#define MOD_DELAY_SAMPLE_BUFFER int32_t(TIME_MS2SAMPLES(20.0)) // 20.0 ms delay buffer. #define MOD_DELAY_SAMPLE_BUFFER int32_t(TIME_MS2SAMPLES(20.0)) // 20.0 ms delay buffer.
#define MOD_WAVEFORM WAVEFORM_TRIANGLE // WAVEFORM_SINE WAVEFORM_TRIANGLE WAVEFORM_SAWTOOTH WAVEFORM_SAWTOOTH_REVERSE #define MOD_WAVEFORM WAVEFORM_TRIANGLE // WAVEFORM_SINE WAVEFORM_TRIANGLE WAVEFORM_SAWTOOTH WAVEFORM_SAWTOOTH_REVERSE
#define MOD_FILTER_OUTPUT MOD_LINKWITZ_RILEY_FILTER_OUTPUT // MOD_LINKWITZ_RILEY_FILTER_OUTPUT MOD_BUTTERWORTH_FILTER_OUTPUT MOD_NO_FILTER_OUTPUT #define MOD_FILTER_OUTPUT MOD_LINKWITZ_RILEY_FILTER_OUTPUT // MOD_LINKWITZ_RILEY_FILTER_OUTPUT MOD_BUTTERWORTH_FILTER_OUTPUT MOD_NO_FILTER_OUTPUT
#define MOD_FILTER_CUTOFF_HZ 3000 #define MOD_FILTER_CUTOFF_HZ 3000
//#define USE_REVERB 1 #define USE_REVERB 1
//************************************************************************************************* //*************************************************************************************************
//* AUDIO SETTINGS //* AUDIO SETTINGS
@ -191,6 +189,7 @@
// Teensy-3.5 settings // Teensy-3.5 settings
#undef MIDI_DEVICE_USB_HOST #undef MIDI_DEVICE_USB_HOST
#define MAX_NOTES 11 #define MAX_NOTES 11
#undef USE_REVERB
#endif #endif
#define TRANSPOSE_FIX 24 #define TRANSPOSE_FIX 24

Loading…
Cancel
Save