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

Dateien hochladen nach „“

Browse Source
pull/92/head
positionhigh 3 years ago
parent 73dd1f8580
commit 0721cbc3b7
3 changed files with 36 additions and 31 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. 5
      MicroDexed.ino
  2. 10
      UI.hpp
  3. 52
      UI_NO_FX.h

5
MicroDexed.ino
Unescape View File

@ -504,8 +504,10 @@ void setup()
drum_mixer_r.gain(instance_id, 1.0);
drum_mixer_l.gain(instance_id, 1.0);
#ifdef USE_FX
drum_reverb_send_mixer_r.gain(instance_id, 0.0);
drum_reverb_send_mixer_l.gain(instance_id, 0.0);
#endif
}
#endif
@ -830,9 +832,10 @@ void handleNoteOn(byte inChannel, byte inNumber, byte inVelocity)
drum_mixer_r.gain(slot, (1.0 - pan) * pseudo_log_curve(mapfloat(inVelocity, 0, 127, drum_config[d].vol_min, drum_config[d].vol_max)));
drum_mixer_l.gain(slot, (pan) * pseudo_log_curve(mapfloat(inVelocity, 0, 127, drum_config[d].vol_min, drum_config[d].vol_max)));
#ifdef USE_FX
drum_reverb_send_mixer_r.gain(slot, (1.0 - pan) * pseudo_log_curve(drum_config[d].reverb_send));
drum_reverb_send_mixer_l.gain(slot, pan * pseudo_log_curve(drum_config[d].reverb_send));
#endif
if (drum_config[d].drum_data != NULL)
Drum[slot]->play(drum_config[d].drum_data);

10
UI.hpp
Unescape View File

