pull/76/head
Holger Wirtz 3 years ago
commit 33472967be
  1. 2
      MicroDexed.ino
  2. 354
      UI.hpp
  3. 161
      UI_FX.h
  4. 36
      UI_FX_T4.h
  5. 52
      UI_NO_FX.h
  6. 2
      config.h
  7. 451
      dexed_sd.cpp
  8. 85
      sequencer.cpp
  9. 24
      sequencer.h

@ -607,6 +607,8 @@ void setup()
#if NUM_DRUMS > 0 #if NUM_DRUMS > 0
master_mixer_r.gain(2, VOL_MAX_FLOAT); master_mixer_r.gain(2, VOL_MAX_FLOAT);
master_mixer_l.gain(2, VOL_MAX_FLOAT); master_mixer_l.gain(2, VOL_MAX_FLOAT);
drums_volume = VOL_MAX_FLOAT;
#else #else
master_mixer_r.gain(2, 0.0); master_mixer_r.gain(2, 0.0);
master_mixer_l.gain(2, 0.0); master_mixer_l.gain(2, 0.0);

354
UI.hpp

@ -51,6 +51,7 @@
extern PeriodicTimer timer1; extern PeriodicTimer timer1;
extern void sequencer(void); extern void sequencer(void);
extern bool check_sd_seq_exists(uint8_t);
extern config_t configuration; extern config_t configuration;
extern void set_volume(uint8_t v, uint8_t m); extern void set_volume(uint8_t v, uint8_t m);
@ -76,6 +77,7 @@ extern uint8_t seq_patternchain[4][4];
extern uint8_t seq_content_type[10]; extern uint8_t seq_content_type[10];
extern uint8_t seq_track_type[4]; extern uint8_t seq_track_type[4];
extern uint8_t seq_step; extern uint8_t seq_step;
extern uint8_t seq_chord_key_ammount;
extern int seq_tempo_ms; extern int seq_tempo_ms;
extern uint8_t seq_bpm; extern uint8_t seq_bpm;
extern uint8_t seq_chain_lenght; extern uint8_t seq_chain_lenght;
@ -90,15 +92,19 @@ extern uint8_t seq_temp_active_menu;
extern uint8_t seq_chain_active_chainstep; //for editor extern uint8_t seq_chain_active_chainstep; //for editor
extern uint8_t seq_chain_active_step; extern uint8_t seq_chain_active_step;
extern int seq_transpose; extern int seq_transpose;
extern uint8_t seq_inst_dexed[4];
extern uint8_t arp_step; extern uint8_t arp_step;
extern uint8_t arp_note; extern uint8_t arp_note;
extern uint8_t arp_chord; extern uint8_t arp_chord;
extern uint8_t arp_octave; extern uint8_t arp_octave;
extern uint8_t arp_oct_usersetting; extern uint8_t arp_lenght;
extern uint8_t arp_style; extern uint8_t arp_style;
extern uint8_t arp_speed; extern uint8_t arp_speed;
extern uint8_t seq_element_shift;
extern int seq_oct_shift;
extern char arp_style_names[4][3]; extern char arp_style_names[4][3];
extern char seq_chord_names[7][4]; extern char seq_chord_names[7][4];
extern float drums_volume;
#endif #endif
#ifdef DISPLAY_LCD_SPI #ifdef DISPLAY_LCD_SPI
@ -285,14 +291,17 @@ void UI_func_information(uint8_t param);
void UI_func_sequencer(uint8_t param); void UI_func_sequencer(uint8_t param);
void UI_func_seq_vel_editor(uint8_t param); void UI_func_seq_vel_editor(uint8_t param);
void UI_func_seq_live_transpose_oct(uint8_t param); void UI_func_seq_live_transpose_oct(uint8_t param);
void UI_func_arp_shift(uint8_t param);
void UI_func_seq_chord_keys_ammount(uint8_t param);
void UI_func_seq_lenght(uint8_t param); void UI_func_seq_lenght(uint8_t param);
void UI_func_seq_tempo(uint8_t param); void UI_func_seq_tempo(uint8_t param);
void UI_func_seq_pat_chain(uint8_t param); void UI_func_seq_pat_chain(uint8_t param);
void UI_func_arpeggio(uint8_t param); void UI_func_arpeggio(uint8_t param);
void UI_func_seq_track_setup(uint8_t param); void UI_func_seq_track_setup(uint8_t param);
void UI_func_dexed_assign(uint8_t param);
void UI_func_seq_display_style(uint8_t param); void UI_func_seq_display_style(uint8_t param);
void UI_func_seq_pattern_load(uint8_t param); void UI_func_seq_state_load(uint8_t param);
void UI_func_seq_pattern_save(uint8_t param); void UI_func_seq_state_save(uint8_t param);
void UI_func_volume(uint8_t param); void UI_func_volume(uint8_t param);
void UI_func_load_performance(uint8_t param); void UI_func_load_performance(uint8_t param);
void UI_func_save_performance(uint8_t param); void UI_func_save_performance(uint8_t param);
@ -342,7 +351,7 @@ void locate_previous_favorite();
void locate_next_favorite(); void locate_next_favorite();
void locate_next_non_favorite(); void locate_next_non_favorite();
void locate_random_non_favorite(); void locate_random_non_favorite();
void UI_func_drum_main_volume(uint8_t param); void UI_func_drums_main_volume(uint8_t param);
void UI_func_drum_volume(uint8_t param); void UI_func_drum_volume(uint8_t param);
void UI_func_drum_pan(uint8_t param); void UI_func_drum_pan(uint8_t param);
@ -3605,6 +3614,10 @@ void UI_func_drum_reverb_send(uint8_t param)
encoderDir[ENC_R].reset(); encoderDir[ENC_R].reset();
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
lcd.print("Drum Rev. Send"); lcd.print("Drum Rev. Send");
lcd.setCursor(1, 1);
sprintf(displayname, "%02d", activesample);
lcd.print(displayname);
lcd.show(4, 5, 6, basename(drum_config[activesample].name));
} }
if (LCDML.FUNC_loop()) // ****** LOOP ********* if (LCDML.FUNC_loop()) // ****** LOOP *********
{ {
@ -3679,9 +3692,42 @@ void UI_func_drum_reverb_send(uint8_t param)
} }
} }
void UI_func_drum_main_volume(uint8_t param) void UI_func_drums_main_volume(uint8_t param)
{ {
; char displayname[4] = {0, 0, 0, 0};
if (LCDML.FUNC_setup()) // ****** SETUP *********
{
encoderDir[ENC_R].reset();
temp_int = mapfloat(drums_volume, 0.0, VOL_MAX_FLOAT, 0, 100);
lcd.setCursor(0, 0);
lcd.print(" Drums M.Volume ");
}
if (LCDML.FUNC_loop()) // ****** LOOP *********
{
if ((LCDML.BT_checkDown() && encoderDir[ENC_R].Down()) || (LCDML.BT_checkUp() && encoderDir[ENC_R].Up()) || (LCDML.BT_checkEnter() && encoderDir[ENC_R].ButtonShort()))
{
if (LCDML.BT_checkDown())
{
temp_int = constrain(temp_int + ENCODER[ENC_R].speed(), 0, 100);
}
else if (LCDML.BT_checkUp())
{
temp_int = constrain(temp_int - ENCODER[ENC_R].speed(), 0, 100);
}
}
lcd.setCursor(5, 1);
sprintf(displayname, "%03d", temp_int);
lcd.print(displayname);
lcd.setCursor(8, 1);
lcd.print("/100");
master_mixer_r.gain (2, mapfloat(temp_int, 0, 100, 0.0, VOL_MAX_FLOAT));
master_mixer_l.gain (2, mapfloat(temp_int, 0, 100, 0.0, VOL_MAX_FLOAT));
drums_volume = mapfloat(temp_int, 0, 100, 0.0, VOL_MAX_FLOAT);
}
if (LCDML.FUNC_close()) // ****** STABLE END *********
{
encoderDir[ENC_R].reset();
}
} }
void UI_func_drum_volume(uint8_t param) void UI_func_drum_volume(uint8_t param)
@ -3692,6 +3738,12 @@ void UI_func_drum_volume(uint8_t param)
encoderDir[ENC_R].reset(); encoderDir[ENC_R].reset();
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
lcd.print("DrumSmp. Volume"); lcd.print("DrumSmp. Volume");
lcd.setCursor(1, 1);
lcd.setCursor(1, 1);
sprintf(displayname, "%02d", activesample);
lcd.print(displayname);
lcd.show(1, 4, 7, basename(drum_config[activesample].name));
} }
if (LCDML.FUNC_loop()) // ****** LOOP ********* if (LCDML.FUNC_loop()) // ****** LOOP *********
{ {
@ -3767,6 +3819,88 @@ void UI_func_drum_volume(uint8_t param)
} }
} }
void UI_func_arp_shift(uint8_t param)
{
char displayname[4] = {0, 0, 0, 0};
if (LCDML.FUNC_setup()) // ****** SETUP *********
{
encoderDir[ENC_R].reset();
lcd.setCursor(0, 0);
lcd.print("Arp/Chord Transp");
lcd.setCursor(0, 1);
lcd.print("Oct");
lcd.setCursor(4, 1);
sprintf(displayname, "%02d", seq_oct_shift);
lcd.print(displayname);
lcd.setCursor(8, 1);
lcd.print("Shift");
lcd.setCursor(14, 1);
lcd.print(seq_element_shift);
}
if (LCDML.FUNC_loop()) // ****** LOOP *********
{
if (menu_select_toggle == false) {
if ((LCDML.BT_checkDown() && encoderDir[ENC_R].Down()) || (LCDML.BT_checkUp() && encoderDir[ENC_R].Up()) || (LCDML.BT_checkEnter() && encoderDir[ENC_R].ButtonShort()))
{
if (LCDML.BT_checkDown())
{
seq_oct_shift = constrain(seq_oct_shift + ENCODER[ENC_R].speed(), -2, 2);
}
else if (LCDML.BT_checkUp())
{
seq_oct_shift = constrain(seq_oct_shift - ENCODER[ENC_R].speed(), -2, 2);
}
}
} else {
if ((LCDML.BT_checkDown() && encoderDir[ENC_R].Down()) || (LCDML.BT_checkUp() && encoderDir[ENC_R].Up()) || (LCDML.BT_checkEnter() && encoderDir[ENC_R].ButtonShort()))
{
if (LCDML.BT_checkDown())
{
seq_element_shift = constrain(seq_element_shift + ENCODER[ENC_R].speed(), 0, 6);
}
else if (LCDML.BT_checkUp())
{
seq_element_shift = constrain(seq_element_shift - ENCODER[ENC_R].speed(), 0, 6);
}
}
}
if (LCDML.BT_checkEnter())
{
menu_select_toggle = !menu_select_toggle;
}
if (menu_select_toggle == false)
{ lcd.setCursor(13, 1);
lcd.print(" ");
lcd.setCursor(15, 1);
lcd.print(" ");
lcd.setCursor(3, 1);
lcd.print("[");
lcd.setCursor(6, 1);
lcd.print("]");
lcd.setCursor(4, 1);
sprintf(displayname, "%02d", seq_oct_shift);
lcd.print(displayname);
} else {
lcd.setCursor(3, 1);
lcd.print(" ");
lcd.setCursor(6, 1);
lcd.print(" ");
lcd.setCursor(13, 1);
lcd.print("[");
lcd.setCursor(15, 1);
lcd.print("]");
lcd.setCursor(14, 1);
lcd.print(seq_element_shift);
}
}
if (LCDML.FUNC_close()) // ****** STABLE END *********
{
encoderDir[ENC_R].reset();
}
}
void UI_func_drum_pan(uint8_t param) void UI_func_drum_pan(uint8_t param)
{ {
char displayname[8] = {0, 0, 0, 0, 0, 0, 0}; char displayname[8] = {0, 0, 0, 0, 0, 0, 0};
@ -3775,6 +3909,10 @@ void UI_func_drum_pan(uint8_t param)
encoderDir[ENC_R].reset(); encoderDir[ENC_R].reset();
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
lcd.print("DrmSmp. Panorama"); lcd.print("DrmSmp. Panorama");
lcd.setCursor(1, 1);
sprintf(displayname, "%02d", activesample);
lcd.print(displayname);
lcd.show(1, 4, 6, basename(drum_config[activesample].name));
} }
if (LCDML.FUNC_loop()) // ****** LOOP ********* if (LCDML.FUNC_loop()) // ****** LOOP *********
{ {
@ -3848,7 +3986,7 @@ void UI_func_drum_pan(uint8_t param)
else { else {
lcd.print("C"); lcd.print("C");
} }
sprintf(displayname, "%02d", temp_int); sprintf(displayname, "%02d", abs(temp_int));
lcd.setCursor(13, 1); lcd.setCursor(13, 1);
lcd.print( displayname); lcd.print( displayname);
} }
@ -4047,6 +4185,38 @@ void UI_func_seq_live_transpose_oct(uint8_t param)
} }
} }
void UI_func_seq_chord_keys_ammount(uint8_t param)
{
char displayname[4] = {0, 0, 0, 0};
if (LCDML.FUNC_setup()) // ****** SETUP *********
{
encoderDir[ENC_R].reset();
lcd.setCursor(0, 0);
lcd.print("ChordTrack Keys:");
lcd.setCursor(8, 1);
lcd.print("Keys");
}
if (LCDML.FUNC_loop()) // ****** LOOP *********
{
if ((LCDML.BT_checkDown() && encoderDir[ENC_R].Down()) || (LCDML.BT_checkUp() && encoderDir[ENC_R].Up()) || (LCDML.BT_checkEnter() && encoderDir[ENC_R].ButtonShort()))
{
if (LCDML.BT_checkDown())
seq_chord_key_ammount = constrain(seq_chord_key_ammount + ENCODER[ENC_R].speed(), 1, 7);
else if (LCDML.BT_checkUp())
seq_chord_key_ammount = constrain(seq_chord_key_ammount - ENCODER[ENC_R].speed(), 1, 7);
}
lcd.setCursor(4, 1);
lcd.print("[");
sprintf(displayname, "%02d", seq_chord_key_ammount);
lcd.print(displayname);
lcd.print("]");
}
if (LCDML.FUNC_close()) // ****** STABLE END *********
{
encoderDir[ENC_R].reset();
}
}
void UI_func_seq_lenght(uint8_t param) void UI_func_seq_lenght(uint8_t param)
{ {
if (LCDML.FUNC_setup()) // ****** SETUP ********* if (LCDML.FUNC_setup()) // ****** SETUP *********
@ -4416,7 +4586,7 @@ void UI_func_sequencer(uint8_t param)
seq_active_track = constrain(seq_active_track - 1, 0, 9); seq_active_track = constrain(seq_active_track - 1, 0, 9);
lcd.setCursor(1, 0); lcd.setCursor(1, 0);
if (seq_content_type[seq_active_track] == 0) lcd.print("Drum "); else lcd.print("Inst "); //else lcd.print("[ ]"); if (seq_content_type[seq_active_track] == 0) lcd.print("Drum "); else if (seq_content_type[seq_active_track] == 1) lcd.print("Instr "); else if (seq_content_type[seq_active_track] == 2) lcd.print("Chord "); else lcd.print("Arp ");
} }
} }
if (LCDML.BT_checkEnter()) //handle button presses during menu >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> if (LCDML.BT_checkEnter()) //handle button presses during menu >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@ -4488,7 +4658,7 @@ void UI_func_sequencer(uint8_t param)
seq_active_function = 0; seq_active_function = 0;
} else if ( seq_menu == 0 && seq_active_function == 0) } else if ( seq_menu == 0 && seq_active_function == 0)
{ {
if ( (seq_content_type[seq_active_track] == 0 && activesample == NUM_DRUMSET_CONFIG + 4) || (seq_content_type[seq_active_track] == 1 && temp_int == 114) ) if ( (seq_content_type[seq_active_track] == 0 && activesample == NUM_DRUMSET_CONFIG + 4) || (seq_content_type[seq_active_track] > 0 && temp_int == 114) )
{ //fill patterns { //fill patterns
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
lcd.print("Fill Pattern:"); lcd.print("Fill Pattern:");
@ -4498,25 +4668,25 @@ void UI_func_sequencer(uint8_t param)
seq_temp_select_menu = 0; seq_temp_select_menu = 0;
seq_temp_active_menu = 0; seq_temp_active_menu = 0;
} }
else if ( (seq_content_type[seq_active_track] == 0 && activesample == NUM_DRUMSET_CONFIG + 3) || (seq_content_type[seq_active_track] == 1 && temp_int == 113) ) else if ( (seq_content_type[seq_active_track] == 0 && activesample == NUM_DRUMSET_CONFIG + 3) || (seq_content_type[seq_active_track] > 0 && temp_int == 113) )
{ //swap patterns: Active pattern <-> destination pattern { //swap patterns: Active pattern <-> destination pattern
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
lcd.print("Swap Pattern:"); lcd.print("Swap Pattern:");
temp_int = seq_active_track + 1; temp_int = seq_active_track + 1;
if (temp_int > 9)temp_int = 0; if (temp_int > 9)temp_int = 0;
seq_menu = 30; seq_menu = 30;
} else if ( (seq_content_type[seq_active_track] == 0 && activesample == NUM_DRUMSET_CONFIG + 2) || (seq_content_type[seq_active_track] == 1 && temp_int == 112) ) } else if ( (seq_content_type[seq_active_track] == 0 && activesample == NUM_DRUMSET_CONFIG + 2) || (seq_content_type[seq_active_track] > 0 && temp_int == 112) )
{ //copy pattern { //copy pattern
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
lcd.print("Copy Pattern:"); lcd.print("Copy Pattern:");
temp_int = seq_active_track + 1; temp_int = seq_active_track + 1;
if (temp_int > 9)temp_int = 0; if (temp_int > 9)temp_int = 0;
seq_menu = 31; seq_menu = 31;
} else if ( (seq_content_type[seq_active_track] == 0 && activesample == NUM_DRUMSET_CONFIG + 1) || (seq_content_type[seq_active_track] == 1 && temp_int == 111) ) } else if ( (seq_content_type[seq_active_track] == 0 && activesample == NUM_DRUMSET_CONFIG + 1) || (seq_content_type[seq_active_track] > 0 && temp_int == 111) )
{ //clear all patterns { //clear all patterns
seq_clear_all_patterns(); seq_clear_all_patterns();
seq_printAllSeqSteps(); seq_printAllSeqSteps();
} else if ( (seq_content_type[seq_active_track] == 0 && activesample == NUM_DRUMSET_CONFIG) || (seq_content_type[seq_active_track] == 1 && temp_int == 110) ) } else if ( (seq_content_type[seq_active_track] == 0 && activesample == NUM_DRUMSET_CONFIG) || (seq_content_type[seq_active_track] > 0 && temp_int == 110) )
{ //clear pattern { //clear pattern
seq_clear_active_pattern(); seq_clear_active_pattern();
seq_printAllSeqSteps(); seq_printAllSeqSteps();
@ -4605,7 +4775,7 @@ void UI_func_sequencer(uint8_t param)
} else if (seq_menu == 32 ) { //fill pattern } else if (seq_menu == 32 ) { //fill pattern
if (seq_content_type[seq_active_track] == 0) { //inst if (seq_content_type[seq_active_track] == 0) { //drum
lcd.setCursor(0, 1); lcd.setCursor(0, 1);
lcd.print("with"); lcd.print("with");
lcd.setCursor(4, 1); lcd.setCursor(4, 1);
@ -4792,7 +4962,7 @@ void UI_func_arpeggio(uint8_t param)
seq_temp_select_menu = 0; seq_temp_select_menu = 0;
seq_temp_active_menu = 0; seq_temp_active_menu = 0;
lcd.setCursor( 0, 0); lcd.setCursor( 0, 0);
lcd.print("Oct"); lcd.print("Len");
lcd.setCursor(7, 0); lcd.setCursor(7, 0);
lcd.print( seq_chord_names[arp_chord][0]); lcd.print( seq_chord_names[arp_chord][0]);
lcd.print( seq_chord_names[arp_chord][1]); lcd.print( seq_chord_names[arp_chord][1]);
@ -4814,12 +4984,13 @@ void UI_func_arpeggio(uint8_t param)
seq_temp_select_menu = constrain(seq_temp_select_menu + ENCODER[ENC_R].speed(), 0, 3); seq_temp_select_menu = constrain(seq_temp_select_menu + ENCODER[ENC_R].speed(), 0, 3);
else if (LCDML.BT_checkUp()) else if (LCDML.BT_checkUp())
seq_temp_select_menu = constrain(seq_temp_select_menu - ENCODER[ENC_R].speed(), 0, 3); seq_temp_select_menu = constrain(seq_temp_select_menu - ENCODER[ENC_R].speed(), 0, 3);
} else if (seq_temp_active_menu == 1) // Octave setting }
else if (seq_temp_active_menu == 1) // Octave setting
{ {
if (LCDML.BT_checkDown()) if (LCDML.BT_checkDown())
arp_oct_usersetting = constrain(arp_oct_usersetting + ENCODER[ENC_R].speed(), 0, 3); arp_lenght = constrain(arp_lenght + ENCODER[ENC_R].speed(), 0, 9);
else if (LCDML.BT_checkUp()) else if (LCDML.BT_checkUp())
arp_oct_usersetting = constrain(arp_oct_usersetting - ENCODER[ENC_R].speed(), 0, 3); arp_lenght = constrain(arp_lenght - ENCODER[ENC_R].speed(), 0, 9);
} }
else if (seq_temp_active_menu == 2) // Style setting else if (seq_temp_active_menu == 2) // Style setting
{ {
@ -4885,10 +5056,8 @@ void UI_func_arpeggio(uint8_t param)
} }
} }
} }
lcd.setCursor( 4, 0); lcd.setCursor( 4, 0);
lcd.print(arp_oct_usersetting); lcd.print(arp_lenght);
lcd.setCursor( 6, 1); lcd.setCursor( 6, 1);
lcd.print( arp_style_names[arp_style][0] ); lcd.print( arp_style_names[arp_style][0] );
lcd.print( arp_style_names[arp_style][1] ); lcd.print( arp_style_names[arp_style][1] );
@ -4909,11 +5078,9 @@ void UI_func_arpeggio(uint8_t param)
lcd.print(" "); lcd.print(" ");
lcd.setCursor( 15, 1); lcd.setCursor( 15, 1);
lcd.print(" "); lcd.print(" ");
} }
else if (seq_temp_select_menu == 1) else if (seq_temp_select_menu == 1)
{ {
lcd.setCursor( 5, 1); lcd.setCursor( 5, 1);
lcd.print("["); lcd.print("[");
lcd.setCursor( 9, 1); lcd.setCursor( 9, 1);
@ -4957,7 +5124,6 @@ void UI_func_arpeggio(uint8_t param)
lcd.setCursor( 5, 0); lcd.setCursor( 5, 0);
lcd.print(" "); lcd.print(" ");
} }
} }
if (LCDML.FUNC_close()) // ****** STABLE END ********* if (LCDML.FUNC_close()) // ****** STABLE END *********
{ {
@ -5270,7 +5436,122 @@ void UI_func_seq_track_setup(uint8_t param)
} }
} }
void UI_func_seq_pattern_load(uint8_t param) void UI_func_dexed_assign(uint8_t param)
{
if (LCDML.FUNC_setup()) // ****** SETUP *********
{
// setup function
seq_temp_active_menu = 99;
lcd.setCursor(0 , 0);
lcd.print("T1");
lcd.setCursor(0 , 1);
lcd.print("T2");
lcd.setCursor(9 , 0);
lcd.print("T3");
lcd.setCursor(9 , 1);
lcd.print("T4");
lcd.setCursor(3 , 0);
if (seq_inst_dexed[0] == 0 ) lcd.print("D1"); else lcd.print("D2");
lcd.setCursor(3 , 1);
if (seq_inst_dexed[1] == 0 ) lcd.print("D1"); else lcd.print("D2");
lcd.setCursor(12 , 0);
if (seq_inst_dexed[2] == 0 ) lcd.print("D1"); else lcd.print("D2");
lcd.setCursor(12 , 1);
if (seq_inst_dexed[3] == 0 ) lcd.print("D1"); else lcd.print("D2");
}
if (LCDML.FUNC_loop()) // ****** LOOP *********
{
if (seq_temp_active_menu == 99) {
if ((LCDML.BT_checkDown() && encoderDir[ENC_R].Down()) || (LCDML.BT_checkUp() && encoderDir[ENC_R].Up()))
{
if (LCDML.BT_checkDown())
seq_temp_select_menu = constrain(seq_temp_select_menu + 1, 0, 3);
else if (LCDML.BT_checkUp())
seq_temp_select_menu = constrain(seq_temp_select_menu - 1, 0, 3);
}
} else {
if ((LCDML.BT_checkDown() && encoderDir[ENC_R].Down()) || (LCDML.BT_checkUp() && encoderDir[ENC_R].Up()))
{
if (LCDML.BT_checkDown())
seq_inst_dexed[seq_temp_active_menu] = constrain(seq_inst_dexed[seq_temp_active_menu] + 1, 0, 1);
else if (LCDML.BT_checkUp())
seq_inst_dexed[seq_temp_active_menu] = constrain(seq_inst_dexed[seq_temp_active_menu] - 1, 0, 1);
}
}
if (LCDML.BT_checkEnter()) //handle button presses during menu >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
{
if (seq_temp_active_menu == 99) {
seq_temp_active_menu = seq_temp_select_menu;
} else
{
seq_temp_active_menu = 99;
}
}
if (seq_temp_select_menu == 0)
{
lcd.setCursor(2 , 0);
lcd.print("[");
lcd.setCursor(6 , 0);
lcd.print("]");
lcd.setCursor(2 , 1);
lcd.print(" ");
lcd.setCursor(6 , 1);
lcd.print(" ");
lcd.setCursor(3 , 0);
if (seq_inst_dexed[0] == 0 ) lcd.print("D1"); else lcd.print("D2");
} else if (seq_temp_select_menu == 1)
{
lcd.setCursor(2 , 0);
lcd.print(" ");
lcd.setCursor(6 , 0);
lcd.print(" ");
lcd.setCursor(2 , 1);
lcd.print("[");
lcd.setCursor(6 , 1);
lcd.print("]");
lcd.setCursor(11 , 0);
lcd.print(" ");
lcd.setCursor(15 , 0);
lcd.print(" ");
lcd.setCursor(3 , 1);
if (seq_inst_dexed[1] == 0 ) lcd.print("D1"); else lcd.print("D2");
} else if (seq_temp_select_menu == 2)
{
lcd.setCursor(2 , 1);
lcd.print(" ");
lcd.setCursor(6 , 1);
lcd.print(" ");
lcd.setCursor(11 , 0);
lcd.print("[");
lcd.setCursor(15 , 0);
lcd.print("]");
lcd.setCursor(11 , 1);
lcd.print(" ");
lcd.setCursor(15 , 1);
lcd.print(" ");
lcd.setCursor(12 , 0);
if (seq_inst_dexed[2] == 0 ) lcd.print("D1"); else lcd.print("D2");
} else if (seq_temp_select_menu == 3)
{
lcd.setCursor(11 , 0);
lcd.print(" ");
lcd.setCursor(15 , 0);
lcd.print(" ");
lcd.setCursor(11 , 1);
lcd.print("[");
lcd.setCursor(15 , 1);
lcd.print("]");
lcd.setCursor(12 , 1);
if (seq_inst_dexed[3] == 0 ) lcd.print("D1"); else lcd.print("D2");
}
}
if (LCDML.FUNC_close()) // ****** STABLE END *********
{
encoderDir[ENC_R].reset();
}
}
void UI_func_seq_state_load(uint8_t param)
{ {
static uint8_t mode; static uint8_t mode;
if (LCDML.FUNC_setup()) // ****** SETUP ********* if (LCDML.FUNC_setup()) // ****** SETUP *********
@ -5280,7 +5561,7 @@ void UI_func_seq_pattern_load(uint8_t param)
mode = 0; mode = 0;
encoderDir[ENC_R].reset(); encoderDir[ENC_R].reset();
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
lcd.print(F("Load Patterns")); lcd.print(F("Load Seq. state "));
lcd.setCursor(0, 1); lcd.setCursor(0, 1);
sprintf(tmp, "[%2d]", param); sprintf(tmp, "[%2d]", param);
lcd.print(tmp); lcd.print(tmp);
@ -5311,11 +5592,18 @@ void UI_func_seq_pattern_load(uint8_t param)
delay(MESSAGE_WAIT_TIME); delay(MESSAGE_WAIT_TIME);
LCDML.FUNC_goBackToMenu(); LCDML.FUNC_goBackToMenu();
} }
lcd.setCursor(0, 1);
char tmp[10];
sprintf(tmp, "[%2d]", temp_int);
lcd.print(tmp);
} }
lcd.setCursor(0, 1);
char tmp[10];
sprintf(tmp, "[%2d]", temp_int);
lcd.print(tmp);
lcd.setCursor(5, 1);
if (check_sd_seq_exists(temp_int))
{
lcd.print("-- DATA --");
}
else lcd.print(" ");
} }
if (LCDML.FUNC_close()) // ****** STABLE END ********* if (LCDML.FUNC_close()) // ****** STABLE END *********
{ {
@ -5329,7 +5617,7 @@ void UI_func_seq_pattern_load(uint8_t param)
} }
} }
void UI_func_seq_pattern_save(uint8_t param) void UI_func_seq_state_save(uint8_t param)
{ {
static bool overwrite; static bool overwrite;
static bool yesno; static bool yesno;
@ -5342,7 +5630,7 @@ void UI_func_seq_pattern_save(uint8_t param)
mode = 0; mode = 0;
encoderDir[ENC_R].reset(); encoderDir[ENC_R].reset();
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
lcd.print(F("Save Patterns to:")); lcd.print(F("Save Seq. state:"));
lcd.setCursor(0, 1); lcd.setCursor(0, 1);
sprintf(tmp, "[%2d]", temp_int); sprintf(tmp, "[%2d]", temp_int);
lcd.print(tmp); lcd.print(tmp);
@ -5417,6 +5705,8 @@ void UI_func_seq_pattern_save(uint8_t param)
lcd.setCursor(0, 1); lcd.setCursor(0, 1);
sprintf(tmp, "[%2d]", temp_int); sprintf(tmp, "[%2d]", temp_int);
lcd.print(tmp); lcd.print(tmp);
lcd.setCursor(5, 1);
if (overwrite == false)lcd.print("-- empty --"); else lcd.print(" ");
} }
else else
{ {

@ -61,83 +61,86 @@ LCDML_add(27, LCDML_0_1_2_3_5, 4, "1000Hz", UI_func_eq_4);
LCDML_add(28, LCDML_0_1_2_3_5, 5, "2000Hz", UI_func_eq_5); LCDML_add(28, LCDML_0_1_2_3_5, 5, "2000Hz", UI_func_eq_5);
LCDML_add(29, LCDML_0_1_2_3_5, 6, "7000Hz", UI_func_eq_6); LCDML_add(29, LCDML_0_1_2_3_5, 6, "7000Hz", UI_func_eq_6);
LCDML_add(30, LCDML_0_1_2_3_5, 7, "10000Hz", UI_func_eq_7); LCDML_add(30, LCDML_0_1_2_3_5, 7, "10000Hz", UI_func_eq_7);
LCDML_add(31, LCDML_0_1, 3, "Controller", NULL); LCDML_add(30, LCDML_0_1, 3, "Controller", NULL);
LCDML_add(32, LCDML_0_1_3, 1, "Pitchbend", NULL); LCDML_add(31, LCDML_0_1_3, 1, "Pitchbend", NULL);
LCDML_add(33, LCDML_0_1_3_1, 1, "PB Range", UI_func_pb_range); LCDML_add(32, LCDML_0_1_3_1, 1, "PB Range", UI_func_pb_range);
LCDML_add(34, LCDML_0_1_3_1, 2, "PB Step", UI_func_pb_step); LCDML_add(33, LCDML_0_1_3_1, 2, "PB Step", UI_func_pb_step);
LCDML_add(35, LCDML_0_1_3, 2, "Mod Wheel", NULL); LCDML_add(34, LCDML_0_1_3, 2, "Mod Wheel", NULL);
LCDML_add(36, LCDML_0_1_3_2, 1, "MW Range", UI_func_mw_range); LCDML_add(35, LCDML_0_1_3_2, 1, "MW Range", UI_func_mw_range);
LCDML_add(37, LCDML_0_1_3_2, 2, "MW Assign", UI_func_mw_assign); LCDML_add(36, LCDML_0_1_3_2, 2, "MW Assign", UI_func_mw_assign);
LCDML_add(38, LCDML_0_1_3_2, 3, "MW Mode", UI_func_mw_mode); LCDML_add(37, LCDML_0_1_3_2, 3, "MW Mode", UI_func_mw_mode);
LCDML_add(39, LCDML_0_1_3, 3, "Aftertouch", NULL); LCDML_add(38, LCDML_0_1_3, 3, "Aftertouch", NULL);
LCDML_add(40, LCDML_0_1_3_3, 1, "AT Range", UI_func_at_range); LCDML_add(39, LCDML_0_1_3_3, 1, "AT Range", UI_func_at_range);
LCDML_add(41, LCDML_0_1_3_3, 2, "AT Assign", UI_func_at_assign); LCDML_add(40, LCDML_0_1_3_3, 2, "AT Assign", UI_func_at_assign);
LCDML_add(42, LCDML_0_1_3_3, 3, "AT Mode", UI_func_at_mode); LCDML_add(41, LCDML_0_1_3_3, 3, "AT Mode", UI_func_at_mode);
LCDML_add(43, LCDML_0_1_3, 4, "Foot Ctrl", NULL); LCDML_add(42, LCDML_0_1_3, 4, "Foot Ctrl", NULL);
LCDML_add(44, LCDML_0_1_3_4, 1, "FC Range", UI_func_fc_range); LCDML_add(43, LCDML_0_1_3_4, 1, "FC Range", UI_func_fc_range);
LCDML_add(45, LCDML_0_1_3_4, 2, "FC Assign", UI_func_fc_assign); LCDML_add(44, LCDML_0_1_3_4, 2, "FC Assign", UI_func_fc_assign);
LCDML_add(46, LCDML_0_1_3_4, 3, "FC Mode", UI_func_fc_mode); LCDML_add(45, LCDML_0_1_3_4, 3, "FC Mode", UI_func_fc_mode);
LCDML_add(47, LCDML_0_1_3, 5, "Breath Ctrl", NULL); LCDML_add(46, LCDML_0_1_3, 5, "Breath Ctrl", NULL);
LCDML_add(48, LCDML_0_1_3_5, 1, "BC Range", UI_func_bc_range); LCDML_add(47, LCDML_0_1_3_5, 1, "BC Range", UI_func_bc_range);
LCDML_add(49, LCDML_0_1_3_5, 2, "BC Assign", UI_func_bc_assign); LCDML_add(48, LCDML_0_1_3_5, 2, "BC Assign", UI_func_bc_assign);
LCDML_add(50, LCDML_0_1_3_5, 3, "BC Mode", UI_func_bc_mode); LCDML_add(49, LCDML_0_1_3_5, 3, "BC Mode", UI_func_bc_mode);
LCDML_add(51, LCDML_0_1, 4, "MIDI", NULL); LCDML_add(50, LCDML_0_1, 4, "MIDI", NULL);
LCDML_add(52, LCDML_0_1_4, 1, "MIDI Channel", UI_func_midi_channel); LCDML_add(51, LCDML_0_1_4, 1, "MIDI Channel", UI_func_midi_channel);
LCDML_add(53, LCDML_0_1_4, 2, "Lowest Note", UI_func_lowest_note); LCDML_add(52, LCDML_0_1_4, 2, "Lowest Note", UI_func_lowest_note);
LCDML_add(54, LCDML_0_1_4, 3, "Highest Note", UI_func_highest_note); LCDML_add(53, LCDML_0_1_4, 3, "Highest Note", UI_func_highest_note);
LCDML_add(55, LCDML_0_1_4, 4, "MIDI Send Voice", UI_func_sysex_send_voice); LCDML_add(54, LCDML_0_1_4, 4, "MIDI Send Voice", UI_func_sysex_send_voice);
LCDML_add(56, LCDML_0_1, 5, "Setup", NULL); LCDML_add(55, LCDML_0_1, 5, "Setup", NULL);
LCDML_add(57, LCDML_0_1_5, 1, "Portamento", NULL); LCDML_add(56, LCDML_0_1_5, 1, "Portamento", NULL);
LCDML_add(58, LCDML_0_1_5_1, 1, "Port. Mode", UI_func_portamento_mode); LCDML_add(57, LCDML_0_1_5_1, 1, "Port. Mode", UI_func_portamento_mode);
LCDML_add(59, LCDML_0_1_5_1, 2, "Port. Gliss", UI_func_portamento_glissando); LCDML_add(58, LCDML_0_1_5_1, 2, "Port. Gliss", UI_func_portamento_glissando);
LCDML_add(60, LCDML_0_1_5_1, 3, "Port. Time", UI_func_portamento_time); LCDML_add(59, LCDML_0_1_5_1, 3, "Port. Time", UI_func_portamento_time);
LCDML_add(61, LCDML_0_1_5, 2, "Polyphony", UI_func_polyphony); LCDML_add(60, LCDML_0_1_5, 2, "Polyphony", UI_func_polyphony);
LCDML_add(62, LCDML_0_1_5, 3, "Transpose", UI_func_transpose); LCDML_add(61, LCDML_0_1_5, 3, "Transpose", UI_func_transpose);
LCDML_add(63, LCDML_0_1_5, 4, "Fine Tune", UI_func_tune); LCDML_add(62, LCDML_0_1_5, 4, "Fine Tune", UI_func_tune);
LCDML_add(64, LCDML_0_1_5, 5, "Mono/Poly", UI_func_mono_poly); LCDML_add(63, LCDML_0_1_5, 5, "Mono/Poly", UI_func_mono_poly);
LCDML_add(65, LCDML_0_1, 6, "Internal", NULL); LCDML_add(64, LCDML_0_1, 6, "Internal", NULL);
LCDML_add(66, LCDML_0_1_6, 1, "Note Refresh", UI_func_note_refresh); LCDML_add(65, LCDML_0_1_6, 1, "Note Refresh", UI_func_note_refresh);
LCDML_add(67, LCDML_0_1_6, 2, "Velocity Lvl", UI_func_velocity_level); LCDML_add(66, LCDML_0_1_6, 2, "Velocity Lvl", UI_func_velocity_level);
LCDML_add(68, LCDML_0_1, 7, "Operator", UI_handle_OP); LCDML_add(67, LCDML_0_1, 7, "Operator", UI_handle_OP);
LCDML_add(69, LCDML_0_1, 8, "Save Voice", UI_func_save_voice); LCDML_add(68, LCDML_0_1, 8, "Save Voice", UI_func_save_voice);
LCDML_add(70, LCDML_0, 3, "Load/Save", NULL); LCDML_add(69, LCDML_0, 3, "Load/Save", NULL);
LCDML_add(71, LCDML_0_3, 1, "Performance", NULL); LCDML_add(70, LCDML_0_3, 1, "Performance", NULL);
LCDML_add(72, LCDML_0_3_1, 1, "Load Perf.", UI_func_load_performance); LCDML_add(71, LCDML_0_3_1, 1, "Load Perf.", UI_func_load_performance);
LCDML_add(73, LCDML_0_3_1, 2, "Save Perf.", UI_func_save_performance); LCDML_add(72, LCDML_0_3_1, 2, "Save Perf.", UI_func_save_performance);
LCDML_add(74, LCDML_0_3, 2, "Voice Config", NULL); LCDML_add(73, LCDML_0_3, 2, "Voice Config", NULL);
LCDML_add(75, LCDML_0_3_2, 1, "Load Voice Cfg", UI_func_load_voiceconfig); LCDML_add(74, LCDML_0_3_2, 1, "Load Voice Cfg", UI_func_load_voiceconfig);
LCDML_add(76, LCDML_0_3_2, 2, "Save Voice Cfg", UI_func_save_voiceconfig); LCDML_add(75, LCDML_0_3_2, 2, "Save Voice Cfg", UI_func_save_voiceconfig);
LCDML_add(77, LCDML_0_3, 3, "Effects", NULL); LCDML_add(76, LCDML_0_3, 3, "Effects", NULL);
LCDML_add(78, LCDML_0_3_3, 1, "Load Effects", UI_func_load_fx); LCDML_add(77, LCDML_0_3_3, 1, "Load Effects", UI_func_load_fx);
LCDML_add(79, LCDML_0_3_3, 2, "Save Effects", UI_func_save_fx); LCDML_add(78, LCDML_0_3_3, 2, "Save Effects", UI_func_save_fx);
LCDML_add(80, LCDML_0_3, 5, "MIDI", NULL); LCDML_add(79, LCDML_0_3, 5, "MIDI", NULL);
LCDML_add(81, LCDML_0_3_5, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank); LCDML_add(80, LCDML_0_3_5, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank);
LCDML_add(82, LCDML_0_3_5, 2, "MIDI Snd Bank", UI_func_sysex_send_bank); LCDML_add(81, LCDML_0_3_5, 2, "MIDI Snd Bank", UI_func_sysex_send_bank);
LCDML_add(83, LCDML_0_3_5, 3, "MIDI Snd Voice", UI_func_sysex_send_voice); LCDML_add(82, LCDML_0_3_5, 3, "MIDI Snd Voice", UI_func_sysex_send_voice);
LCDML_add(84, LCDML_0, 4, "Drums", NULL); LCDML_add(83, LCDML_0, 4, "Drums", NULL);
LCDML_add(85, LCDML_0_4, 1, "Drums Main Vol", UI_func_drum_main_volume); LCDML_add(84, LCDML_0_4, 1, "Drums Main Vol", UI_func_drum_main_volume);
LCDML_add(86, LCDML_0_4, 2, "Drum Volumes", UI_func_drum_volume); LCDML_add(85, LCDML_0_4, 2, "Drum Volumes", UI_func_drum_volume);
LCDML_add(87, LCDML_0_4, 3, "Drum Pan", UI_func_drum_pan); LCDML_add(86, LCDML_0_4, 3, "Drum Pan", UI_func_drum_pan);
LCDML_add(88, LCDML_0_4, 4, "Drum Rev.Send", UI_func_drum_reverb_send); LCDML_add(87, LCDML_0_4, 4, "Drum Rev.Send", UI_func_drum_reverb_send);
LCDML_add(89, LCDML_0, 5, "Sequencer", NULL); LCDML_add(88, LCDML_0, 5, "Sequencer", NULL);
LCDML_add(90, LCDML_0_5, 1, "Sequencer", UI_func_sequencer); LCDML_add(89, LCDML_0_5, 1, "Sequencer", UI_func_sequencer);
LCDML_add(91, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor); LCDML_add(90, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor);
LCDML_add(92, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain); LCDML_add(91, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain);
LCDML_add(93, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio); LCDML_add(92, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio);
LCDML_add(94, LCDML_0_5, 5, "Seq. Length", UI_func_seq_lenght); LCDML_add(93, LCDML_0_5, 5, "Seq. Settings", NULL);
LCDML_add(95, LCDML_0_5, 6, "Tempo", UI_func_seq_tempo); LCDML_add(94, LCDML_0_5_5, 1, "Tempo", UI_func_seq_tempo);
LCDML_add(96, LCDML_0_5, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct); LCDML_add(95, LCDML_0_5_5, 2, "Seq. Length", UI_func_seq_lenght);
LCDML_add(97, LCDML_0_5, 8, "L.Trp.Offset", NULL); LCDML_add(96, LCDML_0_5_5, 3, "Track Setup", UI_func_seq_track_setup);
LCDML_add(98, LCDML_0_5, 9, "Track Setup", UI_func_seq_track_setup); LCDML_add(97, LCDML_0_5_5, 4, "Seq.Disp.Style", UI_func_seq_display_style);
LCDML_add(99, LCDML_0_5, 10, "Seq.Disp.Style", UI_func_seq_display_style); LCDML_add(98, LCDML_0_5_5, 5, "dexed assign", UI_func_dexed_assign);
LCDML_add(100, LCDML_0_5, 11, "LOAD Patterns", UI_func_seq_pattern_load); LCDML_add(99, LCDML_0_5_5, 6, "shift&transp.", UI_func_arp_shift);
LCDML_add(101, LCDML_0_5, 12, "SAVE Patterns", UI_func_seq_pattern_save); LCDML_add(100, LCDML_0_5_5, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount);
LCDML_add(102, LCDML_0, 6, "System", NULL); LCDML_add(101, LCDML_0_5_5, 6, "L.Transp.Key", UI_func_seq_live_transpose_oct);
LCDML_add(103, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono); LCDML_add(102, LCDML_0_5, 6, "LOAD Seq.Data", UI_func_seq_state_load);
LCDML_add(104, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); LCDML_add(103, LCDML_0_5, 7, "SAVE Seq.Data", UI_func_seq_state_save);
LCDML_add(105, LCDML_0_6, 3, "Favorites", UI_func_favorites); LCDML_add(104, LCDML_0, 6, "System", NULL);
LCDML_add(106, LCDML_0_6, 4, "EEPROM Reset", UI_func_eeprom_reset); LCDML_add(105, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono);
LCDML_add(107, LCDML_0, 7, "Info", UI_func_information); LCDML_add(106, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru);
LCDML_addAdvanced(108, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); LCDML_add(107, LCDML_0_6, 3, "Favorites", UI_func_favorites);
#define _LCDML_DISP_cnt 108 LCDML_add(108, LCDML_0_6, 4, "EEPROM Reset", UI_func_eeprom_reset);
LCDML_add(109, LCDML_0, 7, "Info", UI_func_information);
LCDML_addAdvanced(110, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default);
#define _LCDML_DISP_cnt 110
#endif #endif

@ -118,7 +118,7 @@ LCDML_add(84, LCDML_0_3_5, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank);
LCDML_add(85, LCDML_0_3_5, 2, "MIDI Snd Bank", UI_func_sysex_send_bank); LCDML_add(85, LCDML_0_3_5, 2, "MIDI Snd Bank", UI_func_sysex_send_bank);
LCDML_add(86, LCDML_0_3_5, 3, "MIDI Snd Voice", UI_func_sysex_send_voice); LCDML_add(86, LCDML_0_3_5, 3, "MIDI Snd Voice", UI_func_sysex_send_voice);
LCDML_add(87, LCDML_0, 4, "Drums", NULL); LCDML_add(87, LCDML_0, 4, "Drums", NULL);
LCDML_add(88, LCDML_0_4, 1, "Drums Main Vol", UI_func_drum_main_volume); LCDML_add(88, LCDML_0_4, 1, "Drums Main Vol", UI_func_drums_main_volume);
LCDML_add(89, LCDML_0_4, 2, "Drum Volumes", UI_func_drum_volume); LCDML_add(89, LCDML_0_4, 2, "Drum Volumes", UI_func_drum_volume);
LCDML_add(90, LCDML_0_4, 3, "Drum Pan", UI_func_drum_pan); LCDML_add(90, LCDML_0_4, 3, "Drum Pan", UI_func_drum_pan);
LCDML_add(91, LCDML_0_4, 4, "Drum Rev.Send", UI_func_drum_reverb_send); LCDML_add(91, LCDML_0_4, 4, "Drum Rev.Send", UI_func_drum_reverb_send);
@ -127,19 +127,23 @@ LCDML_add(93, LCDML_0_5, 1, "Sequencer", UI_func_sequencer);
LCDML_add(94, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor); LCDML_add(94, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor);
LCDML_add(95, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain); LCDML_add(95, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain);
LCDML_add(96, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio); LCDML_add(96, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio);
LCDML_add(97, LCDML_0_5, 5, "Seq. Length", UI_func_seq_lenght); LCDML_add(97, LCDML_0_5, 5, "Seq. Settings", NULL);
LCDML_add(98, LCDML_0_5, 6, "Tempo", UI_func_seq_tempo); LCDML_add(98, LCDML_0_5_5, 1, "Tempo", UI_func_seq_tempo);
LCDML_add(99, LCDML_0_5, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct); LCDML_add(99, LCDML_0_5_5, 2, "Seq. Length", UI_func_seq_lenght);
LCDML_add(100, LCDML_0_5, 8, "Track Setup", UI_func_seq_track_setup); LCDML_add(100, LCDML_0_5_5, 3, "Track Setup", UI_func_seq_track_setup);
LCDML_add(101, LCDML_0_5, 9, "Seq.Disp.Style", UI_func_seq_display_style); LCDML_add(101, LCDML_0_5_5, 4, "Seq.Disp.Style", UI_func_seq_display_style);
LCDML_add(102, LCDML_0_5, 10, "LOAD Patterns", UI_func_seq_pattern_load); LCDML_add(102, LCDML_0_5_5, 5, "dexed assign", UI_func_dexed_assign);
LCDML_add(103, LCDML_0_5, 11, "SAVE Patterns", UI_func_seq_pattern_save); LCDML_add(103, LCDML_0_5_5, 6, "shift&transp.", UI_func_arp_shift);
LCDML_add(104, LCDML_0, 6, "System", NULL); LCDML_add(104, LCDML_0_5_5, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct);
LCDML_add(105, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono); LCDML_add(105, LCDML_0_5_5, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount);
LCDML_add(106, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); LCDML_add(106, LCDML_0_5, 6, "LOAD Seq.Data", UI_func_seq_state_load);
LCDML_add(107, LCDML_0_6, 3, "Favorites", UI_func_favorites); LCDML_add(107, LCDML_0_5, 7, "SAVE Seq.Data", UI_func_seq_state_save);
LCDML_add(108, LCDML_0_6, 4, "EEPROM Reset", UI_func_eeprom_reset); LCDML_add(108, LCDML_0, 6, "System", NULL);
LCDML_add(109, LCDML_0, 7, "Info", UI_func_information); LCDML_add(109, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono);
LCDML_addAdvanced(110, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); LCDML_add(110, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru);
#define _LCDML_DISP_cnt 110 LCDML_add(111, LCDML_0_6, 3, "Favorites", UI_func_favorites);
LCDML_add(112, LCDML_0_6, 4, "EEPROM Reset", UI_func_eeprom_reset);
LCDML_add(113, LCDML_0, 7, "Info", UI_func_information);
LCDML_addAdvanced(114, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default);
#define _LCDML_DISP_cnt 114
#endif #endif

@ -85,29 +85,33 @@ LCDML_add(51, LCDML_0_2, 4, "MIDI", NULL);
LCDML_add(52, LCDML_0_2_4, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank); LCDML_add(52, LCDML_0_2_4, 1, "MIDI Recv Bank", UI_func_sysex_receive_bank);
LCDML_add(53, LCDML_0_2_4, 2, "MIDI Snd Bank", UI_func_sysex_send_bank); LCDML_add(53, LCDML_0_2_4, 2, "MIDI Snd Bank", UI_func_sysex_send_bank);
LCDML_add(54, LCDML_0_2_4, 3, "MIDI Snd Voice", UI_func_sysex_send_voice); LCDML_add(54, LCDML_0_2_4, 3, "MIDI Snd Voice", UI_func_sysex_send_voice);
LCDML_add(55, LCDML_0, 3, "Drum", NULL); LCDML_add(55, LCDML_0, 4, "Drums", NULL);
LCDML_add(56, LCDML_0_3, 1, "Drums Main Vol", UI_func_drum_main_volume); LCDML_add(56, LCDML_0_4, 1, "Drums Main Vol", UI_func_drums_main_volume);
LCDML_add(57, LCDML_0_3, 2, "Drum Volumes", UI_func_drum_volume); LCDML_add(57, LCDML_0_4, 2, "Drum Volumes", UI_func_drum_volume);
LCDML_add(58, LCDML_0_3, 3, "Drum Pan", UI_func_drum_pan); LCDML_add(58, LCDML_0_4, 3, "Drum Pan", UI_func_drum_pan);
LCDML_add(59, LCDML_0, 4, "Sequencer", NULL); LCDML_add(59, LCDML_0_4, 4, "Drum Rev.Send", UI_func_drum_reverb_send);
LCDML_add(60, LCDML_0_4, 1, "Sequencer", UI_func_sequencer); LCDML_add(60, LCDML_0, 5, "Sequencer", NULL);
LCDML_add(61, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor); LCDML_add(61, LCDML_0_5, 1, "Sequencer", UI_func_sequencer);
LCDML_add(62, LCDML_0_4, 3, "Pattern Chain", UI_func_seq_pat_chain); LCDML_add(62, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor);
LCDML_add(63, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio); LCDML_add(63, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain);
LCDML_add(64, LCDML_0_4, 5, "Seq. Length", UI_func_seq_lenght); LCDML_add(64, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio);
LCDML_add(65, LCDML_0_4, 6, "Tempo", UI_func_seq_tempo); LCDML_add(65, LCDML_0_5, 5, "Seq. Settings", NULL);
LCDML_add(66, LCDML_0_4, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct); LCDML_add(66, LCDML_0_5_5, 1, "Tempo", UI_func_seq_tempo);
LCDML_add(67, LCDML_0_5, 8, "Track Setup", UI_func_seq_track_setup); LCDML_add(67, LCDML_0_5_5, 2, "Seq. Length", UI_func_seq_lenght);
LCDML_add(68, LCDML_0_5, 9, "Seq.Disp.Style", UI_func_seq_display_style); LCDML_add(68, LCDML_0_5_5, 3, "Track Setup", UI_func_seq_track_setup);
LCDML_add(69, LCDML_0_4, 10, "LOAD Patterns", UI_func_seq_pattern_load); LCDML_add(69, LCDML_0_5_5, 4, "Seq.Disp.Style", UI_func_seq_display_style);
LCDML_add(70, LCDML_0_4, 11, "SAVE Patterns", UI_func_seq_pattern_save); LCDML_add(70, LCDML_0_5_5, 5, "dexed assign", UI_func_dexed_assign);
LCDML_add(71, LCDML_0, 5, "System", NULL); LCDML_add(71, LCDML_0_5_5, 6, "L.Transp.Key", UI_func_seq_live_transpose_oct);
LCDML_add(72, LCDML_0_5, 1, "Stereo/Mono", UI_func_stereo_mono); LCDML_add(72, LCDML_0_5_5, 8, "ChordTrack Keys", UI_func_seq_chord_keys_ammount);
LCDML_add(73, LCDML_0_5, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); LCDML_add(73, LCDML_0_5, 6, "LOAD Seq.Data", UI_func_seq_state_load);
LCDML_add(74, LCDML_0_5, 3, "Favorites", UI_func_favorites); LCDML_add(74, LCDML_0_5, 7, "SAVE Seq.Data", UI_func_seq_state_save);
LCDML_add(75, LCDML_0_5, 4, "EEPROM Reset", UI_func_eeprom_reset); LCDML_add(75, LCDML_0, 5, "System", NULL);
LCDML_add(76, LCDML_0, 6, "Info", UI_func_information); LCDML_add(76, LCDML_0_5, 1, "Stereo/Mono", UI_func_stereo_mono);
LCDML_addAdvanced(77, LCDML_0, 5, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); LCDML_add(77, LCDML_0_5, 2, "MIDI Soft THRU", UI_func_midi_soft_thru);
#define _LCDML_DISP_cnt 77 LCDML_add(78, LCDML_0_5, 3, "Favorites", UI_func_favorites);
LCDML_add(79, LCDML_0_5, 4, "EEPROM Reset", UI_func_eeprom_reset);
LCDML_add(80, LCDML_0, 6, "Info", UI_func_information);
LCDML_addAdvanced(81, LCDML_0, 5, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default);
#define _LCDML_DISP_cnt 81
#endif #endif

@ -634,7 +634,7 @@
// Buffer for load/save configuration as JSON // Buffer for load/save configuration as JSON
#define JSON_BUFFER 6144 #define JSON_BUFFER 8192
// Internal configuration structure // Internal configuration structure
typedef struct dexed_s { typedef struct dexed_s {

@ -30,11 +30,14 @@
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include "synth_dexed.h" #include "synth_dexed.h"
#include "dexed_sd.h" #include "dexed_sd.h"
#include "TeensyTimerTool.h"
using namespace TeensyTimerTool;
extern void init_MIDI_send_CC(void); extern void init_MIDI_send_CC(void);
extern void check_configuration_dexed(uint8_t instance_id); extern void check_configuration_dexed(uint8_t instance_id);
extern void check_configuration_performance(void); extern void check_configuration_performance(void);
extern void check_configuration_fx(void); extern void check_configuration_fx(void);
extern void sequencer();
extern StaticJsonDocument<JSON_BUFFER> data_json; extern StaticJsonDocument<JSON_BUFFER> data_json;
extern uint8_t seq_chain_lenght; extern uint8_t seq_chain_lenght;
extern uint8_t seq_data[10][16]; extern uint8_t seq_data[10][16];
@ -42,9 +45,21 @@ extern uint8_t seq_vel[10][16];
extern uint8_t seq_patternchain[4][4]; extern uint8_t seq_patternchain[4][4];
extern uint8_t seq_content_type[10]; extern uint8_t seq_content_type[10];
extern uint8_t seq_track_type[4]; extern uint8_t seq_track_type[4];
extern int perform_attack_mod[NUM_DEXED]; extern uint8_t seq_chord_key_ammount;
extern int perform_release_mod[NUM_DEXED]; extern uint8_t seq_element_shift;
extern int seq_oct_shift;
extern int seq_transpose; extern int seq_transpose;
extern int seq_tempo_ms ;
extern int seq_bpm;
extern bool arp_play_basenote;
extern uint8_t arp_speed;
extern uint8_t arp_lenght;
extern uint8_t arp_style;
extern uint8_t seq_chord_velocity;
extern uint8_t seq_chord_dexed_inst;
extern uint8_t seq_inst_dexed[4];
extern PeriodicTimer timer1;
/****************************************************************************** /******************************************************************************
SD BANK/VOICE LOADING SD BANK/VOICE LOADING
@ -756,14 +771,319 @@ bool save_sd_fx_json(uint8_t fx)
return (false); return (false);
} }
bool load_sd_seq_drumsettings_json(uint8_t number)
{
if (number < 0)
return (false);
number = constrain(number, 0, 99);
if (sd_card > 0)
{
File json;
char filename[FILENAME_LEN];
sprintf(filename, "/%s/%s%d-d.json", SEQ_CONFIG_PATH, SEQ_CONFIG_NAME, number);
// first check if file exists...
AudioNoInterrupts();
if (SD.exists(filename))
{
// ... and if: load
#ifdef DEBUG
Serial.print(F("Found drums configuration ["));
Serial.print(filename);
Serial.println(F("]... loading..."));
#endif
json = SD.open(filename);
if (json)
{
deserializeJson(data_json, json);
json.close();
AudioInterrupts();
#ifdef DEBUG
Serial.println(F("Read JSON data:"));
serializeJsonPretty(data_json, Serial);
Serial.println();
#endif
// drums_volume = data_json["drums_volume"];
for (uint8_t i = 0; i < 20; i++) // needs to replaced by NUM_DRUMSET_CONFIG but does not work
{
// drum_config[i].pan = data_json["pan"][i] ;
// drum_config[i].vol_max = data_json["vol_max"][i] ;
// drum_config[i].vol_min = data_json["vol_min"][i] ;
// drum_config[i].reverb_send = data_json["reverb_send"][i];
}
//set_fx_params();
return (true);
}
#ifdef DEBUG
else
{
Serial.print(F("E : Cannot open "));
Serial.print(filename);
Serial.println(F(" on SD."));
}
}
else
{
Serial.print(F("No "));
Serial.print(filename);
Serial.println(F(" available."));
#endif
}
}
AudioInterrupts();
return (false);
}
bool load_sd_seq_voicesettings_json(uint8_t number)
{
uint8_t bank[MAX_DEXED];
uint8_t voice[MAX_DEXED];
if (number < 0)
return (false);
number = constrain(number, 0, 99);
if (sd_card > 0)
{
File json;
char filename[FILENAME_LEN];
sprintf(filename, "/%s/%s%d-v.json", SEQ_CONFIG_PATH, SEQ_CONFIG_NAME, number);
// first check if file exists...
AudioNoInterrupts();
if (SD.exists(filename))
{
// ... and if: load
#ifdef DEBUG
Serial.print(F("Found Sequencer configuration ["));
Serial.print(filename);
Serial.println(F("]... loading..."));
#endif
json = SD.open(filename);
if (json)
{
deserializeJson(data_json, json);
json.close();
AudioInterrupts();
//check_configuration_fx();
#ifdef DEBUG
Serial.println(F("Read JSON data:"));
serializeJsonPretty(data_json, Serial);
Serial.println();
#endif
for (uint8_t i = 0; i < MAX_DEXED; i++)
{
bank[i] = data_json["bank"][i];
voice[i] = data_json["voice"][i];
configuration.fx.reverb_send[i] = data_json["rev_send"][i];
configuration.dexed[i].midi_channel = data_json["midi_ch"][i];
configuration.dexed[i].sound_intensity = data_json["vol"][i];
configuration.dexed[i].transpose = data_json["v_trans"][i];
}
/*
configuration.fx.reverb_roomsize = data_json["rev_roomsize"];
configuration.fx.reverb_damping = data_json["rev_damping"];
configuration.fx.reverb_lowpass = data_json["rev_lowpass"];
configuration.fx.reverb_lodamp = data_json["rev_lodamp"];
configuration.fx.reverb_hidamp = data_json["rev_hidamp"];
configuration.fx.reverb_diffusion = data_json["rev_diffusion"];
configuration.fx.reverb_level = data_json["rev_level"];
configuration.fx.eq_bass = data_json["eq_bass"];
configuration.fx.eq_treble = data_json["eq_treble"]; */
for (uint8_t i = 0; i < NUM_DEXED; i++)
{
load_sd_voice(bank[i], voice[i], i);
MicroDexed[i]->doRefreshVoice();
MicroDexed[i]->panic();
}
seq_tempo_ms = 60000000 / seq_bpm / 4;
timer1.begin(sequencer, seq_tempo_ms / 2, false);
//set_fx_params();
return (true);
}
#ifdef DEBUG
else
{
Serial.print(F("E : Cannot open "));
Serial.print(filename);
Serial.println(F(" on SD."));
}
}
else
{
Serial.print(F("No "));
Serial.print(filename);
Serial.println(F(" available."));
#endif
}
}
AudioInterrupts();
return (false);
}
bool save_sd_seq_drumsettings_json(uint8_t number)
{
char filename[FILENAME_LEN];
number = constrain(number, 0, 99);
if (sd_card > 0)
{
File json;
sprintf(filename, "/%s/%s%d-d.json", SEQ_CONFIG_PATH, SEQ_CONFIG_NAME, number);
#ifdef DEBUG
Serial.print(F("Saving drums config "));
Serial.print(number);
Serial.print(F(" to "));
Serial.println(filename);
#endif
AudioNoInterrupts();
json = SD.open(filename, FILE_WRITE);
if (json)
{
// data_json["drums_volume"] = drums_volume;
for (uint8_t i = 0; i < 20; i++) // needs to be replaced by NUM_DRUMSET_CONFIG
{
// data_json["pan"][i] = drum_config[i].pan;
// data_json["vol_max"][i] = drum_config[i].vol_max;
// data_json["vol_min"][i] = drum_config[i].vol_min;
// data_json["reverb_send"][i] = drum_config[i].reverb_send;
}
#ifdef DEBUG
Serial.println(F("Write JSON data:"));
serializeJsonPretty(data_json, Serial);
Serial.println();
#endif
serializeJsonPretty(data_json, json);
json.close();
AudioInterrupts();
return (true);
}
json.close();
}
else
{
#ifdef DEBUG
Serial.print(F("E : Cannot open "));
Serial.print(filename);
Serial.println(F(" on SD."));
#endif
}
AudioInterrupts();
return (false);
}
bool save_sd_seq_voicesettings_json(uint8_t number)
{
char filename[FILENAME_LEN];
number = constrain(number, 0, 99);
if (sd_card > 0)
{
File json;
sprintf(filename, "/%s/%s%d-v.json", SEQ_CONFIG_PATH, SEQ_CONFIG_NAME, number);
#ifdef DEBUG
Serial.print(F("Saving sequencer voice config "));
Serial.print(number);
Serial.print(F(" to "));
Serial.println(filename);
#endif
AudioNoInterrupts();
json = SD.open(filename, FILE_WRITE);
if (json)
{
for (uint8_t i = 0; i < MAX_DEXED; i++)
{
data_json["bank"][i] = configuration.performance.bank[i];
data_json["voice"][i] = configuration.performance.voice[i];
data_json["rev_send"][i] = configuration.fx.reverb_send[i];
data_json["midi_ch"][i] = configuration.dexed[i].midi_channel;
data_json["vol"][i] = configuration.dexed[i].sound_intensity;
data_json["v_trans"][i] = configuration.dexed[i].transpose;
}
/*
data_json["rev_roomsize"] = configuration.fx.reverb_roomsize;
data_json["rev_damping"] = configuration.fx.reverb_damping;
data_json["rev_lowpass"] = configuration.fx.reverb_lowpass;
data_json["rev_lodamp"] = configuration.fx.reverb_lodamp;
data_json["rev_hidamp"] = configuration.fx.reverb_hidamp;
data_json["rev_diffusion"] = configuration.fx.reverb_diffusion;
data_json["rev_level"] = configuration.fx.reverb_level;
data_json["eq_bass"] = configuration.fx.eq_bass;
data_json["eq_treble"] = configuration.fx.eq_treble; */
#ifdef DEBUG
Serial.println(F("Write JSON data:"));
serializeJsonPretty(data_json, Serial);
Serial.println();
#endif
serializeJsonPretty(data_json, json);
json.close();
AudioInterrupts();
return (true);
}
json.close();
}
else
{
#ifdef DEBUG
Serial.print(F("E : Cannot open "));
Serial.print(filename);
Serial.println(F(" on SD."));
#endif
}
AudioInterrupts();
return (false);
}
bool save_sd_seq_json(uint8_t seq_number) bool save_sd_seq_json(uint8_t seq_number)
{ {
char filename[FILENAME_LEN]; char filename[FILENAME_LEN];
int count = 0; int count = 0;
seq_number = constrain(seq_number, 0, 99); seq_number = constrain(seq_number, 0, 99);
save_sd_seq_drumsettings_json(seq_number);
save_sd_seq_voicesettings_json(seq_number);
if (sd_card > 0) if (sd_card > 0)
{ {
sprintf(filename, "/%s/%s%d.json", SEQ_CONFIG_PATH, SEQ_CONFIG_NAME, seq_number);
AudioNoInterrupts();
if (SD.exists(filename)) {
Serial.println("Remove");
Serial.print(filename);
SD.remove(filename);
}
AudioInterrupts();
File json; File json;
sprintf(filename, "/%s/%s%d.json", SEQ_CONFIG_PATH, SEQ_CONFIG_NAME, seq_number); sprintf(filename, "/%s/%s%d.json", SEQ_CONFIG_PATH, SEQ_CONFIG_NAME, seq_number);
@ -783,22 +1103,12 @@ bool save_sd_seq_json(uint8_t seq_number)
Serial.print(" Columns: "); Serial.print(" Columns: ");
Serial.print(columns); Serial.print(columns);
Serial.print(F(" ")); Serial.print(F(" "));
AudioNoInterrupts(); AudioNoInterrupts();
json = SD.open(filename, FILE_WRITE); json = SD.open(filename, FILE_WRITE);
if (json) if (json)
{ {
data_json["seq_chain_lenght"] = seq_chain_lenght;
data_json["seq_transpose"] = seq_transpose;
for (uint8_t i = 0; i < sizeof(seq_track_type); i++) {
data_json["track_type"][i] = seq_track_type[i];
}
for (uint8_t i = 0; i < sizeof(seq_content_type); i++) {
data_json["content_type"][i] = seq_content_type[i];
}
for (uint8_t i = 0; i < rows; i++) for (uint8_t i = 0; i < rows; i++)
{ {
for (uint8_t j = 0; j < columns; j++) { for (uint8_t j = 0; j < columns; j++) {
@ -814,7 +1124,6 @@ bool save_sd_seq_json(uint8_t seq_number)
count++; count++;
} }
} }
total = sizeof(seq_patternchain); total = sizeof(seq_patternchain);
columns = sizeof(seq_patternchain[0]); columns = sizeof(seq_patternchain[0]);
rows = total / columns; rows = total / columns;
@ -835,12 +1144,22 @@ bool save_sd_seq_json(uint8_t seq_number)
} }
count = 0; count = 0;
// following data maybe useful to be included in sequencer store and OPTIONAL to be loaded data_json["seq_tempo_ms"] = seq_tempo_ms ;
for (uint8_t i = 0; i < MAX_DEXED; i++) data_json["seq_bpm"] = seq_bpm;
{ data_json["arp_play_basenote"] = arp_play_basenote;
data_json["reverb_send"][i] = configuration.fx.reverb_send[i]; data_json["arp_speed"] = arp_speed;
} data_json["arp_lenght"] = arp_lenght;
data_json["arp_style"] = arp_style;
data_json["seq_chord_velocity"] = seq_chord_velocity;
data_json["seq_chord_dexed_inst"] = seq_chord_dexed_inst;
data_json["seq_chain_lenght"] = seq_chain_lenght;
data_json["seq_transpose"] = seq_transpose;
data_json["chord_key_ammount"] = seq_chord_key_ammount;
data_json["seq_oct_shift"] = seq_oct_shift;
data_json["seq_element_shift"] = seq_element_shift;
/*
<<<<<<< HEAD
data_json["reverb_roomsize"] = configuration.fx.reverb_roomsize; data_json["reverb_roomsize"] = configuration.fx.reverb_roomsize;
data_json["reverb_damping"] = configuration.fx.reverb_damping; data_json["reverb_damping"] = configuration.fx.reverb_damping;
data_json["reverb_lowpass"] = configuration.fx.reverb_lowpass; data_json["reverb_lowpass"] = configuration.fx.reverb_lowpass;
@ -855,6 +1174,20 @@ bool save_sd_seq_json(uint8_t seq_number)
data_json["eq_5"] = configuration.fx.eq_5; data_json["eq_5"] = configuration.fx.eq_5;
data_json["eq_6"] = configuration.fx.eq_6; data_json["eq_6"] = configuration.fx.eq_6;
data_json["eq_7"] = configuration.fx.eq_7; data_json["eq_7"] = configuration.fx.eq_7;
=======
*/
for (uint8_t i = 0; i < sizeof(seq_track_type); i++) {
data_json["track_type"][i] = seq_track_type[i];
}
for (uint8_t i = 0; i < sizeof(seq_content_type); i++) {
data_json["content_type"][i] = seq_content_type[i];
}
for (uint8_t i = 0; i < sizeof(seq_inst_dexed); i++) {
data_json["seq_inst_dexed"][i] = seq_inst_dexed[i];
}
//>>>>>>> 4af597461ea0ae5e49069d309862018eb651ccb4
#ifdef DEBUG #ifdef DEBUG
Serial.println(F("Write JSON data:")); Serial.println(F("Write JSON data:"));
serializeJsonPretty(data_json, Serial); serializeJsonPretty(data_json, Serial);
@ -862,10 +1195,11 @@ bool save_sd_seq_json(uint8_t seq_number)
#endif #endif
serializeJsonPretty(data_json, json); serializeJsonPretty(data_json, json);
json.close(); json.close();
AudioInterrupts();
return (true); return (true);
} }
json.close(); json.close();
AudioInterrupts();
} }
else else
{ {
@ -875,11 +1209,11 @@ bool save_sd_seq_json(uint8_t seq_number)
Serial.println(F(" on SD.")); Serial.println(F(" on SD."));
#endif #endif
} }
AudioInterrupts(); AudioInterrupts();
return (false); return (false);
} }
bool load_sd_seq_json(uint8_t seq_number) bool load_sd_seq_json(uint8_t seq_number)
{ {
if (seq_number < 0) if (seq_number < 0)
@ -887,6 +1221,9 @@ bool load_sd_seq_json(uint8_t seq_number)
seq_number = constrain(seq_number, 0, 99); seq_number = constrain(seq_number, 0, 99);
load_sd_seq_drumsettings_json(seq_number);
load_sd_seq_voicesettings_json(seq_number);
if (sd_card > 0) if (sd_card > 0)
{ {
File json; File json;
@ -923,15 +1260,6 @@ bool load_sd_seq_json(uint8_t seq_number)
int columns = sizeof(seq_data[0]); int columns = sizeof(seq_data[0]);
int rows = total / columns; int rows = total / columns;
int count = 0; int count = 0;
seq_transpose = data_json["seq_transpose"];
seq_chain_lenght = data_json["seq_chain_lenght"];
for (uint8_t i = 0; i < sizeof(seq_track_type); i++) {
seq_track_type[i] = data_json["track_type"][i];
}
for (uint8_t i = 0; i < sizeof(seq_content_type); i++) {
seq_content_type[i] = data_json["content_type"][i];
}
for (uint8_t i = 0; i < rows; i++) for (uint8_t i = 0; i < rows; i++)
{ {
@ -959,14 +1287,17 @@ bool load_sd_seq_json(uint8_t seq_number)
count++; count++;
} }
} }
count = 0; for (uint8_t i = 0; i < sizeof(seq_track_type); i++) {
seq_track_type[i] = data_json["track_type"][i];
// following data maybe useful to be included in sequencer store and OPTIONAL to be loaded back }
for (uint8_t i = 0; i < sizeof(seq_content_type); i++) {
for (uint8_t i = 0; i < MAX_DEXED; i++) seq_content_type[i] = data_json["content_type"][i];
{ }
configuration.fx.reverb_send[i] = data_json["reverb_send"][i]; for (uint8_t i = 0; i < sizeof(seq_inst_dexed); i++) {
seq_inst_dexed[i] = data_json["seq_inst_dexed"][i];
} }
/*
<<<<<<< HEAD
configuration.fx.reverb_roomsize = data_json["reverb_roomsize"]; configuration.fx.reverb_roomsize = data_json["reverb_roomsize"];
configuration.fx.reverb_damping = data_json["reverb_damping"]; configuration.fx.reverb_damping = data_json["reverb_damping"];
configuration.fx.reverb_lowpass = data_json["reverb_lowpass"]; configuration.fx.reverb_lowpass = data_json["reverb_lowpass"];
@ -981,8 +1312,26 @@ bool load_sd_seq_json(uint8_t seq_number)
configuration.fx.eq_5 = data_json["eq_5"]; configuration.fx.eq_5 = data_json["eq_5"];
configuration.fx.eq_6 = data_json["eq_6"]; configuration.fx.eq_6 = data_json["eq_6"];
configuration.fx.eq_7 = data_json["eq_7"]; configuration.fx.eq_7 = data_json["eq_7"];
=======
*/
set_fx_params(); count = 0;
seq_tempo_ms = data_json["seq_tempo_ms"] ;
seq_bpm = data_json["seq_bpm"];
arp_play_basenote = data_json["arp_play_basenote"];
arp_speed = data_json["arp_speed"] ;
arp_lenght = data_json["arp_lenght"];
arp_style = data_json["arp_style"];
seq_chord_velocity = data_json["seq_chord_velocity"];
seq_chord_dexed_inst = data_json["seq_chord_dexed_inst"] ;
seq_chain_lenght = data_json["seq_chain_lenght"];
seq_transpose = data_json["seq_transpose"];
seq_chord_key_ammount = data_json["chord_key_ammount"];
seq_oct_shift = data_json["seq_oct_shift"];
seq_element_shift = data_json["seq_element_shift"];
//>>>>>>> 4af597461ea0ae5e49069d309862018eb651ccb4
//set_fx_params();
return (true); return (true);
} }
@ -1007,6 +1356,30 @@ bool load_sd_seq_json(uint8_t seq_number)
return (false); return (false);
} }
bool check_sd_seq_exists(uint8_t number)
{
if (number < 0)
return (false);
number = constrain(number, 0, 99);
if (sd_card > 0)
{
char filename[FILENAME_LEN];
sprintf(filename, "/%s/%s%d.json", SEQ_CONFIG_PATH, SEQ_CONFIG_NAME, number);
// check if file exists...
AudioNoInterrupts();
if (SD.exists(filename))
{
return (true);
} else return (false);
} else
return (false);
AudioInterrupts();
}
/****************************************************************************** /******************************************************************************
SD PERFORMANCE SD PERFORMANCE
******************************************************************************/ ******************************************************************************/

