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

Ready. Fixed all problems with epiano. Ready for merge.

Browse Source
pull/112/head
Holger Wirtz 3 years ago
parent 29d8634a1e
commit f732150d00
3 changed files with 16 additions and 16 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. 26
      MicroDexed.ino
  2. 2
      UI.hpp
  3. 4
      effect_modulated_delay.cpp

26
MicroDexed.ino
Unescape View File

@ -264,8 +264,8 @@ AudioConnection patchCord[] = {
{ep_modchorus, 1, ep_chorus_mixer_l, 1}, {ep_modchorus, 1, ep_chorus_mixer_l, 1},
{ep_chorus_mixer_r, 0, reverb_mixer_r, REVERB_MIX_CH_EPIANO}, {ep_chorus_mixer_r, 0, reverb_mixer_r, REVERB_MIX_CH_EPIANO},
{ep_chorus_mixer_l, 0, reverb_mixer_l, REVERB_MIX_CH_EPIANO}, {ep_chorus_mixer_l, 0, reverb_mixer_l, REVERB_MIX_CH_EPIANO},
{ep_modchorus, 0, master_mixer_r, MASTER_MIX_CH_EPIANO}, {ep_chorus_mixer_r, 0, master_mixer_r, MASTER_MIX_CH_EPIANO},
{ep_modchorus, 1, master_mixer_l, MASTER_MIX_CH_EPIANO}, {ep_chorus_mixer_l, 0, master_mixer_l, MASTER_MIX_CH_EPIANO},
#else #else
{ep_stereo_panorama, 0, master_mixer_r, MASTER_MIX_CH_EPIANO}, {ep_stereo_panorama, 0, master_mixer_r, MASTER_MIX_CH_EPIANO},
{ep_stereo_panorama, 1, master_mixer_l, MASTER_MIX_CH_EPIANO}, {ep_stereo_panorama, 1, master_mixer_l, MASTER_MIX_CH_EPIANO},
@ -1081,7 +1081,7 @@ void handleNoteOn(byte inChannel, byte inNumber, byte inVelocity)
{ {
if (inNumber >= configuration.epiano.lowest_note && inNumber <= configuration.epiano.highest_note) if (inNumber >= configuration.epiano.lowest_note && inNumber <= configuration.epiano.highest_note)
{ {
ep.noteOn(inNumber + configuration.epiano.transpose - 23, inVelocity); ep.noteOn(inNumber + configuration.epiano.transpose - 24, inVelocity);
#ifdef DEBUG #ifdef DEBUG
char note_name[4]; char note_name[4];
getNoteName(note_name, inNumber); getNoteName(note_name, inNumber);
@ -1166,7 +1166,7 @@ void handleNoteOff(byte inChannel, byte inNumber, byte inVelocity)
{ {
if (inNumber >= configuration.epiano.lowest_note && inNumber <= configuration.epiano.highest_note) if (inNumber >= configuration.epiano.lowest_note && inNumber <= configuration.epiano.highest_note)
{ {
ep.noteOff(inNumber + configuration.epiano.transpose - 23); ep.noteOff(inNumber + configuration.epiano.transpose - 24);
#ifdef DEBUG #ifdef DEBUG
char note_name[4]; char note_name[4];
getNoteName(note_name, inNumber); getNoteName(note_name, inNumber);
@ -2646,16 +2646,16 @@ void set_epiano_params(void)
#ifdef DEBUG #ifdef DEBUG
Serial.print(F("Setting EPiano parameters... ")); Serial.print(F("Setting EPiano parameters... "));
#endif #endif
ep.setDecay(mapfloat(configuration.epiano.decay, EP_DECAY_MIN, EP_DECAY_MAX, 0, 1.0)); ep.setDecay(mapfloat(configuration.epiano.decay, EP_DECAY_MIN, EP_DECAY_MAX, 0.0, 1.0));
ep.setRelease(mapfloat(configuration.epiano.release, EP_RELEASE_MIN, EP_RELEASE_MAX, 0, 1.0)); ep.setRelease(mapfloat(configuration.epiano.release, EP_RELEASE_MIN, EP_RELEASE_MAX, 0.0, 1.0));
ep.setHardness(mapfloat(configuration.epiano.hardness, EP_HARDNESS_MIN, EP_HARDNESS_MAX, 0, 1.0)); ep.setHardness(mapfloat(configuration.epiano.hardness, EP_HARDNESS_MIN, EP_HARDNESS_MAX, 0.0, 1.0));
ep.setTreble(mapfloat(configuration.epiano.treble, EP_TREBLE_MIN, EP_TREBLE_MAX, 0, 1.0)); ep.setTreble(mapfloat(configuration.epiano.treble, EP_TREBLE_MIN, EP_TREBLE_MAX, 0.0, 1.0));
ep.setPanTremolo(mapfloat(configuration.epiano.pan_tremolo, EP_PAN_TREMOLO_MIN, EP_PAN_TREMOLO_MAX, 0, 1.0)); ep.setPanTremolo(mapfloat(configuration.epiano.pan_tremolo, EP_PAN_TREMOLO_MIN, EP_PAN_TREMOLO_MAX, 0.0, 1.0));
ep.setPanLFO(mapfloat(configuration.epiano.pan_lfo, EP_PAN_LFO_MIN, EP_PAN_LFO_MAX, 0, 1.0)); ep.setPanLFO(mapfloat(configuration.epiano.pan_lfo, EP_PAN_LFO_MIN, EP_PAN_LFO_MAX, 0.0, 1.0));
ep.setVelocitySense(mapfloat(configuration.epiano.velocity_sense, EP_VELOCITY_SENSE_MIN, EP_VELOCITY_SENSE_MAX, 0, 1.0)); ep.setVelocitySense(mapfloat(configuration.epiano.velocity_sense, EP_VELOCITY_SENSE_MIN, EP_VELOCITY_SENSE_MAX, 0.0, 1.0));
ep.setStereo(mapfloat(configuration.epiano.stereo, EP_STEREO_MIN, EP_STEREO_MAX, 0, 1.0)); ep.setStereo(mapfloat(configuration.epiano.stereo, EP_STEREO_MIN, EP_STEREO_MAX, 0.0, 1.0));
ep.setPolyphony(configuration.epiano.polyphony); ep.setPolyphony(configuration.epiano.polyphony);
ep.setTune((configuration.epiano.tune - 100) / 100.0); ep.setTune(mapfloat(configuration.epiano.tune, EP_TUNE_MIN, EP_TUNE_MAX, 0.0, 1.0));
ep.setDetune(mapfloat(configuration.epiano.detune, EP_DETUNE_MIN, EP_DETUNE_MAX, 0, 1.0)); ep.setDetune(mapfloat(configuration.epiano.detune, EP_DETUNE_MIN, EP_DETUNE_MAX, 0, 1.0));
ep.setOverdrive(mapfloat(configuration.epiano.overdrive, EP_OVERDRIVE_MIN, EP_OVERDRIVE_MAX, 0, 1.0)); ep.setOverdrive(mapfloat(configuration.epiano.overdrive, EP_OVERDRIVE_MIN, EP_OVERDRIVE_MAX, 0, 1.0));
ep.setVolume(mapfloat(configuration.epiano.sound_intensity, EP_SOUND_INTENSITY_MIN, EP_SOUND_INTENSITY_MAX, 0, 1.0)); ep.setVolume(mapfloat(configuration.epiano.sound_intensity, EP_SOUND_INTENSITY_MIN, EP_SOUND_INTENSITY_MAX, 0, 1.0));

2
UI.hpp
Unescape View File

@ -2729,7 +2729,7 @@ void UI_func_epiano_tune(uint8_t param)
lcd_display_meter_int("EP Tune", configuration.epiano.tune, 1.0, -100.0, EP_TUNE_MIN, EP_TUNE_MAX, 3, false, true, false); lcd_display_meter_int("EP Tune", configuration.epiano.tune, 1.0, -100.0, EP_TUNE_MIN, EP_TUNE_MAX, 3, false, true, false);
#if defined(USE_EPIANO) #if defined(USE_EPIANO)
ep.setTune((configuration.epiano.tune - 100) / 100.0); ep.setTune(mapfloat(configuration.epiano.tune, EP_TUNE_MIN, EP_TUNE_MAX, 0.0, 1.0));
#endif #endif
} }

4
effect_modulated_delay.cpp
Unescape View File

@ -307,8 +307,8 @@ void AudioEffectModulatedDelayStereo::update(void)
// RIGHT // RIGHT
// calculate the modulation-index as a floating point number for interpolation // calculate the modulation-index as a floating point number for interpolation
//if (stereo == true) if (stereo == true)
// mod_index *= -1.0; mod_index *= -1.0;
mod_fraction = modff(mod_index, &mod_number); // split float of mod_index into integer (= mod_number) and fraction part mod_fraction = modff(mod_index, &mod_number); // split float of mod_index into integer (= mod_number) and fraction part

Write Preview
Loading…
Cancel
Save