@ -257,7 +257,6 @@ void UI_func_reverb_send(uint8_t param);
void UI_func_filter_cutoff(uint8_t param);
void UI_func_filter_resonance(uint8_t param);
void UI_func_drum_reverb_send(uint8_t param);
void UI_func_drum_midi_channel(uint8_t param);
#endif
void UI_func_transpose(uint8_t param);
void UI_func_tune(uint8_t param);
@ -304,6 +303,7 @@ void UI_func_seq_display_style(uint8_t param);
void UI_func_seq_state_load(uint8_t param);
void UI_func_seq_state_save(uint8_t param);
void UI_func_volume(uint8_t param);
void UI_func_drum_midi_channel(uint8_t param);
void UI_func_load_performance(uint8_t param);
void UI_func_save_performance(uint8_t param);
void UI_func_load_voiceconfig(uint8_t param);
@ -4307,6 +4307,7 @@ void UI_func_seq_tempo(uint8_t param)
lcd.setCursor(11, 1);
sprintf(tmp, "%3d", seq_tempo_ms / 1000);
lcd.print(tmp);
#ifdef USE_FX
for (uint8_t i = 0; i < MAX_DEXED; i++)
{
if (configuration.fx.delay_sync[i] > 0)
@ -4315,6 +4316,7 @@ void UI_func_seq_tempo(uint8_t param)
delay_fx[i]->delay(0, constrain(midi_sync_delay_time, DELAY_TIME_MIN, DELAY_TIME_MAX * 10));
}
}
#endif
//timer1.stop();
timer1.begin(sequencer, seq_tempo_ms / 2);
}
@ -6635,7 +6637,7 @@ void UI_func_load_voiceconfig(uint8_t param)
#if NUM_DEXED > 1
static int8_t selected_instance_id;
#else
char tmp[4];
char tmp[4];
uint8_t selected_instance_id = 0;
#endif
@ -6740,7 +6742,7 @@ void UI_func_save_voiceconfig(uint8_t param)
#if NUM_DEXED > 1
static int8_t selected_instance_id;
#else
char tmp[5];
char tmp[5];
uint8_t selected_instance_id = 0;
#endif
@ -8544,6 +8546,7 @@ void lcd_special_chars(uint8_t mode)
}
}
#ifdef USE_FX
void lcd_display_delay_sync(uint8_t sync)
{
lcd.show(0, 0, LCD_cols - 2, "Delay Sync");
@ -8599,6 +8602,7 @@ void lcd_display_delay_sync(uint8_t sync)
}
lcd.show(1, 15, 1, "!");
}
#endif
void eeprom_update_var(uint16_t pos, uint8_t val, const char* val_string)
{

52
UI_NO_FX.h
Unescape View File

@ -89,31 +89,29 @@ LCDML_add(55, LCDML_0, 4, "Drums", NULL);
LCDML_add(56, LCDML_0_4, 1, "Drums Main Vol", UI_func_drums_main_volume);
LCDML_add(57, LCDML_0_4, 2, "Drum Volumes", UI_func_drum_volume);
LCDML_add(58, LCDML_0_4, 3, "Drum Pan", UI_func_drum_pan);
LCDML_add(59, LCDML_0_4, 4, "Drum Rev.Send", UI_func_drum_reverb_send);
LCDML_add(60, LCDML_0_4, 5, "MIDI Channel", UI_func_drum_midi_channel);
LCDML_add(61, LCDML_0, 5, "Sequencer", NULL);
LCDML_add(62, LCDML_0_5, 1, "Sequencer", UI_func_sequencer);
LCDML_add(63, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor);
LCDML_add(64, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain);
LCDML_add(65, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio);
LCDML_add(66, LCDML_0_5, 5, "Seq. Settings", NULL);
LCDML_add(67, LCDML_0_5_5, 1, "Tempo", UI_func_seq_tempo);
LCDML_add(68, LCDML_0_5_5, 2, "Seq. Length", UI_func_seq_lenght);
LCDML_add(69, LCDML_0_5_5, 3, "Track Setup", UI_func_seq_track_setup);
LCDML_add(70, LCDML_0_5_5, 4, "Seq.Disp.Style", UI_func_seq_display_style);
LCDML_add(71, LCDML_0_5_5, 5, "dexed assign", UI_func_dexed_assign);
LCDML_add(72, LCDML_0_5_5, 6, "shift&transp.", UI_func_arp_shift);
LCDML_add(73, LCDML_0_5_5, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct);
LCDML_add(74, LCDML_0_5_5, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount);
LCDML_add(75, LCDML_0_5, 6, "LOAD Seq.Data", UI_func_seq_state_load);
LCDML_add(76, LCDML_0_5, 7, "SAVE Seq.Data", UI_func_seq_state_save);
LCDML_add(77, LCDML_0, 5, "System", NULL);
LCDML_add(78, LCDML_0_5, 1, "Stereo/Mono", UI_func_stereo_mono);
LCDML_add(79, LCDML_0_5, 2, "MIDI Soft THRU", UI_func_midi_soft_thru);
LCDML_add(80, LCDML_0_5, 3, "Favorites", UI_func_favorites);
LCDML_add(81, LCDML_0_5, 4, "EEPROM Reset", UI_func_eeprom_reset);
LCDML_add(82, LCDML_0, 6, "Info", UI_func_information);
LCDML_addAdvanced(83, LCDML_0, 5, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default);
#define _LCDML_DISP_cnt 83
LCDML_add(59, LCDML_0_4, 4, "MIDI Channel", UI_func_drum_midi_channel);
LCDML_add(60, LCDML_0, 5, "Sequencer", NULL);
LCDML_add(61, LCDML_0_5, 1, "Sequencer", UI_func_sequencer);
LCDML_add(62, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor);
LCDML_add(63, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain);
LCDML_add(64, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio);
LCDML_add(65, LCDML_0_5, 5, "Seq. Settings", NULL);
LCDML_add(66, LCDML_0_5_5, 1, "Tempo", UI_func_seq_tempo);
LCDML_add(67, LCDML_0_5_5, 2, "Seq. Length", UI_func_seq_lenght);
LCDML_add(68, LCDML_0_5_5, 3, "Track Setup", UI_func_seq_track_setup);
LCDML_add(69, LCDML_0_5_5, 4, "Seq.Disp.Style", UI_func_seq_display_style);
LCDML_add(70, LCDML_0_5_5, 5, "dexed assign", UI_func_dexed_assign);
LCDML_add(71, LCDML_0_5_5, 6, "shift&transp.", UI_func_arp_shift);
LCDML_add(72, LCDML_0_5_5, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct);
LCDML_add(73, LCDML_0_5_5, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount);
LCDML_add(74, LCDML_0_5, 6, "LOAD Seq.Data", UI_func_seq_state_load);
LCDML_add(75, LCDML_0_5, 7, "SAVE Seq.Data", UI_func_seq_state_save);
LCDML_add(76, LCDML_0, 6, "System", NULL);
LCDML_add(77, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono);
LCDML_add(78, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru);
LCDML_add(79, LCDML_0_6, 3, "Favorites", UI_func_favorites);
LCDML_add(80, LCDML_0_6, 4, "EEPROM Reset", UI_func_eeprom_reset);
LCDML_add(81, LCDML_0, 7, "Info", UI_func_information);
LCDML_addAdvanced(82, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default);
#define _LCDML_DISP_cnt 82
#endif

Write Preview
Loading…
Cancel
Save