@ -36,56 +36,58 @@ void sequencer_part1(void)
for (uint8_t d = 0; d < 4; d++) for (uint8_t d = 0; d < 4; d++)
{ {
if ( seq_track_type[d] == 0) { // drum track if ( seq_track_type[d] == 0) { // drum track
if (seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] > 0 && seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step] > 0) if (seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] > 0 )
{ {
handleNoteOn(DRUM_MIDI_CHANNEL, seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] , seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step]); handleNoteOn(DRUM_MIDI_CHANNEL, seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] , seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step]);
} }
} }
else { else {
if (seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] > 0 && seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step] > 0) // instrument track if (seq_data[seq_patternchain[seq_chain_active_step][d]][seq_step] > 0 ) // instrument track
{ {
if (seq_track_type[d] == 1 || (seq_track_type[d] == 3 && arp_play_basenote) ) if (seq_track_type[d] == 1 || (seq_track_type[d] == 3 && arp_play_basenote) )
{ {
handleNoteOn(configuration.dexed[seq_inst_dexed[d]].midi_channel, seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] + seq_transpose , seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step]); handleNoteOn(configuration.dexed[seq_inst_dexed[d]].midi_channel, seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step], seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step]);
seq_prev_note[d] = seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step];
seq_prev_vel[d] = seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step];
} }
seq_prev_note[d] = seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] + seq_transpose; else if (seq_track_type[d] == 2 ) //Chords
seq_prev_vel[d] = seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step]; {
if (seq_track_type[d] == 2) { //Chords if (seq_vel[ seq_patternchain[seq_chain_active_step][d]][seq_step] > 199)
if (seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step] > 199)
{ {
handleNoteOn(configuration.dexed[seq_chord_dexed_inst].midi_channel, seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] + seq_transpose + seq_chords[seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step] - 200][0], seq_chord_velocity);
handleNoteOn(configuration.dexed[seq_chord_dexed_inst].midi_channel, seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] + seq_transpose + seq_chords[seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step] - 200][1], seq_chord_velocity); //handleNoteOn(configuration.dexed[seq_inst_dexed[d]].midi_channel, seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step], seq_chord_velocity); // basenote
handleNoteOn(configuration.dexed[seq_chord_dexed_inst].midi_channel, seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] + seq_transpose + seq_chords[seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step] - 200][2], seq_chord_velocity);
handleNoteOn(configuration.dexed[seq_chord_dexed_inst].midi_channel, seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] + seq_transpose + seq_chords[seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step] - 200][3], seq_chord_velocity); for (uint8_t x = seq_element_shift; x < seq_element_shift + seq_chord_key_ammount; x++) //play chord notes
{
handleNoteOn(configuration.dexed[seq_chord_dexed_inst].midi_channel, seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] + (seq_oct_shift * 12) + seq_arps[seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step] - 200][x], seq_chord_velocity);
}
seq_prev_note[d] = seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] + (seq_oct_shift * 12);
seq_prev_vel[d] = seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step];
} }
} }
else if (seq_track_type[d] == 3) { //Arp if (seq_track_type[d] == 3) { //Arp
arp_step = 0; arp_step = 0;
arp_counter = 0; arp_counter = 0;
arp_note = seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] + seq_transpose; arp_note = seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] + (seq_oct_shift * 12);
if (seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step] - 200 >= 0) if (seq_vel[seq_patternchain[seq_chain_active_step][d] ][seq_step] - 200 >= 0)
arp_chord = seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step] - 200; arp_chord = seq_vel[seq_patternchain[seq_chain_active_step][d] ][seq_step] - 200;
} }
} }
}
if (seq_track_type[d] == 3)
{ //Arp
if (arp_speed == 0 || (arp_speed == 1 && arp_counter == 0) ) {
if (arp_step % 8 == 0 ) { // after here not triggered by a key input - arp only
handleNoteOn(configuration.dexed[seq_chord_dexed_inst].midi_channel, arp_note + arp_octave * 12 , seq_chord_velocity); if (seq_track_type[d] == 3)
arp_note_prev = arp_note + arp_octave * 12; { //Arp
} if (arp_speed == 0 || (arp_speed == 1 && arp_counter == 0) ) {
else
{ if (arp_style == 0) { //arp up { if (arp_style == 0) { //arp up
handleNoteOn(configuration.dexed[seq_chord_dexed_inst].midi_channel, arp_note + seq_chords[arp_chord][arp_step] + arp_octave * 12, seq_chord_velocity); handleNoteOn(configuration.dexed[seq_chord_dexed_inst].midi_channel, arp_note + seq_arps[arp_chord][arp_step + seq_element_shift] , seq_chord_velocity);
arp_note_prev = arp_note + seq_chords[arp_chord][arp_step] + arp_octave * 12; arp_note_prev = arp_note + seq_arps[arp_chord][arp_step + seq_element_shift] ;
} }
else if (arp_style == 3) { //arp random else if (arp_style == 3) { //arp random
uint8_t rnd1 = random(4); uint8_t rnd1 = random(5);
uint8_t rnd2 = random(arp_oct_usersetting + 1) * 12; handleNoteOn(configuration.dexed[seq_chord_dexed_inst].midi_channel, arp_note + seq_chords[arp_chord][rnd1] + (seq_oct_shift * 12), seq_chord_velocity);
handleNoteOn(configuration.dexed[seq_chord_dexed_inst].midi_channel, arp_note + seq_chords[arp_chord][rnd1] + rnd2, seq_chord_velocity); arp_note_prev = arp_note + seq_chords[arp_chord][rnd1] + (seq_oct_shift * 12);
arp_note_prev = arp_note + seq_chords[arp_chord][rnd1] + rnd2; }
} }
} }
} }
@ -106,16 +108,14 @@ void sequencer_part1(void)
arp_counter = 0; arp_counter = 0;
arp_step++; arp_step++;
} }
} }
} }
//if (arp_step > 3 || seq_chords[arp_chord][arp_step] == 0 ) { if ( (arp_step > 1 && seq_arps[arp_chord][arp_step] == 0) || arp_step == arp_lenght)
if (arp_step > 3 || seq_chords[arp_chord][arp_step] == 0 ) { {
arp_step = 0; arp_step = 0;
arp_octave++;
if (arp_octave >= arp_oct_usersetting) arp_octave = 0;
} }
if (seq_step > 15) { if (seq_step > 15)
{
seq_step = 0; seq_step = 0;
if (seq_chain_lenght > 0) { if (seq_chain_lenght > 0) {
seq_chain_active_step++; seq_chain_active_step++;
@ -137,10 +137,10 @@ void sequencer_part2(void)
handleNoteOff(configuration.dexed[seq_inst_dexed[d]].midi_channel, seq_prev_note[d] , 0); handleNoteOff(configuration.dexed[seq_inst_dexed[d]].midi_channel, seq_prev_note[d] , 0);
if (seq_track_type[d] == 2) { //Chords if (seq_track_type[d] == 2) { //Chords
if ( seq_prev_vel[d] > 199) { if ( seq_prev_vel[d] > 199) {
handleNoteOff(configuration.dexed[seq_chord_dexed_inst].midi_channel, seq_prev_note[d] + seq_chords[seq_prev_vel[d] - 200][0], 0); for (uint8_t x = seq_element_shift; x < seq_element_shift + seq_chord_key_ammount; x++) //play chord notes
handleNoteOff(configuration.dexed[seq_chord_dexed_inst].midi_channel, seq_prev_note[d] + seq_chords[seq_prev_vel[d] - 200][1] , 0); {
handleNoteOff(configuration.dexed[seq_chord_dexed_inst].midi_channel, seq_prev_note[d] + seq_chords[seq_prev_vel[d] - 200][2] , 0); handleNoteOff(configuration.dexed[seq_chord_dexed_inst].midi_channel, seq_prev_note[d] + seq_arps[seq_prev_vel[d] - 200][x], 0);
handleNoteOff(configuration.dexed[seq_chord_dexed_inst].midi_channel, seq_prev_note[d] + seq_chords[seq_prev_vel[d] - 200][3] , 0); }
} }
} }
else if (seq_track_type[d] == 3) else if (seq_track_type[d] == 3)
@ -153,7 +153,6 @@ void sequencer_part2(void)
} }
} }
void sequencer(void) void sequencer(void)
{ // Runs in Interrupt Timer. Switches between the Noteon and Noteoff Task, each cycle { // Runs in Interrupt Timer. Switches between the Noteon and Noteoff Task, each cycle

@ -1,4 +1,5 @@
float drums_volume;
uint8_t seq_active_track = 0; uint8_t seq_active_track = 0;
uint8_t seq_menu; uint8_t seq_menu;
bool seq_button_r = false; bool seq_button_r = false;
@ -11,7 +12,10 @@ uint8_t seq_note_in_velocity;
int seq_transpose; int seq_transpose;
uint8_t seq_inst_dexed[4] = { 0, 0, 1, 1 }; uint8_t seq_inst_dexed[4] = { 0, 0, 1, 1 };
uint8_t seq_chord_dexed_inst = 0; uint8_t seq_chord_dexed_inst = 0;
uint8_t seq_chord_velocity = 50; uint8_t seq_chord_velocity = 60;
uint8_t seq_chord_key_ammount = 4;
uint8_t seq_element_shift=0;
int seq_oct_shift=0;
uint8_t arp_style = 0; // up, down, up&down, random uint8_t arp_style = 0; // up, down, up&down, random
uint8_t seq_chords[7][4] = { 4, 7, 0, 0, //major uint8_t seq_chords[7][4] = { 4, 7, 0, 0, //major
3, 7, 0, 0, //minor 3, 7, 0, 0, //minor
@ -21,6 +25,16 @@ uint8_t seq_chords[7][4] = { 4, 7, 0, 0, //major
4, 7, 11, 0, //maj7, 4, 7, 11, 0, //maj7,
0, 0, 0 , 0 //no Chord 0, 0, 0 , 0 //no Chord
}; };
uint8_t seq_arps[7][22] = { //up
0, 4, 7, 12, 16, 19, 24, 28, 31, 36, 40, 43, 48, 52, 55, 60 ,99,0,0,0,0,0,//major
0, 3, 7, 12, 15, 19, 24, 27, 31, 36, 39, 43, 48, 51, 55, 60 ,99,0,0,0,0,0,//minor
0, 4, 7, 10, 12, 16, 19, 22, 24, 28, 31, 34, 36, 40, 43, 46, 48, 52, 55, 58, 60 ,99,//seventh
0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60 ,99,0,0,0,0,0,//augmented
0, 3, 6, 12, 15, 18, 24, 27, 30, 36, 39, 42, 48, 51, 54, 60 ,99,0,0,0,0,0,//dim
0, 4, 7, 11, 12, 16, 19, 23, 24, 28, 31, 35, 36, 40, 43, 47, 48, 52, 55, 59, 60 ,99//maj7
};
char seq_chord_names[7][4] = { 'M', 'a', 'j', ' ' , //major char seq_chord_names[7][4] = { 'M', 'a', 'j', ' ' , //major
'M', 'i', 'n', ' ' , 'M', 'i', 'n', ' ' ,
's', 'e', 'v', ' ' , 's', 'e', 'v', ' ' ,
@ -41,20 +55,20 @@ int seq_bpm = 102;
uint8_t seq_temp_select_menu; uint8_t seq_temp_select_menu;
uint8_t seq_temp_active_menu = 99; uint8_t seq_temp_active_menu = 99;
uint8_t seq_chain_active_chainstep; uint8_t seq_chain_active_chainstep;
uint8_t seq_chain_lenght = 0; // 0 = 16 steps, 1 = 32 Steps, 2 = 46 Steps, 3 = 64 Steps uint8_t seq_chain_lenght = 3; // 0 = 16 steps, 1 = 32 Steps, 2 = 46 Steps, 3 = 64 Steps
uint8_t seq_chain_active_step = 0; uint8_t seq_chain_active_step = 0;
uint8_t seq_prev_note[4]; // note_offs for every (instr.) track uint8_t seq_prev_note[4]; // note_offs for every (instr.) track
uint8_t seq_prev_vel[4]; uint8_t seq_prev_vel[4];
uint8_t arp_step; uint8_t arp_step;
uint8_t arp_note; uint8_t arp_note;
uint8_t arp_chord = 6; uint8_t arp_chord = 6;
bool arp_play_basenote=true; bool arp_play_basenote = true;
uint8_t arp_note_prev; uint8_t arp_note_prev;
uint8_t arp_octave; uint8_t arp_octave;
uint8_t arp_prev_oct; uint8_t arp_prev_oct;
uint8_t arp_speed = 0; uint8_t arp_speed = 0;
uint8_t arp_counter = 0; uint8_t arp_counter = 0;
uint8_t arp_oct_usersetting = 1; uint8_t arp_lenght = 8;
uint8_t seq_data[10][16] = {72 , 0 , 0 , 0 , 72 , 0 , 0 , 0 , 72 , 0 , 0 , 0 , 72 , 0 , 0 , 0 , uint8_t seq_data[10][16] = {72 , 0 , 0 , 0 , 72 , 0 , 0 , 0 , 72 , 0 , 0 , 0 , 72 , 0 , 0 , 0 ,
78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 , 78 ,
72 , 0 , 0 , 0 , 72 , 0 , 0 , 0 , 72 , 0 , 0 , 75 , 72 , 0 , 0 , 0 , 72 , 0 , 0 , 0 , 72 , 0 , 0 , 0 , 72 , 0 , 0 , 75 , 72 , 0 , 0 , 0 ,
@ -81,7 +95,7 @@ uint8_t seq_vel[10][16] = {120, 0, 0, 0, 120, 0, 0, 0, 120, 0, 0, 0, 120, 0, 0,
uint8_t seq_patternchain[4][4] = { 0 , 1 , 6 , 9 , 0 , 1 , 5 , 8 , 0 , 1 , 6 , 9 , 2 , 1 , 5 , 7 uint8_t seq_patternchain[4][4] = { 0 , 1 , 6 , 9 , 0 , 1 , 5 , 8 , 0 , 1 , 6 , 9 , 2 , 1 , 5 , 7
}; };
uint8_t seq_content_type[10] = { 0, 0, 0, 0 , 1, 1, 1 , 1 , 1 , 1 }; // 0 = track is Drumtrack, 1= Instrumenttrack, 2= Chord or Arpeggio uint8_t seq_content_type[10] = { 0, 0, 0, 0 , 1, 1, 1 , 1 , 1 , 1 }; // 0 = track is Drumtrack, 1= Instrumenttrack, 2= Chord or Arpeggio
uint8_t seq_track_type[4] = { 0, 0, 0, 1 }; // 0 = track is Drumtrack, 1 = Instrumenttrack, 2 = Chord, 3 = Arp uint8_t seq_track_type[4] = { 0, 0, 2, 1 }; // 0 = track is Drumtrack, 1 = Instrumenttrack, 2 = Chord, 3 = Arp
//uint8_t seq_reverb[4][16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //uint8_t seq_reverb[4][16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
// 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, // 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0,

Loading…
Cancel
Save