wirtz
/
MicroDexed
mirror of https://codeberg.org/dcoredump/MicroDexed.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Changed the behavoiur of the delay feedback and delay volume.

Browse Source
pull/4/head
Holger Wirtz 6 years ago
parent 9eb5ddd580
commit 2d5a45d4e6
2 changed files with 17 additions and 13 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 28
      MicroDexed.ino
  2. 2
      UI.cpp

28
MicroDexed.ino
Unescape View File

@ -64,26 +64,27 @@ AudioConnection patchCord1(queue1, peak1);
AudioConnection patchCord2(queue1, 0, filter1, 0); AudioConnection patchCord2(queue1, 0, filter1, 0);
AudioConnection patchCord3(filter1, 0, delay1, 0); AudioConnection patchCord3(filter1, 0, delay1, 0);
AudioConnection patchCord4(filter1, 0, mixer1, 0); AudioConnection patchCord4(filter1, 0, mixer1, 0);
AudioConnection patchCord5(delay1, 0, mixer1, 1); AudioConnection patchCord5(filter1, 0, mixer2, 0);
AudioConnection patchCord6(delay1, 0, mixer2, 1); AudioConnection patchCord6(delay1, 0, mixer1, 1);
AudioConnection patchCord7(mixer1, delay1); AudioConnection patchCord7(delay1, 0, mixer2, 2);
AudioConnection patchCord8(queue1, 0, mixer1, 3); // for disabling the filter AudioConnection patchCord8(mixer1, delay1);
AudioConnection patchCord9(mixer1, 0, mixer2, 0); AudioConnection patchCord9(queue1, 0, mixer1, 3); // for disabling the filter
AudioConnection patchCord10(mixer1, 0, mixer2, 1);
#ifdef TEENSY_AUDIO_BOARD #ifdef TEENSY_AUDIO_BOARD
AudioOutputI2S i2s1; //xy=1200,432 AudioOutputI2S i2s1; //xy=1200,432
AudioControlSGTL5000 sgtl5000_1; //xy=197,554 AudioControlSGTL5000 sgtl5000_1; //xy=197,554
AudioConnection patchCord10(mixer2, 0, i2s1, 0); AudioConnection patchCord11(mixer2, 0, i2s1, 0);
AudioConnection patchCord11(mixer2, 0, i2s1, 1); AudioConnection patchCord12(mixer2, 0, i2s1, 1);
#else #else
AudioOutputPT8211 pt8211_1; //xy=1079,320 AudioOutputPT8211 pt8211_1; //xy=1079,320
AudioAmplifier volume_master; //xy=678,393 AudioAmplifier volume_master; //xy=678,393
AudioAmplifier volume_r; //xy=818,370 AudioAmplifier volume_r; //xy=818,370
AudioAmplifier volume_l; //xy=818,411 AudioAmplifier volume_l; //xy=818,411
AudioConnection patchCord10(mixer2, 0, volume_master, 0); AudioConnection patchCord11(mixer2, 0, volume_master, 0);
AudioConnection patchCord11(volume_master, volume_r); AudioConnection patchCord12(volume_master, volume_r);
AudioConnection patchCord12(volume_master, volume_l); AudioConnection patchCord13(volume_master, volume_l);
AudioConnection patchCord13(volume_r, 0, pt8211_1, 0); AudioConnection patchCord14(volume_r, 0, pt8211_1, 0);
AudioConnection patchCord14(volume_l, 0, pt8211_1, 1); AudioConnection patchCord15(volume_l, 0, pt8211_1, 1);
#endif #endif
// GUItool: end automatically generated code // GUItool: end automatically generated code
@ -258,8 +259,9 @@ void setup()
mixer1.gain(1, mapfloat(effect_delay_feedback, 0, ENC_DELAY_FB_STEPS, 0.0, 1.0)); // amount of feedback mixer1.gain(1, mapfloat(effect_delay_feedback, 0, ENC_DELAY_FB_STEPS, 0.0, 1.0)); // amount of feedback
mixer1.gain(0, 0.0); // filtered signal off mixer1.gain(0, 0.0); // filtered signal off
mixer1.gain(3, 1.0); // original signal on mixer1.gain(3, 1.0); // original signal on
mixer2.gain(0, 1.0); // original signal mixer2.gain(0, 1.0 - mapfloat(effect_delay_volume, 0, ENC_DELAY_VOLUME_STEPS, 0.0, 1.0)); // original signal
mixer2.gain(1, mapfloat(effect_delay_volume, 0, ENC_DELAY_VOLUME_STEPS, 0.0, 1.0)); // delayed signal (including feedback) mixer2.gain(1, mapfloat(effect_delay_volume, 0, ENC_DELAY_VOLUME_STEPS, 0.0, 1.0)); // delayed signal (including feedback)
mixer2.gain(2, mapfloat(effect_delay_volume, 0, ENC_DELAY_VOLUME_STEPS, 0.0, 1.0)); // only delayed signal (without feedback)
// load default SYSEX data // load default SYSEX data
load_sysex(bank, voice); load_sysex(bank, voice);

2
UI.cpp
Unescape View File

@ -371,7 +371,9 @@ void handle_ui(void)
else if (enc[i].read() > ENC_DELAY_VOLUME_STEPS) else if (enc[i].read() > ENC_DELAY_VOLUME_STEPS)
enc[i].write(ENC_DELAY_VOLUME_STEPS); enc[i].write(ENC_DELAY_VOLUME_STEPS);
effect_delay_volume = enc[i].read(); effect_delay_volume = enc[i].read();
mixer2.gain(0, 1.0-mapfloat(effect_delay_volume, 0, ENC_DELAY_VOLUME_STEPS, 0.0, 1.0)); // delay tap1 signal (with added feedback)
mixer2.gain(1, mapfloat(effect_delay_volume, 0, ENC_DELAY_VOLUME_STEPS, 0.0, 1.0)); // delay tap1 signal (with added feedback) mixer2.gain(1, mapfloat(effect_delay_volume, 0, ENC_DELAY_VOLUME_STEPS, 0.0, 1.0)); // delay tap1 signal (with added feedback)
mixer2.gain(2, mapfloat(effect_delay_volume, 0, ENC_DELAY_VOLUME_STEPS, 0.0, 1.0)); // delay tap1 signal (with added feedback)
#ifdef DEBUG #ifdef DEBUG
Serial.print(F("Setting delay volume to: ")); Serial.print(F("Setting delay volume to: "));
Serial.println(effect_delay_volume); Serial.println(effect_delay_volume);

Write Preview
Loading…
Cancel
Save