From 2f23fecc97cd6e3fcb701328e98d3edff998d4e3 Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Wed, 20 May 2020 11:19:15 +0200 Subject: [PATCH] Several fixes. Disabled Dual engine mode due to problems. --- MicroDexed.ino | 50 +++++++++++++++++++++++++++++--------------------- UI.hpp | 19 +++++++++++++------ config.h | 4 +--- dexed.cpp | 12 ++++-------- 4 files changed, 47 insertions(+), 38 deletions(-) diff --git a/MicroDexed.ino b/MicroDexed.ino index e46d55b..4465dd8 100644 --- a/MicroDexed.ino +++ b/MicroDexed.ino @@ -541,13 +541,13 @@ void loop() } #else static bool midi_playing[NUM_DEXED]; - if (midi_decay_timer > MIDI_DECAY_TIMER && midi_voices[instance_id] > 0 && midi_playing[instance_id] == false) + if (midi_voices[instance_id] > 0 && midi_playing[instance_id] == false) { midi_playing[instance_id] = true; lcd.setCursor(14 + instance_id, 1); lcd.write(6 + instance_id); } - else if (midi_decay_timer > MIDI_DECAY_TIMER && midi_voices[instance_id] == 0) + else if (midi_voices[instance_id] == 0) { midi_playing[instance_id] = false; lcd.setCursor(14 + instance_id, 1); @@ -596,7 +596,7 @@ void handleNoteOn(byte inChannel, byte inNumber, byte inVelocity) { if (inNumber >= configuration.dexed[instance_id].lowest_note && inNumber <= configuration.dexed[instance_id].highest_note) { - if (MicroDexed[instance_id]->getMaxNotes() > 0) + if (configuration.dexed[instance_id].polyphony > 0) MicroDexed[instance_id]->keydown(inNumber, uint8_t(float(configuration.dexed[instance_id].velocity_level / 127.0)*inVelocity + 0.5)); midi_voices[instance_id]++; @@ -629,7 +629,7 @@ void handleNoteOff(byte inChannel, byte inNumber, byte inVelocity) { if (inNumber >= configuration.dexed[instance_id].lowest_note && inNumber <= configuration.dexed[instance_id].highest_note) { - if (MicroDexed[instance_id]->getMaxNotes() > 0) + if (configuration.dexed[instance_id].polyphony > 0) MicroDexed[instance_id]->keyup(inNumber); midi_voices[instance_id]--; @@ -1513,7 +1513,7 @@ void check_configuration(void) configuration.dexed[instance_id].transpose = constrain(configuration.dexed[instance_id].transpose, TRANSPOSE_MIN, TRANSPOSE_MAX); configuration.dexed[instance_id].tune = constrain(configuration.dexed[instance_id].tune, TUNE_MIN, TUNE_MAX); #if NUM_DEXED > 1 - configuration.dexed[instance_id].polyphony = constrain(configuration.dexed[instance_id].polyphony, POLYPHONY_MIN, POLYPHONY_MAX / 2); + configuration.dexed[instance_id].polyphony = constrain(configuration.dexed[instance_id].polyphony + ((POLYPHONY_MAX % 2) - instance_id) , POLYPHONY_MIN, POLYPHONY_MAX / 2); #else configuration.dexed[instance_id].polyphony = constrain(configuration.dexed[instance_id].polyphony, POLYPHONY_MIN, POLYPHONY_MAX); #endif @@ -1584,6 +1584,11 @@ void init_configuration(void) configuration.dexed[instance_id].pan = PANORAMA_DEFAULT; configuration.dexed[instance_id].transpose = TRANSPOSE_DEFAULT; configuration.dexed[instance_id].tune = TUNE_DEFAULT; +#if NUM_DEXED > 1 + configuration.dexed[instance_id].polyphony = (POLYPHONY_DEFAULT / 2) + (POLYPHONY_DEFAULT % 2) - instance_id; +#else + configuration.dexed[instance_id].polyphony = POLYPHONY_DEFAULT; +#endif configuration.dexed[instance_id].velocity_level = VELOCITY_LEVEL_DEFAULT; configuration.dexed[instance_id].engine = ENGINE_DEFAULT; configuration.dexed[instance_id].monopoly = MONOPOLY_DEFAULT; @@ -1755,8 +1760,6 @@ void set_fx_params(void) for (uint8_t instance_id = 0; instance_id < NUM_DEXED; instance_id++) { // CHORUS - chorus_mixer[instance_id]->gain(0, 1.0 - mapfloat(configuration.fx.chorus_level[instance_id], CHORUS_LEVEL_MIN, CHORUS_LEVEL_MAX, 0.0, 0.5)); - chorus_mixer[instance_id]->gain(1, mapfloat(configuration.fx.chorus_level[instance_id], CHORUS_LEVEL_MIN, CHORUS_LEVEL_MAX, 0.0, 0.5)); switch (configuration.fx.chorus_waveform[instance_id]) { case 0: @@ -1782,13 +1785,21 @@ void set_fx_params(void) modchorus_filter[instance_id]->setLowpass(2, MOD_FILTER_CUTOFF_HZ, 0.54); modchorus_filter[instance_id]->setLowpass(3, MOD_FILTER_CUTOFF_HZ, 1.3); #endif + //chorus_mixer[instance_id]->gain(0, 1.0 - pseudo_log_curve(mapfloat(configuration.fx.chorus_level[instance_id], CHORUS_LEVEL_MIN, CHORUS_LEVEL_MAX, 0.0, 0.5))); + //chorus_mixer[instance_id]->gain(1, pseudo_log_curve(mapfloat(configuration.fx.chorus_level[instance_id], CHORUS_LEVEL_MIN, CHORUS_LEVEL_MAX, 0.0, 0.5))); + //chorus_mixer[instance_id]->gain(0, 1.0 - mapfloat(configuration.fx.chorus_level[instance_id], CHORUS_LEVEL_MIN, CHORUS_LEVEL_MAX, 0.0, 0.5)); + chorus_mixer[instance_id]->gain(0, 1.0); + chorus_mixer[instance_id]->gain(1, mapfloat(configuration.fx.chorus_level[instance_id], CHORUS_LEVEL_MIN, CHORUS_LEVEL_MAX, 0.0, 0.5)); // DELAY delay_mixer[instance_id]->gain(0, 1.0); delay_mixer[instance_id]->gain(1, pseudo_log_curve(mapfloat(configuration.fx.delay_level[instance_id], DELAY_LEVEL_MIN, DELAY_LEVEL_MAX, 0.0, 1.0))); - delay_fx[instance_id]->delay(0, constrain(configuration.fx.delay_time[instance_id], DELAY_TIME_MIN, DELAY_TIME_MAX) * 10); delay_fb_mixer[instance_id]->gain(0, 1.0); delay_fb_mixer[instance_id]->gain(1, pseudo_log_curve(mapfloat(configuration.fx.delay_feedback[instance_id], DELAY_FEEDBACK_MIN, DELAY_FEEDBACK_MAX, 0.0, 1.0))); + if (configuration.fx.delay_level[selected_instance_id] <= DELAY_LEVEL_MIN) + delay_fx[instance_id]->disable(0); + else + delay_fx[instance_id]->delay(0, constrain(configuration.fx.delay_time[instance_id], DELAY_TIME_MIN, DELAY_TIME_MAX) * 10); // REVERB SEND reverb_mixer_r.gain(instance_id, pseudo_log_curve(configuration.fx.reverb_send[instance_id] / 100.0)); @@ -1807,8 +1818,8 @@ void set_fx_params(void) freeverb_r.damping(mapfloat(configuration.fx.reverb_damping, REVERB_DAMPING_MIN, REVERB_DAMPING_MAX, 0.0, 1.0)); freeverb_l.roomsize(mapfloat(configuration.fx.reverb_roomsize, REVERB_ROOMSIZE_MIN, REVERB_ROOMSIZE_MAX, 0.0, 1.0)); freeverb_l.damping(mapfloat(configuration.fx.reverb_damping, REVERB_DAMPING_MIN, REVERB_DAMPING_MAX, 0.0, 1.0)); - master_mixer_r.gain(3, pseudo_log_curve(configuration.fx.reverb_level / 100.0)); - master_mixer_l.gain(3, pseudo_log_curve(configuration.fx.reverb_level / 100.0)); + master_mixer_r.gain(3, pseudo_log_curve(mapfloat(configuration.fx.reverb_level, REVERB_LEVEL_MIN, REVERB_LEVEL_MAX, 0.0, 1.0))); + master_mixer_l.gain(3, pseudo_log_curve(mapfloat(configuration.fx.reverb_level, REVERB_LEVEL_MIN, REVERB_LEVEL_MAX, 0.0, 1.0))); #endif } @@ -1846,11 +1857,6 @@ void set_sys_params(void) HELPERS ******************************************************************************/ -float mapfloat(float val, float in_min, float in_max, float out_min, float out_max) -{ - return (val - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; -} - // https://www.reddit.com/r/Teensy/comments/7r19uk/reset_and_reboot_teensy_lc_via_code/ #define SCB_AIRCR (*(volatile uint32_t *)0xE000ED0C) // Application Interrupt and Reset Control location void _softRestart(void) @@ -1863,12 +1869,14 @@ float pseudo_log_curve(float value) { const float _pseudo_log = 1048575 / (float)(1 << 20); -#ifdef DEBUG - Serial.print(F("value in: ")); - Serial.print(value, 3); - Serial.print(F(" value out: ")); - Serial.println(mapfloat(_pseudo_log * arm_sin_f32(value), 0.0, _pseudo_log * arm_sin_f32(1.0), 0.0, 1.0), 3); -#endif + /* + #ifdef DEBUG + Serial.print(F("value in: ")); + Serial.print(value, 3); + Serial.print(F(" value out: ")); + Serial.println(mapfloat(_pseudo_log * arm_sin_f32(value), 0.0, _pseudo_log * arm_sin_f32(1.0), 0.0, 1.0), 3); + #endif + */ return (mapfloat(_pseudo_log * arm_sin_f32(value), 0.0, _pseudo_log * arm_sin_f32(1.0), 0.0, 1.0)); } diff --git a/UI.hpp b/UI.hpp index 3f63fb0..a91d3dd 100644 --- a/UI.hpp +++ b/UI.hpp @@ -57,7 +57,6 @@ extern void eeprom_update_performance(void); extern void eeprom_update_fx(void); extern void eeprom_update_dexed(uint8_t instance_id); extern float pseudo_log_curve(float value); -extern float mapfloat(float val, float in_min, float in_max, float out_min, float out_max); extern uint8_t selected_instance_id; #ifdef DISPLAY_LCD_SPI @@ -994,8 +993,8 @@ void UI_func_reverb_level(uint8_t param) lcd_display_bar_int("Reverb Level", configuration.fx.reverb_level, 1.0, REVERB_LEVEL_MIN, REVERB_LEVEL_MAX, 3, false, false, true); - master_mixer_r.gain(3, pseudo_log_curve(configuration.fx.reverb_level / 100.0)); - master_mixer_l.gain(3, pseudo_log_curve(configuration.fx.reverb_level / 100.0)); + master_mixer_r.gain(3, pseudo_log_curve(mapfloat(configuration.fx.reverb_level, REVERB_LEVEL_MIN, REVERB_LEVEL_MAX, 0.0, 1.0))); + master_mixer_l.gain(3, pseudo_log_curve(mapfloat(configuration.fx.reverb_level, REVERB_LEVEL_MIN, REVERB_LEVEL_MAX, 0.0, 1.0))); } if (LCDML.FUNC_close()) // ****** STABLE END ********* @@ -1213,7 +1212,9 @@ void UI_func_chorus_level(uint8_t param) lcd_display_bar_int("Chorus Lvl.", configuration.fx.chorus_level[selected_instance_id], 1.0, CHORUS_LEVEL_MIN, CHORUS_LEVEL_MAX, 3, false, false, false); - chorus_mixer[selected_instance_id]->gain(1, 1.0 - mapfloat(configuration.fx.chorus_level[selected_instance_id], CHORUS_LEVEL_MIN, CHORUS_LEVEL_MAX, 0.0, 0.5)); + //chorus_mixer[selected_instance_id]->gain(0, pseudo_log_curve(1.0 - mapfloat(configuration.fx.chorus_level[selected_instance_id], CHORUS_LEVEL_MIN, CHORUS_LEVEL_MAX, 0.0, 0.5))); + //chorus_mixer[selected_instance_id]->gain(1, pseudo_log_curve(mapfloat(configuration.fx.chorus_level[selected_instance_id], CHORUS_LEVEL_MIN, CHORUS_LEVEL_MAX, 0.0, 0.5))); + //chorus_mixer[selected_instance_id]->gain(0, 1.0 - mapfloat(configuration.fx.chorus_level[selected_instance_id], CHORUS_LEVEL_MIN, CHORUS_LEVEL_MAX, 0.0, 0.5)); chorus_mixer[selected_instance_id]->gain(1, mapfloat(configuration.fx.chorus_level[selected_instance_id], CHORUS_LEVEL_MIN, CHORUS_LEVEL_MAX, 0.0, 0.5)); } @@ -1267,8 +1268,10 @@ void UI_func_delay_time(uint8_t param) lcd_display_bar_int("Delay Time", configuration.fx.delay_time[selected_instance_id], 10.0, DELAY_TIME_MIN, DELAY_TIME_MAX, 3, false, false, true); - delay_fx[selected_instance_id]->delay(0, constrain(configuration.fx.delay_time[selected_instance_id], DELAY_TIME_MIN, DELAY_TIME_MAX) * 10); - Serial.print("--------------->"); Serial.println(constrain(configuration.fx.delay_time[selected_instance_id], DELAY_TIME_MIN, DELAY_TIME_MAX) * 10, DEC); + if (configuration.fx.delay_time[selected_instance_id] <= DELAY_TIME_MIN) + delay_fx[selected_instance_id]->disable(0); + else + delay_fx[selected_instance_id]->delay(0, constrain(configuration.fx.delay_time[selected_instance_id], DELAY_TIME_MIN, DELAY_TIME_MAX) * 10); } if (LCDML.FUNC_close()) // ****** STABLE END ********* @@ -1375,6 +1378,10 @@ void UI_func_delay_level(uint8_t param) lcd_display_bar_int("Delay Lvl.", configuration.fx.delay_level[selected_instance_id], 1.0, DELAY_LEVEL_MIN, DELAY_LEVEL_MAX, 3, false, false, false); delay_mixer[selected_instance_id]->gain(1, pseudo_log_curve(mapfloat(configuration.fx.delay_level[selected_instance_id], DELAY_LEVEL_MIN, DELAY_LEVEL_MAX, 0.0, 1.0))); + if (configuration.fx.delay_level[selected_instance_id] <= DELAY_LEVEL_MIN) + delay_fx[selected_instance_id]->disable(0); + else + delay_fx[selected_instance_id]->delay(0, constrain(configuration.fx.delay_time[selected_instance_id], DELAY_TIME_MIN, DELAY_TIME_MAX) * 10); } if (LCDML.FUNC_close()) // ****** STABLE END ********* diff --git a/config.h b/config.h index edca821..101d209 100644 --- a/config.h +++ b/config.h @@ -245,7 +245,7 @@ //************************************************************************************************* //* DO NO CHANGE ANYTHING BEYOND IF YOU DON'T KNOW WHAT YOU ARE DOING !!! //************************************************************************************************* -#define NUM_DEXED 2 // 1 or 2 - nothing else! +#define NUM_DEXED 1 // 1 or 2 - nothing else! #define MAX_DEXED 2 // No! - even don't think about increasing this number! IT WILL PRODUCE MASSIVE PROBLEMS! //#define CPU_OVERLOAD_THROTTLE 95.0 // Level (in percent) when throttling should start #define CPU_OVERLOAD_THROTTLE_TIMER 100 // timer (in ms) when next throttling is possible @@ -601,7 +601,6 @@ typedef struct configuration_s { uint32_t _marker_; } config_t; -/* #if !defined(_MAPFLOAT) #define _MAPFLOAT inline float mapfloat(float val, float in_min, float in_max, float out_min, float out_max) @@ -609,6 +608,5 @@ inline float mapfloat(float val, float in_min, float in_max, float out_min, floa return (val - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; } #endif -*/ #endif // CONFIG_H_INCLUDED diff --git a/dexed.cpp b/dexed.cpp index 0f26dfe..a214982 100644 --- a/dexed.cpp +++ b/dexed.cpp @@ -116,12 +116,6 @@ void Dexed::getSamples(uint16_t n_samples, int16_t* buffer) uint8_t note; float sumbuf[n_samples]; - if (max_notes == 0) - { - memset(buffer, 0, sizeof(buffer)*AUDIO_BLOCK_SAMPLES); - return; - } - if (refreshVoice) { for (i = 0; i < max_notes; i++) @@ -155,7 +149,9 @@ void Dexed::getSamples(uint16_t n_samples, int16_t* buffer) for (j = 0; j < _N_; ++j) { //sumbuf[i + j] += static_cast(signed_saturate_rshift(audiobuf.get()[j] >> 4, 24, 9)) / 0x8000; - sumbuf[i + j] += static_cast(signed_saturate_rshift(audiobuf.get()[j] >> 5, 24, 9)) / 0x8000; + //sumbuf[i + j] += static_cast(signed_saturate_rshift(audiobuf.get()[j] >> 5, 24, 9)) / 0x8000; + sumbuf[i + j] += static_cast(signed_saturate_rshift(audiobuf.get()[j], 32, 13)) / 0x8000; + //sumbuf[i + j] += static_cast(audiobuf.get()[j] / 0x8000); audiobuf.get()[j] = 0; } } @@ -166,7 +162,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_scale_f32(sumbuf, 0.00015, sumbuf, AUDIO_BLOCK_SAMPLES); arm_float_to_q15(sumbuf, buffer, AUDIO_BLOCK_SAMPLES); }