Added epiano.json configuration file.

pull/112/head
Holger Wirtz 3 years ago
parent 89cd9cf069
commit d54852d5d6
  1. 18
      MicroDexed.ino
  2. 15
      UI.hpp
  3. 20
      addon/SD/PERFORMANCE/0/epiano.json
  4. 16
      addon/SD/PERFORMANCE/0/fx.json
  5. 20
      addon/SD/PERFORMANCE/1/epiano.json
  6. 16
      addon/SD/PERFORMANCE/1/fx.json
  7. 20
      addon/SD/PERFORMANCE/2/epiano.json
  8. 16
      addon/SD/PERFORMANCE/2/fx.json
  9. 20
      addon/SD/PERFORMANCE/3/epiano.json
  10. 16
      addon/SD/PERFORMANCE/3/fx.json
  11. 20
      addon/SD/PERFORMANCE/4/epiano.json
  12. 16
      addon/SD/PERFORMANCE/4/fx.json
  13. 20
      addon/SD/PERFORMANCE/5/epiano.json
  14. 16
      addon/SD/PERFORMANCE/5/fx.json
  15. 20
      addon/SD/PERFORMANCE/6/epiano.json
  16. 16
      addon/SD/PERFORMANCE/6/fx.json
  17. 20
      addon/SD/PERFORMANCE/7/epiano.json
  18. 16
      addon/SD/PERFORMANCE/7/fx.json
  19. 20
      addon/SD/PERFORMANCE/8/epiano.json
  20. 16
      addon/SD/PERFORMANCE/8/fx.json
  21. 8
      dexed_sd.cpp
  22. 1
      effect_stereo_panorama.cpp

@ -932,9 +932,9 @@ void loop()
******************************************************************************/ ******************************************************************************/
void handleNoteOn(byte inChannel, byte inNumber, byte inVelocity) void handleNoteOn(byte inChannel, byte inNumber, byte inVelocity)
{ {
// //
// Drum Sampler // Drum Sampler
// //
#if NUM_DRUMS > 0 #if NUM_DRUMS > 0
if (activesample < 6 && seq.seq_running == false && LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_seq_pattern_editor) ) // live play pitched sample if (activesample < 6 && seq.seq_running == false && LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_seq_pattern_editor) ) // live play pitched sample
{ {
@ -1057,9 +1057,9 @@ void handleNoteOn(byte inChannel, byte inNumber, byte inVelocity)
#endif #endif
} }
// //
// E-Piano // E-Piano
// //
#if defined(USE_EPIANO) #if defined(USE_EPIANO)
if (configuration.epiano.midi_channel == MIDI_CHANNEL_OMNI || configuration.epiano.midi_channel == inChannel) if (configuration.epiano.midi_channel == MIDI_CHANNEL_OMNI || configuration.epiano.midi_channel == inChannel)
{ {
@ -2626,6 +2626,9 @@ void set_voiceconfig_params(uint8_t instance_id)
void set_epiano_params(void) void set_epiano_params(void)
{ {
#if defined(USE_EPIANO) #if defined(USE_EPIANO)
#ifdef DEBUG
Serial.print(F("Setting EPiano parameters... "));
#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, 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, 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, 1.0));
@ -2639,6 +2642,9 @@ void set_epiano_params(void)
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));
#ifdef DEBUG
Serial.println(F("done."));
#endif
#else #else
; ;
#endif #endif

@ -7213,7 +7213,7 @@ void UI_func_save_performance(uint8_t param)
static uint8_t mode; static uint8_t mode;
if (LCDML.FUNC_setup()) // ****** SETUP ********* if (LCDML.FUNC_setup()) // ****** SETUP *********
{ {
char tmp[FILENAME_LEN]; char tmp[CONFIG_FILENAME_LEN];
yesno = false; yesno = false;
if (seq.seq_state_last_loadsave != 200) if (seq.seq_state_last_loadsave != 200)
temp_int = seq.seq_state_last_loadsave; temp_int = seq.seq_state_last_loadsave;
@ -7273,7 +7273,7 @@ void UI_func_save_performance(uint8_t param)
{ {
if (yesno == true) if (yesno == true)
{ {
char tmp[FILENAME_LEN]; char tmp[CONFIG_FILENAME_LEN];
sprintf(tmp, "/%s/%d/%s.json", PERFORMANCE_CONFIG_PATH, temp_int, SEQUENCER_CONFIG_NAME); sprintf(tmp, "/%s/%d/%s.json", PERFORMANCE_CONFIG_PATH, temp_int, SEQUENCER_CONFIG_NAME);
SD.remove(tmp); SD.remove(tmp);
} }
@ -7295,8 +7295,9 @@ void UI_func_save_performance(uint8_t param)
} }
if (mode == 0) if (mode == 0)
{ {
char tmp[FILENAME_LEN]; char tmp[CONFIG_FILENAME_LEN];
sprintf(tmp, "/%s/%d/%s.json", PERFORMANCE_CONFIG_PATH, temp_int, SEQUENCER_CONFIG_NAME); sprintf(tmp, "/%s/%d/%s.json", PERFORMANCE_CONFIG_PATH, temp_int, SEQUENCER_CONFIG_NAME);
if (SD.exists(tmp)) if (SD.exists(tmp))
overwrite = true; overwrite = true;
else else
@ -7321,13 +7322,16 @@ void UI_func_save_performance(uint8_t param)
{ {
lcd.setCursor(12, 1); lcd.setCursor(12, 1);
if (yesno == true) if (yesno == true)
{
lcd.print(F("YES")); lcd.print(F("YES"));
}
else else
lcd.print(F("NO ")); lcd.print(F("NO "));
} }
} }
encoderDir[ENC_R].reset(); encoderDir[ENC_R].reset();
} }
if (LCDML.FUNC_close()) // ****** STABLE END ********* if (LCDML.FUNC_close()) // ****** STABLE END *********
{ {
if (mode < 0xff) if (mode < 0xff)
@ -7335,6 +7339,9 @@ void UI_func_save_performance(uint8_t param)
lcd.show(1, 0, 16, "Canceled."); lcd.show(1, 0, 16, "Canceled.");
delay(MESSAGE_WAIT_TIME); delay(MESSAGE_WAIT_TIME);
} }
else
save_sd_performance_json(temp_int);
encoderDir[ENC_R].reset(); encoderDir[ENC_R].reset();
} }
} }
@ -8276,7 +8283,7 @@ void UI_func_sysex_receive_bank(uint8_t param)
Serial.print(receive_bank_filename); Serial.print(receive_bank_filename);
Serial.println(F("]")); Serial.println(F("]"));
#endif #endif
char tmp[FILENAME_LEN]; char tmp[CONFIG_FILENAME_LEN];
strcpy(tmp, receive_bank_filename); strcpy(tmp, receive_bank_filename);
sprintf(receive_bank_filename, "/%d/%s.syx", bank_number, tmp); sprintf(receive_bank_filename, "/%d/%s.syx", bank_number, tmp);
#ifdef DEBUG #ifdef DEBUG

@ -0,0 +1,20 @@
{
"decay": 50,
"release": 50,
"hardness": 50,
"treble": 50,
"pan_tremolo": 65,
"pan_lfo": 25,
"velocity_sense": 50,
"stereo": 100,
"polyphony": 16,
"tune": 50,
"detune": 15,
"overdrive": 0,
"lowest_note": 21,
"highest_note": 108,
"transpose": 0,
"sound_intensity": 100,
"pan": 20,
"midi_channel": 1
}

@ -56,5 +56,17 @@
"eq_4": 0, "eq_4": 0,
"eq_5": 0, "eq_5": 0,
"eq_6": -2, "eq_6": -2,
"eq_7": 8 "eq_7": 8,
} "eq_1": 15,
"eq_2": 0,
"eq_3": 1,
"eq_4": 0,
"eq_5": 0,
"eq_6": -2,
"eq_7": 8,
"ep_chorus_frequency": 0,
"ep_chorus_waveform": 0,
"ep_chorus_dept": 0,
"ep_chorus_level": 0,
"ep_reverb_send": 0
}

@ -0,0 +1,20 @@
{
"decay": 50,
"release": 50,
"hardness": 50,
"treble": 50,
"pan_tremolo": 65,
"pan_lfo": 25,
"velocity_sense": 50,
"stereo": 100,
"polyphony": 16,
"tune": 50,
"detune": 15,
"overdrive": 0,
"lowest_note": 21,
"highest_note": 108,
"transpose": 0,
"sound_intensity": 100,
"pan": 20,
"midi_channel": 1
}

@ -56,5 +56,17 @@
"eq_4": -8, "eq_4": -8,
"eq_5": 0, "eq_5": 0,
"eq_6": -2, "eq_6": -2,
"eq_7": 0 "eq_7": 0,
} "eq_1": 15,
"eq_2": 0,
"eq_3": 1,
"eq_4": 0,
"eq_5": 0,
"eq_6": -2,
"eq_7": 8,
"ep_chorus_frequency": 0,
"ep_chorus_waveform": 0,
"ep_chorus_dept": 0,
"ep_chorus_level": 0,
"ep_reverb_send": 0
}

@ -0,0 +1,20 @@
{
"decay": 50,
"release": 50,
"hardness": 50,
"treble": 50,
"pan_tremolo": 65,
"pan_lfo": 25,
"velocity_sense": 50,
"stereo": 100,
"polyphony": 16,
"tune": 50,
"detune": 15,
"overdrive": 0,
"lowest_note": 21,
"highest_note": 108,
"transpose": 0,
"sound_intensity": 100,
"pan": 20,
"midi_channel": 1
}

@ -56,5 +56,17 @@
"eq_4": 0, "eq_4": 0,
"eq_5": 0, "eq_5": 0,
"eq_6": 0, "eq_6": 0,
"eq_7": 0 "eq_7": 0,
} "eq_1": 15,
"eq_2": 0,
"eq_3": 1,
"eq_4": 0,
"eq_5": 0,
"eq_6": -2,
"eq_7": 8,
"ep_chorus_frequency": 0,
"ep_chorus_waveform": 0,
"ep_chorus_dept": 0,
"ep_chorus_level": 0,
"ep_reverb_send": 0
}

@ -0,0 +1,20 @@
{
"decay": 50,
"release": 50,
"hardness": 50,
"treble": 50,
"pan_tremolo": 65,
"pan_lfo": 25,
"velocity_sense": 50,
"stereo": 100,
"polyphony": 16,
"tune": 50,
"detune": 15,
"overdrive": 0,
"lowest_note": 21,
"highest_note": 108,
"transpose": 0,
"sound_intensity": 100,
"pan": 20,
"midi_channel": 1
}

@ -56,5 +56,17 @@
"eq_4": 0, "eq_4": 0,
"eq_5": 0, "eq_5": 0,
"eq_6": 0, "eq_6": 0,
"eq_7": 0 "eq_7": 0,
} "eq_1": 15,
"eq_2": 0,
"eq_3": 1,
"eq_4": 0,
"eq_5": 0,
"eq_6": -2,
"eq_7": 8,
"ep_chorus_frequency": 0,
"ep_chorus_waveform": 0,
"ep_chorus_dept": 0,
"ep_chorus_level": 0,
"ep_reverb_send": 0
}

@ -0,0 +1,20 @@
{
"decay": 50,
"release": 50,
"hardness": 50,
"treble": 50,
"pan_tremolo": 65,
"pan_lfo": 25,
"velocity_sense": 50,
"stereo": 100,
"polyphony": 16,
"tune": 50,
"detune": 15,
"overdrive": 0,
"lowest_note": 21,
"highest_note": 108,
"transpose": 0,
"sound_intensity": 100,
"pan": 20,
"midi_channel": 1
}

@ -56,5 +56,17 @@
"eq_4": 0, "eq_4": 0,
"eq_5": 0, "eq_5": 0,
"eq_6": 0, "eq_6": 0,
"eq_7": 0 "eq_7": 0,
} "eq_1": 15,
"eq_2": 0,
"eq_3": 1,
"eq_4": 0,
"eq_5": 0,
"eq_6": -2,
"eq_7": 8,
"ep_chorus_frequency": 0,
"ep_chorus_waveform": 0,
"ep_chorus_dept": 0,
"ep_chorus_level": 0,
"ep_reverb_send": 0
}

@ -0,0 +1,20 @@
{
"decay": 50,
"release": 50,
"hardness": 50,
"treble": 50,
"pan_tremolo": 65,
"pan_lfo": 25,
"velocity_sense": 50,
"stereo": 100,
"polyphony": 16,
"tune": 50,
"detune": 15,
"overdrive": 0,
"lowest_note": 21,
"highest_note": 108,
"transpose": 0,
"sound_intensity": 100,
"pan": 20,
"midi_channel": 1
}

@ -56,5 +56,17 @@
"eq_4": 0, "eq_4": 0,
"eq_5": 0, "eq_5": 0,
"eq_6": 0, "eq_6": 0,
"eq_7": 0 "eq_7": 0,
} "eq_1": 15,
"eq_2": 0,
"eq_3": 1,
"eq_4": 0,
"eq_5": 0,
"eq_6": -2,
"eq_7": 8,
"ep_chorus_frequency": 0,
"ep_chorus_waveform": 0,
"ep_chorus_dept": 0,
"ep_chorus_level": 0,
"ep_reverb_send": 0
}

@ -0,0 +1,20 @@
{
"decay": 50,
"release": 50,
"hardness": 50,
"treble": 50,
"pan_tremolo": 65,
"pan_lfo": 25,
"velocity_sense": 50,
"stereo": 100,
"polyphony": 16,
"tune": 50,
"detune": 15,
"overdrive": 0,
"lowest_note": 21,
"highest_note": 108,
"transpose": 0,
"sound_intensity": 100,
"pan": 20,
"midi_channel": 1
}

@ -56,5 +56,17 @@
"eq_4": 0, "eq_4": 0,
"eq_5": 0, "eq_5": 0,
"eq_6": -2, "eq_6": -2,
"eq_7": 8 "eq_7": 8,
} "eq_1": 15,
"eq_2": 0,
"eq_3": 1,
"eq_4": 0,
"eq_5": 0,
"eq_6": -2,
"eq_7": 8,
"ep_chorus_frequency": 0,
"ep_chorus_waveform": 0,
"ep_chorus_dept": 0,
"ep_chorus_level": 0,
"ep_reverb_send": 0
}

@ -0,0 +1,20 @@
{
"decay": 50,
"release": 50,
"hardness": 50,
"treble": 50,
"pan_tremolo": 65,
"pan_lfo": 25,
"velocity_sense": 50,
"stereo": 100,
"polyphony": 16,
"tune": 50,
"detune": 15,
"overdrive": 0,
"lowest_note": 21,
"highest_note": 108,
"transpose": 0,
"sound_intensity": 100,
"pan": 20,
"midi_channel": 1
}

@ -56,5 +56,17 @@
"eq_4": 0, "eq_4": 0,
"eq_5": 0, "eq_5": 0,
"eq_6": -2, "eq_6": -2,
"eq_7": 8 "eq_7": 8,
} "eq_1": 15,
"eq_2": 0,
"eq_3": 1,
"eq_4": 0,
"eq_5": 0,
"eq_6": -2,
"eq_7": 8,
"ep_chorus_frequency": 0,
"ep_chorus_waveform": 0,
"ep_chorus_dept": 0,
"ep_chorus_level": 0,
"ep_reverb_send": 0
}

@ -0,0 +1,20 @@
{
"decay": 50,
"release": 50,
"hardness": 50,
"treble": 50,
"pan_tremolo": 65,
"pan_lfo": 25,
"velocity_sense": 50,
"stereo": 100,
"polyphony": 16,
"tune": 50,
"detune": 15,
"overdrive": 0,
"lowest_note": 21,
"highest_note": 108,
"transpose": 0,
"sound_intensity": 100,
"pan": 20,
"midi_channel": 1
}

@ -56,5 +56,17 @@
"eq_4": 0, "eq_4": 0,
"eq_5": 0, "eq_5": 0,
"eq_6": -2, "eq_6": -2,
"eq_7": 8 "eq_7": 8,
} "eq_1": 15,
"eq_2": 0,
"eq_3": 1,
"eq_4": 0,
"eq_5": 0,
"eq_6": -2,
"eq_7": 8,
"ep_chorus_frequency": 0,
"ep_chorus_waveform": 0,
"ep_chorus_dept": 0,
"ep_chorus_level": 0,
"ep_reverb_send": 0
}

@ -1008,10 +1008,10 @@ bool load_sd_epiano_json(uint8_t number)
configuration.epiano.overdrive = data_json["overdrive"]; configuration.epiano.overdrive = data_json["overdrive"];
configuration.epiano.lowest_note = data_json["lowest_note"]; configuration.epiano.lowest_note = data_json["lowest_note"];
configuration.epiano.highest_note = data_json["highest_note"]; configuration.epiano.highest_note = data_json["highest_note"];
configuration.epiano.transpose = data_json["transpo"]; configuration.epiano.transpose = data_json["transpose"];
configuration.epiano.sound_intensity = data_json["sound_int"]; configuration.epiano.sound_intensity = data_json["sound_intensity"];
configuration.epiano.pan = data_json["pa"]; configuration.epiano.pan = data_json["pan"];
configuration.epiano.midi_channel = data_json["midi_ch"]; configuration.epiano.midi_channel = data_json["midi_channel"];
check_configuration_epiano(); check_configuration_epiano();
set_epiano_params(); set_epiano_params();

@ -68,7 +68,6 @@ inline float mapfloat(float val, float in_min, float in_max, float out_min, floa
void AudioEffectStereoPanorama::panorama(float p) void AudioEffectStereoPanorama::panorama(float p)
{ {
//pan = mapfloat(p, -1.0, 1.0, 1.0, 0.0);
if (p == 0.5) if (p == 0.5)
pan_l = pan_r = 1.0; pan_l = pan_r = 1.0;
else if (p > 0.5) else if (p > 0.5)

Loading…
Cancel
Save