Merge pull request 'Arp/Chord Menu+added related settings' (#71) from positionhigh/MicroDexed:dev into dev

Reviewed-on: https://codeberg.org/dcoredump/MicroDexed/pulls/71
pull/76/head
Holger Wirtz 3 years ago
commit c631d60eea
  1. 3989
      MicroDexed.ino
  2. 297
      UI.hpp
  3. 33
      UI_FX.h
  4. 33
      UI_NO_FX.h
  5. 219
      sequencer.cpp
  6. 39
      sequencer.h
  7. BIN
      third-party/TeensyTimerTool-master.zip

File diff suppressed because it is too large Load Diff

297
UI.hpp

@ -51,6 +51,9 @@
#endif #endif
#define _LCDML_DISP_cfg_scrollbar 1 // enable a scrollbar #define _LCDML_DISP_cfg_scrollbar 1 // enable a scrollbar
extern PeriodicTimer timer1;
extern void sequencer(void);
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);
extern bool load_sysex(uint8_t b, uint8_t v); extern bool load_sysex(uint8_t b, uint8_t v);
@ -65,6 +68,7 @@ extern float pseudo_log_curve(float value);
extern uint8_t selected_instance_id; extern uint8_t selected_instance_id;
extern char receive_bank_filename[FILENAME_LEN]; extern char receive_bank_filename[FILENAME_LEN];
#if NUM_DRUMS > 0 #if NUM_DRUMS > 0
#include "drums.h" #include "drums.h"
extern drum_config_t drum_config[NUM_DRUMSET_CONFIG]; extern drum_config_t drum_config[NUM_DRUMSET_CONFIG];
@ -82,13 +86,20 @@ extern bool seq_recording;
uint8_t seq_active_function = 99; uint8_t seq_active_function = 99;
uint8_t activesample; uint8_t activesample;
extern uint8_t seq_active_track; extern uint8_t seq_active_track;
extern elapsedMillis seq_millis_timer;
extern uint8_t seq_menu; extern uint8_t seq_menu;
extern uint8_t seq_temp_select_menu; extern uint8_t seq_temp_select_menu;
extern uint8_t seq_temp_active_menu; 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 arp_step;
extern uint8_t arp_note;
extern uint8_t arp_chord;
extern uint8_t arp_octave;
extern uint8_t arp_oct_usersetting;
extern uint8_t arp_style;
extern uint8_t arp_speed;
extern char arp_style_names[4][3];
#endif #endif
#ifdef DISPLAY_LCD_SPI #ifdef DISPLAY_LCD_SPI
@ -273,6 +284,7 @@ void UI_func_seq_live_transpose_oct(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_seq_track_setup(uint8_t param); void UI_func_seq_track_setup(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_pattern_load(uint8_t param);
@ -3915,14 +3927,9 @@ void UI_func_seq_display_style(uint8_t param)
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
lcd.print("Seq. Disp. Style"); lcd.print("Seq. Disp. Style");
lcd.setCursor(0, 1); lcd.setCursor(0, 1);
lcd.print("Seq."); lcd.print("Pat.");
lcd.setCursor(8, 1); lcd.setCursor(8, 1);
lcd.print("="); lcd.print("=");
lcd.setCursor(11, 1);
if (seq_content_type[seq_active_track] == 0)
lcd.print("Drum");
else
lcd.print("Inst");
} }
if (LCDML.FUNC_loop()) // ****** LOOP ********* if (LCDML.FUNC_loop()) // ****** LOOP *********
{ {
@ -3943,21 +3950,17 @@ void UI_func_seq_display_style(uint8_t param)
{ {
if (LCDML.BT_checkDown()) if (LCDML.BT_checkDown())
{ {
seq_content_type[seq_active_track] = constrain(seq_content_type[seq_active_track] + ENCODER[ENC_R].speed(), 0, 1); seq_content_type[seq_active_track] = constrain(seq_content_type[seq_active_track] + ENCODER[ENC_R].speed(), 0, 2);
} }
else if (LCDML.BT_checkUp()) else if (LCDML.BT_checkUp())
{ {
seq_content_type[seq_active_track] = constrain(seq_content_type[seq_active_track] - ENCODER[ENC_R].speed(), 0, 1); seq_content_type[seq_active_track] = constrain(seq_content_type[seq_active_track] - ENCODER[ENC_R].speed(), 0, 2);
} }
} }
} }
if (LCDML.BT_checkEnter()) if (LCDML.BT_checkEnter())
{ {
if (menu_select_toggle) { menu_select_toggle = !menu_select_toggle;
menu_select_toggle = false;
} else
{ menu_select_toggle = true;
}
} }
if (menu_select_toggle == false) { if (menu_select_toggle == false) {
lcd.setCursor(10, 1); lcd.setCursor(10, 1);
@ -3968,10 +3971,6 @@ void UI_func_seq_display_style(uint8_t param)
lcd.print("["); lcd.print("[");
lcd.print(seq_active_track); lcd.print(seq_active_track);
lcd.print("]"); lcd.print("]");
lcd.setCursor(11, 1);
if (seq_content_type[seq_active_track] == 0) lcd.print("Drum");
else
lcd.print("Inst");
} else { } else {
lcd.setCursor(4, 1); lcd.setCursor(4, 1);
lcd.print(" "); lcd.print(" ");
@ -3979,12 +3978,16 @@ void UI_func_seq_display_style(uint8_t param)
lcd.print(" "); lcd.print(" ");
lcd.setCursor(10, 1); lcd.setCursor(10, 1);
lcd.print("["); lcd.print("[");
if (seq_content_type[seq_active_track] == 0) lcd.setCursor(15, 1);
lcd.print("Drum");
else
lcd.print("Inst");
lcd.print("]"); lcd.print("]");
} }
lcd.setCursor(11, 1);
if (seq_content_type[seq_active_track] == 0)
lcd.print("Drum");
else if (seq_content_type[seq_active_track] == 1)
lcd.print("Inst");
else
lcd.print("Chrd");
} }
if (LCDML.FUNC_close()) // ****** STABLE END ********* if (LCDML.FUNC_close()) // ****** STABLE END *********
{ {
@ -4068,7 +4071,7 @@ void UI_func_seq_lenght(uint8_t param)
void UI_func_seq_tempo(uint8_t param) void UI_func_seq_tempo(uint8_t param)
{ {
char tmp[5]; char tmp[7];
if (LCDML.FUNC_setup()) // ****** SETUP ********* if (LCDML.FUNC_setup()) // ****** SETUP *********
{ {
encoderDir[ENC_R].reset(); encoderDir[ENC_R].reset();
@ -4084,19 +4087,21 @@ void UI_func_seq_tempo(uint8_t param)
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() && encoderDir[ENC_R].Down()) || (LCDML.BT_checkUp() && encoderDir[ENC_R].Up()) || (LCDML.BT_checkEnter() && encoderDir[ENC_R].ButtonShort()))
{ {
if (LCDML.BT_checkDown()) if (LCDML.BT_checkDown())
seq_bpm = constrain(seq_bpm + ENCODER[ENC_R].speed(), 60, 180); seq_bpm = constrain(seq_bpm + ENCODER[ENC_R].speed(), 50, 190);
else if (LCDML.BT_checkUp()) else if (LCDML.BT_checkUp())
seq_bpm = constrain(seq_bpm - ENCODER[ENC_R].speed(), 60, 180); seq_bpm = constrain(seq_bpm - ENCODER[ENC_R].speed(), 50, 190);
} }
seq_tempo_ms = 60000 / seq_bpm / 4; // seq_tempo_ms = 60000 / seq_bpm / 4;
seq_tempo_ms = 60000000 / seq_bpm / 4;
sprintf(tmp, "[%3d]", seq_bpm);
lcd.setCursor(0, 1); lcd.setCursor(0, 1);
sprintf(tmp, "[%3d]", seq_bpm);
lcd.print(tmp); lcd.print(tmp);
lcd.setCursor(11, 1);
lcd.setCursor(9, 1); sprintf(tmp, "%3d", seq_tempo_ms / 1000);
sprintf(tmp, "[%3d]", seq_tempo_ms);
lcd.print(tmp); lcd.print(tmp);
//timer1.stop();
timer1.begin(sequencer, seq_tempo_ms / 2);
} }
if (LCDML.FUNC_close()) // ****** STABLE END ********* if (LCDML.FUNC_close()) // ****** STABLE END *********
{ {
@ -4152,7 +4157,7 @@ void UI_func_seq_vel_editor(uint8_t param)
else if (LCDML.BT_checkUp()) else if (LCDML.BT_checkUp())
seq_vel[seq_active_track][seq_menu - 1] = constrain(seq_vel[seq_active_track][seq_menu - 1] - 1, 0, 127); seq_vel[seq_active_track][seq_menu - 1] = constrain(seq_vel[seq_active_track][seq_menu - 1] - 1, 0, 127);
} }
} else if (seq_active_function == 1 && seq_content_type[seq_active_track] > 1 ) { } else if (seq_active_function == 1 && seq_content_type[seq_active_track] > 1 ) { //is in Chord or Arp Mode
if ((LCDML.BT_checkDown() && encoderDir[ENC_R].Down()) || (LCDML.BT_checkUp() && encoderDir[ENC_R].Up())) if ((LCDML.BT_checkDown() && encoderDir[ENC_R].Down()) || (LCDML.BT_checkUp() && encoderDir[ENC_R].Up()))
{ {
if (LCDML.BT_checkDown()) if (LCDML.BT_checkDown())
@ -4179,8 +4184,8 @@ void UI_func_seq_vel_editor(uint8_t param)
} }
//button check end <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< //button check end <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
if ( seq_content_type[seq_active_track] > 1 && seq_vel[seq_active_track][seq_menu - 1]<200) seq_vel[seq_active_track][seq_menu - 1]=200; if ( seq_content_type[seq_active_track] > 1 && seq_vel[seq_active_track][seq_menu - 1] < 200) seq_vel[seq_active_track][seq_menu - 1] = 200;
if (seq_menu == 0) { if (seq_menu == 0) {
lcd.setCursor(4, 0); lcd.setCursor(4, 0);
lcd.print("--- --- "); lcd.print("--- --- ");
@ -4232,7 +4237,7 @@ void UI_func_seq_vel_editor(uint8_t param)
lcd.print(" "); lcd.print(" ");
} }
else { else {
if (seq_vel[seq_active_track][seq_menu - 1] == 200) lcd.print("Maj" ); if (seq_vel[seq_active_track][seq_menu - 1] == 200) lcd.print("Maj" );
else if (seq_vel[seq_active_track][seq_menu - 1] == 201) lcd.print("Min" ); else if (seq_vel[seq_active_track][seq_menu - 1] == 201) lcd.print("Min" );
else if (seq_vel[seq_active_track][seq_menu - 1] == 202) lcd.print("Sev" ); else if (seq_vel[seq_active_track][seq_menu - 1] == 202) lcd.print("Sev" );
else if (seq_vel[seq_active_track][seq_menu - 1] == 203) lcd.print("Aug" ); else if (seq_vel[seq_active_track][seq_menu - 1] == 203) lcd.print("Aug" );
@ -4283,6 +4288,21 @@ void seq_refresh_display_play_status()
} }
} }
void arp_refresh_display_play_status()
{
lcd.setCursor(12, 0);
if (seq_running == false )
{
lcd.print("PLY");
} else if (seq_running == true )
{
seq_note_in = 0;
lcd.print("STP");
}
}
void UI_func_sequencer(uint8_t param) void UI_func_sequencer(uint8_t param)
{ {
if (LCDML.FUNC_setup()) // ****** SETUP ********* if (LCDML.FUNC_setup()) // ****** SETUP *********
@ -4507,6 +4527,7 @@ void UI_func_sequencer(uint8_t param)
{ {
seq_running = true; seq_running = true;
lcd.print("REC"); lcd.print("REC");
timer1.start();
} else if (seq_running == true && seq_recording == false) } else if (seq_running == true && seq_recording == false)
{ {
seq_running = true; seq_running = true;
@ -4521,6 +4542,7 @@ void UI_func_sequencer(uint8_t param)
seq_step = 0; seq_step = 0;
seq_chain_active_step = 0; seq_chain_active_step = 0;
lcd.print("PLY"); lcd.print("PLY");
timer1.stop();
MicroDexed[0]->panic(); MicroDexed[0]->panic();
} }
} else if ( seq_menu == 2) } else if ( seq_menu == 2)
@ -4759,9 +4781,187 @@ void UI_func_sequencer(uint8_t param)
} }
} }
void UI_func_seq_pat_chain(uint8_t param) void UI_func_arpeggio(uint8_t param)
{ {
if (LCDML.FUNC_setup()) // ****** SETUP *********
{
encoderDir[ENC_R].reset();
seq_temp_active_menu = 0;
lcd.setCursor( 0, 0);
lcd.print("Oct");
lcd.setCursor( 0, 1);
lcd.print("Style");
lcd.setCursor( 7, 0);
lcd.print("Maj");
lcd.setCursor( 11, 1);
lcd.print("1/16");
lcd.setCursor( 7, 0);
lcd.print(" ");
arp_refresh_display_play_status();
}
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 (seq_temp_active_menu == 0)
{
if (LCDML.BT_checkDown())
seq_temp_select_menu = constrain(seq_temp_select_menu + ENCODER[ENC_R].speed(), 0, 3);
else if (LCDML.BT_checkUp())
seq_temp_select_menu = constrain(seq_temp_select_menu - ENCODER[ENC_R].speed(), 0, 3);
} else if (seq_temp_active_menu == 1) // Octave setting
{
if (LCDML.BT_checkDown())
arp_oct_usersetting = constrain(arp_oct_usersetting + ENCODER[ENC_R].speed(), 0, 3);
else if (LCDML.BT_checkUp())
arp_oct_usersetting = constrain(arp_oct_usersetting - ENCODER[ENC_R].speed(), 0, 3);
}
else if (seq_temp_active_menu == 2) // Style setting
{
if (LCDML.BT_checkDown())
arp_style = constrain(arp_style + ENCODER[ENC_R].speed(), 0, 3);
else if (LCDML.BT_checkUp())
arp_style = constrain(arp_style - ENCODER[ENC_R].speed(), 0, 3);
}
else if (seq_temp_active_menu == 3) // Arp Speed setting
{
if (LCDML.BT_checkDown())
arp_speed = constrain(arp_speed + ENCODER[ENC_R].speed(), 0, 1);
else if (LCDML.BT_checkUp())
arp_speed = constrain(arp_speed - ENCODER[ENC_R].speed(), 0, 1);
}
if (LCDML.BT_checkEnter()) //handle button presses during menu >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
{
if ( seq_temp_select_menu == 0 && seq_temp_active_menu == 0 )
{
seq_temp_active_menu = 1;
}
else if ( seq_temp_select_menu == 0 && seq_temp_active_menu == 1 )
{
seq_temp_active_menu = 0;
}
if ( seq_temp_select_menu == 1 && seq_temp_active_menu == 0 )
{
seq_temp_active_menu = 2;
}
else if ( seq_temp_select_menu == 1 && seq_temp_active_menu == 2 )
{
seq_temp_active_menu = 0;
}
//else if ( seq_temp_select_menu == 2 && seq_temp_active_menu == 0 )
else if ( seq_temp_select_menu == 2 )
{
if (seq_running) {
seq_running = !seq_running;
timer1.stop();
MicroDexed[0]->panic();
arp_refresh_display_play_status();
seq_step = 0;
arp_octave = 0;
arp_step = 0;
seq_chain_active_step = 0;
} else
{
seq_running = !seq_running;
arp_refresh_display_play_status();
timer1.start();
}
}
else if ( seq_temp_select_menu == 3 && seq_temp_active_menu == 0 )
{
seq_temp_active_menu = 3;
}
else if ( seq_temp_select_menu == 3 && seq_temp_active_menu == 3 )
{
seq_temp_active_menu = 0;
}
}
}
lcd.setCursor( 4, 0);
lcd.print(arp_oct_usersetting);
lcd.setCursor( 6, 1);
lcd.print( arp_style_names[arp_style][0] );
lcd.print( arp_style_names[arp_style][1] );
lcd.print( arp_style_names[arp_style][2] );
lcd.setCursor( 11, 1);
if (arp_speed == 0)lcd.print("1/16"); else if (arp_speed == 1)lcd.print("1/8 ");
if (seq_temp_select_menu == 0) {
lcd.setCursor( 3, 0);
lcd.print("[");
lcd.setCursor( 5, 0);
lcd.print("]");
lcd.setCursor( 11, 0);
lcd.print(" ");
lcd.setCursor( 15, 0);
lcd.print(" ");
lcd.setCursor( 5, 1);
lcd.print(" ");
lcd.setCursor( 9, 1);
lcd.print(" ");
lcd.setCursor( 10, 1);
lcd.print(" ");
lcd.setCursor( 15, 1);
lcd.print(" ");
}
else if (seq_temp_select_menu == 1)
{
lcd.setCursor( 3, 0);
lcd.print(" ");
lcd.setCursor( 5, 0);
lcd.print(" ");
lcd.setCursor( 11, 0);
lcd.print(" ");
lcd.setCursor( 15, 0);
lcd.print(" ");
lcd.setCursor( 5, 1);
lcd.print("[");
lcd.setCursor( 9, 1);
lcd.print("]");
}
else if (seq_temp_select_menu == 2)
{
lcd.setCursor( 5, 1);
lcd.print(" ");
lcd.setCursor( 9, 1);
lcd.print(" ");
lcd.setCursor( 10, 1);
lcd.print(" ");
lcd.setCursor( 15, 1);
lcd.print(" ");
lcd.setCursor( 11, 0);
lcd.print("[");
lcd.setCursor( 15, 0);
lcd.print("]");
}
else if (seq_temp_select_menu == 3)
{
lcd.setCursor( 11, 0);
lcd.print(" ");
lcd.setCursor( 15, 0);
lcd.print(" ");
lcd.setCursor( 3, 0);
lcd.print(" ");
lcd.setCursor( 5, 0);
lcd.print(" ");
lcd.setCursor( 10, 1);
lcd.print("[");
lcd.setCursor( 15, 1);
lcd.print("]");
}
}
if (LCDML.FUNC_close()) // ****** STABLE END *********
{
encoderDir[ENC_R].reset();
}
}
void UI_func_seq_pat_chain(uint8_t param)
{
if (LCDML.FUNC_setup()) // ****** SETUP ********* if (LCDML.FUNC_setup()) // ****** SETUP *********
{ {
// setup function // setup function
@ -4793,7 +4993,6 @@ void UI_func_seq_pat_chain(uint8_t param)
lcd.setCursor(8 , 1); lcd.setCursor(8 , 1);
lcd.print( seq_patternchain[seq_chain_active_chainstep][3]); lcd.print( seq_patternchain[seq_chain_active_chainstep][3]);
} }
if (LCDML.FUNC_loop()) // ****** LOOP ********* if (LCDML.FUNC_loop()) // ****** LOOP *********
{ {
if (seq_temp_active_menu == 99) { if (seq_temp_active_menu == 99) {
@ -4951,7 +5150,6 @@ void UI_func_seq_pat_chain(uint8_t param)
void UI_func_seq_track_setup(uint8_t param) void UI_func_seq_track_setup(uint8_t param)
{ {
if (LCDML.FUNC_setup()) // ****** SETUP ********* if (LCDML.FUNC_setup()) // ****** SETUP *********
{ {
// setup function // setup function
@ -4965,13 +5163,13 @@ void UI_func_seq_track_setup(uint8_t param)
lcd.setCursor(9 , 1); lcd.setCursor(9 , 1);
lcd.print("T4"); lcd.print("T4");
lcd.setCursor(3 , 0); lcd.setCursor(3 , 0);
if (seq_track_type[0] == 0 ) lcd.print("Drm"); else lcd.print("Ins"); if (seq_track_type[0] == 0 ) lcd.print("Drm"); else if (seq_track_type[0] == 1 ) lcd.print("Ins"); else if (seq_track_type[0] == 2 )lcd.print("Chd"); else lcd.print("Arp");
lcd.setCursor(3 , 1); lcd.setCursor(3 , 1);
if (seq_track_type[1] == 0 ) lcd.print("Drm"); else lcd.print("Ins"); if (seq_track_type[1] == 0 ) lcd.print("Drm"); else if (seq_track_type[1] == 1 ) lcd.print("Ins"); else if (seq_track_type[1] == 2 )lcd.print("Chd"); else lcd.print("Arp");
lcd.setCursor(12 , 0); lcd.setCursor(12 , 0);
if (seq_track_type[2] == 0 ) lcd.print("Drm"); else lcd.print("Ins"); if (seq_track_type[2] == 0 ) lcd.print("Drm"); else if (seq_track_type[2] == 1 ) lcd.print("Ins"); else if (seq_track_type[2] == 2 )lcd.print("Chd"); else lcd.print("Arp");
lcd.setCursor(12 , 1); lcd.setCursor(12 , 1);
if (seq_track_type[3] == 0 ) lcd.print("Drm"); else lcd.print("Ins"); if (seq_track_type[3] == 0 ) lcd.print("Drm"); else if (seq_track_type[3] == 1 ) lcd.print("Ins"); else if (seq_track_type[3] == 2 )lcd.print("Chd"); else lcd.print("Arp");
} }
if (LCDML.FUNC_loop()) // ****** LOOP ********* if (LCDML.FUNC_loop()) // ****** LOOP *********
{ {
@ -4987,9 +5185,9 @@ void UI_func_seq_track_setup(uint8_t param)
if ((LCDML.BT_checkDown() && encoderDir[ENC_R].Down()) || (LCDML.BT_checkUp() && encoderDir[ENC_R].Up())) if ((LCDML.BT_checkDown() && encoderDir[ENC_R].Down()) || (LCDML.BT_checkUp() && encoderDir[ENC_R].Up()))
{ {
if (LCDML.BT_checkDown()) if (LCDML.BT_checkDown())
seq_track_type[seq_temp_active_menu] = constrain(seq_track_type[seq_temp_active_menu] + 1, 0, 1); seq_track_type[seq_temp_active_menu] = constrain(seq_track_type[seq_temp_active_menu] + 1, 0, 3);
else if (LCDML.BT_checkUp()) else if (LCDML.BT_checkUp())
seq_track_type[seq_temp_active_menu] = constrain(seq_track_type[seq_temp_active_menu] - 1, 0, 1); seq_track_type[seq_temp_active_menu] = constrain(seq_track_type[seq_temp_active_menu] - 1, 0, 3);
} }
} }
if (LCDML.BT_checkEnter()) //handle button presses during menu >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> if (LCDML.BT_checkEnter()) //handle button presses during menu >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@ -5012,7 +5210,7 @@ void UI_func_seq_track_setup(uint8_t param)
lcd.setCursor(6 , 1); lcd.setCursor(6 , 1);
lcd.print(" "); lcd.print(" ");
lcd.setCursor(3 , 0); lcd.setCursor(3 , 0);
if (seq_track_type[0] == 0 ) lcd.print("Drm"); else lcd.print("Ins"); if (seq_track_type[0] == 0 ) lcd.print("Drm"); else if (seq_track_type[0] == 1 ) lcd.print("Ins"); else if (seq_track_type[0] == 2 )lcd.print("Chd"); else lcd.print("Arp");
} else if (seq_temp_select_menu == 1) } else if (seq_temp_select_menu == 1)
{ {
lcd.setCursor(2 , 0); lcd.setCursor(2 , 0);
@ -5028,7 +5226,7 @@ void UI_func_seq_track_setup(uint8_t param)
lcd.setCursor(15 , 0); lcd.setCursor(15 , 0);
lcd.print(" "); lcd.print(" ");
lcd.setCursor(3 , 1); lcd.setCursor(3 , 1);
if (seq_track_type[1] == 0 ) lcd.print("Drm"); else lcd.print("Ins"); if (seq_track_type[1] == 0 ) lcd.print("Drm"); else if (seq_track_type[1] == 1 ) lcd.print("Ins"); else if (seq_track_type[1] == 2 )lcd.print("Chd"); else lcd.print("Arp");
} else if (seq_temp_select_menu == 2) } else if (seq_temp_select_menu == 2)
{ {
lcd.setCursor(2 , 1); lcd.setCursor(2 , 1);
@ -5044,7 +5242,7 @@ void UI_func_seq_track_setup(uint8_t param)
lcd.setCursor(15 , 1); lcd.setCursor(15 , 1);
lcd.print(" "); lcd.print(" ");
lcd.setCursor(12 , 0); lcd.setCursor(12 , 0);
if (seq_track_type[2] == 0 ) lcd.print("Drm"); else lcd.print("Ins"); if (seq_track_type[2] == 0 ) lcd.print("Drm"); else if (seq_track_type[2] == 1 ) lcd.print("Ins"); else if (seq_track_type[2] == 2 )lcd.print("Chd"); else lcd.print("Arp");
} else if (seq_temp_select_menu == 3) } else if (seq_temp_select_menu == 3)
{ {
lcd.setCursor(11 , 0); lcd.setCursor(11 , 0);
@ -5056,7 +5254,7 @@ void UI_func_seq_track_setup(uint8_t param)
lcd.setCursor(15 , 1); lcd.setCursor(15 , 1);
lcd.print("]"); lcd.print("]");
lcd.setCursor(12 , 1); lcd.setCursor(12 , 1);
if (seq_track_type[3] == 0 ) lcd.print("Drm"); else lcd.print("Ins"); if (seq_track_type[3] == 0 ) lcd.print("Drm"); else if (seq_track_type[3] == 1 ) lcd.print("Ins"); else if (seq_track_type[3] == 2 )lcd.print("Chd"); else lcd.print("Arp");
} }
} }
if (LCDML.FUNC_close()) // ****** STABLE END ********* if (LCDML.FUNC_close()) // ****** STABLE END *********
@ -5065,7 +5263,6 @@ void UI_func_seq_track_setup(uint8_t param)
} }
} }
void UI_func_seq_pattern_load(uint8_t param) void UI_func_seq_pattern_load(uint8_t param)
{ {
static uint8_t mode; static uint8_t mode;
@ -5134,7 +5331,7 @@ void UI_func_seq_pattern_save(uint8_t param)
{ {
char tmp[FILENAME_LEN]; char tmp[FILENAME_LEN];
yesno = false; yesno = false;
temp_int=0; temp_int = 0;
mode = 0; mode = 0;
encoderDir[ENC_R].reset(); encoderDir[ENC_R].reset();
lcd.setCursor(0, 0); lcd.setCursor(0, 0);
@ -7357,7 +7554,7 @@ void UI_func_eq_treble(uint8_t param)
} }
} }
lcd_display_meter_float("EQ Treble", configuration.fx.eq_treble, 0.1, 0.0, EQ_TREBLE_MIN, EQ_TREBLE_MAX, 1, 1, false, true, true); lcd_display_meter_float("EQ Treble", configuration.fx.eq_treble, 0.1, 0.0, EQ_TREBLE_MIN, EQ_TREBLE_MAX, 1, 1, false, true, true);
sgtl5000_1.eqBand(4,mapfloat(configuration.fx.eq_treble, EQ_TREBLE_MIN, EQ_TREBLE_MAX, -1.0, 1.0)); sgtl5000_1.eqBand(4, mapfloat(configuration.fx.eq_treble, EQ_TREBLE_MIN, EQ_TREBLE_MAX, -1.0, 1.0));
} }
if (LCDML.FUNC_close()) // ****** STABLE END ********* if (LCDML.FUNC_close()) // ****** STABLE END *********

@ -121,20 +121,21 @@ LCDML_add(87, LCDML_0, 5, "Sequencer", NULL);
LCDML_add(88, LCDML_0_5, 1, "Sequencer", UI_func_sequencer); LCDML_add(88, LCDML_0_5, 1, "Sequencer", UI_func_sequencer);
LCDML_add(89, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor); LCDML_add(89, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor);
LCDML_add(90, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain); LCDML_add(90, LCDML_0_5, 3, "Pattern Chain", UI_func_seq_pat_chain);
LCDML_add(91, LCDML_0_5, 4, "Seq. Length", UI_func_seq_lenght); LCDML_add(91, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio);
LCDML_add(92, LCDML_0_5, 5, "Tempo", UI_func_seq_tempo); LCDML_add(92, LCDML_0_5, 5, "Seq. Length", UI_func_seq_lenght);
LCDML_add(93, LCDML_0_5, 6, "L.Transp.Key", UI_func_seq_live_transpose_oct); LCDML_add(93, LCDML_0_5, 6, "Tempo", UI_func_seq_tempo);
LCDML_add(94, LCDML_0_5, 7, "L.Trp.Offset", NULL); LCDML_add(94, LCDML_0_5, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct);
LCDML_add(95, LCDML_0_5, 8, "Track Setup", UI_func_seq_track_setup); LCDML_add(95, LCDML_0_5, 8, "L.Trp.Offset", NULL);
LCDML_add(96, LCDML_0_5, 9, "Seq.Disp.Style", UI_func_seq_display_style); LCDML_add(96, LCDML_0_5, 9, "Track Setup", UI_func_seq_track_setup);
LCDML_add(97, LCDML_0_5, 10, "LOAD Patterns", UI_func_seq_pattern_load); LCDML_add(97, LCDML_0_5, 10, "Seq.Disp.Style", UI_func_seq_display_style);
LCDML_add(98, LCDML_0_5, 11, "SAVE Patterns", UI_func_seq_pattern_save); LCDML_add(98, LCDML_0_5, 11, "LOAD Patterns", UI_func_seq_pattern_load);
LCDML_add(99, LCDML_0, 6, "System", NULL); LCDML_add(99, LCDML_0_5, 12, "SAVE Patterns", UI_func_seq_pattern_save);
LCDML_add(100, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono); LCDML_add(100, LCDML_0, 6, "System", NULL);
LCDML_add(101, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); LCDML_add(101, LCDML_0_6, 1, "Stereo/Mono", UI_func_stereo_mono);
LCDML_add(102, LCDML_0_6, 3, "Favorites", UI_func_favorites); LCDML_add(102, LCDML_0_6, 2, "MIDI Soft THRU", UI_func_midi_soft_thru);
LCDML_add(103, LCDML_0_6, 4, "EEPROM Reset", UI_func_eeprom_reset); LCDML_add(103, LCDML_0_6, 3, "Favorites", UI_func_favorites);
LCDML_add(104, LCDML_0, 7, "Info", UI_func_information); LCDML_add(104, LCDML_0_6, 4, "EEPROM Reset", UI_func_eeprom_reset);
LCDML_addAdvanced(105, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); LCDML_add(105, LCDML_0, 7, "Info", UI_func_information);
#define _LCDML_DISP_cnt 105 LCDML_addAdvanced(106, LCDML_0, 8, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default);
#define _LCDML_DISP_cnt 106
#endif #endif

@ -91,22 +91,23 @@ LCDML_add(57, LCDML_0_3, 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_3, 3, "Drum Pan", UI_func_drum_pan);
LCDML_add(59, LCDML_0, 4, "Sequencer", NULL); LCDML_add(59, LCDML_0, 4, "Sequencer", NULL);
LCDML_add(60, LCDML_0_4, 1, "Sequencer", UI_func_sequencer); LCDML_add(60, LCDML_0_4, 1, "Sequencer", UI_func_sequencer);
LCDML_add(61, LCDML_0_5, 2, "Velocity Edit", UI_func_seq_vel_editor); LCDML_add(61, LCDML_0_5, 2, "Vel./Chrd Edit", UI_func_seq_vel_editor);
LCDML_add(62, LCDML_0_4, 3, "Pattern Chain", UI_func_seq_pat_chain); LCDML_add(62, LCDML_0_4, 3, "Pattern Chain", UI_func_seq_pat_chain);
LCDML_add(63, LCDML_0_4, 4, "Seq. Length", UI_func_seq_lenght); LCDML_add(63, LCDML_0_5, 4, "Arpeggio", UI_func_arpeggio);
LCDML_add(64, LCDML_0_4, 5, "Tempo", UI_func_seq_tempo); LCDML_add(64, LCDML_0_4, 5, "Seq. Length", UI_func_seq_lenght);
LCDML_add(65, LCDML_0_4, 6, "L.Transp.Key", UI_func_seq_live_transpose_oct); LCDML_add(65, LCDML_0_4, 6, "Tempo", UI_func_seq_tempo);
LCDML_add(66, LCDML_0_5, 7, "Track Setup", UI_func_seq_track_setup); LCDML_add(66, LCDML_0_4, 7, "L.Transp.Key", UI_func_seq_live_transpose_oct);
LCDML_add(67, LCDML_0_5, 8, "Seq.Disp.Style", UI_func_seq_display_style); LCDML_add(67, LCDML_0_5, 8, "Track Setup", UI_func_seq_track_setup);
LCDML_add(68, LCDML_0_4, 9, "LOAD Patterns", UI_func_seq_pattern_load); LCDML_add(68, LCDML_0_5, 9, "Seq.Disp.Style", UI_func_seq_display_style);
LCDML_add(69, LCDML_0_4, 10, "SAVE Patterns", UI_func_seq_pattern_save); LCDML_add(69, LCDML_0_4, 10, "LOAD Patterns", UI_func_seq_pattern_load);
LCDML_add(70, LCDML_0, 5, "System", NULL); LCDML_add(70, LCDML_0_4, 11, "SAVE Patterns", UI_func_seq_pattern_save);
LCDML_add(71, LCDML_0_5, 1, "Stereo/Mono", UI_func_stereo_mono); LCDML_add(71, LCDML_0, 5, "System", NULL);
LCDML_add(72, LCDML_0_5, 2, "MIDI Soft THRU", UI_func_midi_soft_thru); LCDML_add(72, LCDML_0_5, 1, "Stereo/Mono", UI_func_stereo_mono);
LCDML_add(73, LCDML_0_5, 3, "Favorites", UI_func_favorites); LCDML_add(73, LCDML_0_5, 2, "MIDI Soft THRU", UI_func_midi_soft_thru);
LCDML_add(74, LCDML_0_5, 4, "EEPROM Reset", UI_func_eeprom_reset); LCDML_add(74, LCDML_0_5, 3, "Favorites", UI_func_favorites);
LCDML_add(75, LCDML_0, 6, "Info", UI_func_information); LCDML_add(75, LCDML_0_5, 4, "EEPROM Reset", UI_func_eeprom_reset);
LCDML_addAdvanced(76, LCDML_0, 5, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default); LCDML_add(76, LCDML_0, 6, "Info", UI_func_information);
#define _LCDML_DISP_cnt 76 LCDML_addAdvanced(77, LCDML_0, 5, COND_hide, "Volume", UI_func_volume, 0, _LCDML_TYPE_default);
#define _LCDML_DISP_cnt 77
#endif #endif

@ -10,9 +10,11 @@ extern config_t configuration;
extern void handleNoteOn(byte , byte , byte ); extern void handleNoteOn(byte , byte , byte );
extern void handleNoteOff(byte , byte , byte ); extern void handleNoteOff(byte , byte , byte );
extern void UI_func_sequencer(uint8_t); extern void UI_func_sequencer(uint8_t);
extern void UI_func_arpeggio(uint8_t);
extern const char* seq_find_shortname(uint8_t); extern const char* seq_find_shortname(uint8_t);
boolean interrupt_swapper = false;
void sequencer(void) void sequencer_part1(void)
{ {
//if (seq_note_in > 0 && seq_note_in < 62 && seq_recording == false ) { //if (seq_note_in > 0 && seq_note_in < 62 && seq_recording == false ) {
//handleNoteOff(configuration.dexed[0].midi_channel, seq_data[3][seq_step] + seq_transpose , 0); //handleNoteOff(configuration.dexed[0].midi_channel, seq_data[3][seq_step] + seq_transpose , 0);
@ -23,142 +25,143 @@ void sequencer(void)
//seq_note_in = 0; //seq_note_in = 0;
//} //}
if (seq_millis_timer > seq_timer_previous + seq_tempo_ms) // if (LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_sequencer)) { //is in UI of Sequencer
{
seq_timer_previous = seq_millis_timer;
if (LCDML.FUNC_getID() == LCDML.OTHER_getIDFromFunction(UI_func_sequencer)) {
//write to sequencer if in sequencer menu
if (seq_note_in > 0 && seq_recording == true) {
// if ( seq_content_type[ seq_patternchain[seq_chain_active_step][active_track] ] == 1) handleNoteOff(configuration.dexed[0].midi_channel, seq_data[active_track][seq_step] + seq_transpose , 0); //write to sequencer if in sequencer menu
// if (seq_note_in > 0 && seq_recording == true) {
//
// // if ( seq_content_type[ seq_patternchain[seq_chain_active_step][active_track] ] == 1) handleNoteOff(configuration.dexed[0].midi_channel, seq_data[active_track][seq_step] + seq_transpose , 0);
//
// seq_data[seq_active_track][seq_step] = seq_note_in;
// seq_vel[seq_active_track][seq_step] = seq_note_in_velocity;
// seq_note_in = 0;
// seq_note_in_velocity = 0;
// }
seq_data[seq_active_track][seq_step] = seq_note_in; for (uint8_t d = 0; d < 4; d++)
seq_vel[seq_active_track][seq_step] = seq_note_in_velocity; {
seq_note_in = 0; if ( seq_track_type[d] == 0) { // drum track
seq_note_in_velocity = 0; 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)
}
lcd.setCursor(seq_step, 1);
lcd.print("X");
if (seq_step == 0) {
lcd.setCursor(15, 1);
lcd.print(seq_find_shortname(15)[0]);
}
else
{ {
lcd.setCursor(seq_step - 1, 1); 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]);
lcd.print(seq_find_shortname(seq_step - 1)[0]);
} }
} }
else {
for (uint8_t d = 0; d < 4; d++) 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_track_type[d] == 0) { // drum track if (seq_track_type[d] == 1 || seq_track_type[d] == 3 )
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)
{ {
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(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]);
} }
} seq_prev_note[d] = seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] + seq_transpose;
else { seq_prev_vel[d] = seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step];
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_track_type[d] == 2) { //Chords
{ if (seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step] > 199)
if (seq_track_type[d] == 1 || seq_track_type[d] == 3 )
{ {
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_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);
seq_prev_note[d] = seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] + seq_transpose; 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);
seq_prev_vel[d] = seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step]; 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);
if (seq_track_type[d] == 2) { //Chords
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_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);
}
}
else if (seq_track_type[d] == 3) { //Arp
arp_step = 0;
arp_note = seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] + seq_transpose;
arp_chord = seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step];
} }
}
else if (seq_track_type[d] == 3) { //Arp
arp_step = 0;
arp_counter = 0;
arp_note = seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] + seq_transpose;
arp_chord = seq_vel[ seq_patternchain[seq_chain_active_step][d] ][seq_step];
} }
} }
}
if (seq_track_type[d] == 3) if (seq_track_type[d] == 3)
{ //Arp { //Arp
if (arp_speed == 0 || (arp_speed == 1 && arp_counter == 2) ) {
if (arp_step == 0 ) { if (arp_step == 0 ) {
handleNoteOn(configuration.dexed[seq_chord_dexed_inst].midi_channel, arp_note+ arp_octave * 12 , seq_chord_velocity); handleNoteOn(configuration.dexed[seq_chord_dexed_inst].midi_channel, arp_note + arp_octave * 12 , seq_chord_velocity);
arp_note_prev = arp_note+arp_octave * 12; arp_note_prev = arp_note + arp_octave * 12;
} }
else else
{ { if (arp_style == 0) { //arp up
handleNoteOn(configuration.dexed[seq_chord_dexed_inst].midi_channel, arp_note + seq_chords[arp_chord - 200][arp_step - 1] + arp_octave * 12, seq_chord_velocity); handleNoteOn(configuration.dexed[seq_chord_dexed_inst].midi_channel, arp_note + seq_chords[arp_chord - 200][arp_step - 1] + arp_octave * 12, seq_chord_velocity);
arp_note_prev = arp_note + seq_chords[arp_chord - 200][arp_step - 1] + arp_octave * 12; arp_note_prev = arp_note + seq_chords[arp_chord - 200][arp_step - 1] + arp_octave * 12;
}
else if (arp_style == 3) { //arp random
uint8_t rnd1 = random(4);
uint8_t rnd2 = random(arp_oct_usersetting + 1) * 12;
handleNoteOn(configuration.dexed[seq_chord_dexed_inst].midi_channel, arp_note + seq_chords[arp_chord - 200][rnd1] + rnd2, seq_chord_velocity);
arp_note_prev = arp_note + seq_chords[arp_chord - 200][rnd1] + rnd2;
}
} }
} }
seq_noteoffsent[d] = false;
} }
seq_noteoffsent[d] = false;
}
seq_step++; seq_step++;
if (arp_speed == 0) // Arp Speed 1/16
{
arp_step++; arp_step++;
if (arp_step > 3) { }
arp_step = 0; else
arp_octave++; {
if (arp_octave > 1) arp_octave = 0; if (arp_speed == 1) // Arp Speed 1/8
{
if (arp_counter > 1) {
arp_counter = 0;
arp_step++;
}
arp_counter++;
} }
if (seq_step > 15) { }
if (arp_step > 3 || seq_chords[arp_chord - 200][arp_step] == 0 ) {
arp_step = 0;
seq_step = 0; arp_octave++;
if (seq_chain_lenght > 0) { if (arp_octave > arp_oct_usersetting) arp_octave = 0;
seq_chain_active_step++; }
if (seq_chain_active_step > seq_chain_lenght) if (seq_step > 15) {
{ seq_step = 0;
seq_chain_active_step = 0; if (seq_chain_lenght > 0) {
} seq_chain_active_step++;
if (seq_chain_active_step > seq_chain_lenght)
{
seq_chain_active_step = 0;
} }
} }
} }
if (seq_millis_timer > seq_timer_previous + 80 ) }
{
for (uint8_t d = 0; d < 4; d++)
{
if ( seq_noteoffsent[d] == false) {
if ( seq_prev_note[d] > 0 && seq_track_type[d] > 0) //test instrument sequencer Instance=0
{
handleNoteOff(configuration.dexed[seq_inst_dexed[d]].midi_channel, seq_prev_note[d] , 0);
if (seq_track_type[d] == 2) { //Chords
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);
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_chords[seq_prev_vel[d] - 200][3] , 0);
}
}
else if (seq_track_type[d] == 3)
{ //Arp
handleNoteOff(configuration.dexed[seq_chord_dexed_inst].midi_channel, arp_note_prev, 0);
void sequencer_part2(void)
{
for (uint8_t d = 0; d < 4; d++)
{
if ( seq_noteoffsent[d] == false) {
if ( seq_prev_note[d] > 0 && seq_track_type[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_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);
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_chords[seq_prev_vel[d] - 200][3] , 0);
} }
} }
else if (seq_track_type[d] == 3)
{ //Arp
handleNoteOff(configuration.dexed[seq_chord_dexed_inst].midi_channel, arp_note_prev, 0);
}
} }
seq_noteoffsent[d] = true; seq_noteoffsent[d] = true;
} }
} }
} }
void sequencer(void)
{ // Runs in Interrupt Timer. Switches between the Noteon and Noteoff Task, each cycle
interrupt_swapper = !interrupt_swapper;
if (interrupt_swapper) sequencer_part1();
else sequencer_part2();
}

@ -3,17 +3,16 @@ uint8_t seq_active_track = 0;
uint8_t seq_menu; uint8_t seq_menu;
bool seq_button_r = false; bool seq_button_r = false;
bool seq_noteoffsent[4] = {false, false, false, false}; bool seq_noteoffsent[4] = {false, false, false, false};
elapsedMillis seq_millis_timer;
uint8_t seq_step = 0; uint8_t seq_step = 0;
uint32_t seq_timer_previous = 0;
bool seq_running = false; bool seq_running = false;
bool seq_recording = false; bool seq_recording = false;
uint8_t seq_note_in; uint8_t seq_note_in;
uint8_t seq_note_in_velocity; uint8_t seq_note_in_velocity;
int seq_transpose; int seq_transpose;
uint8_t seq_inst_dexed[4] = { 1, 1, 1, 1 }; uint8_t seq_inst_dexed[4] = { 0, 0, 0, 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 = 50;
uint8_t arp_style = 0; // up, down, up&down, random
uint8_t seq_chords[6][4] = { 4, 7, 12, 0, //major uint8_t seq_chords[6][4] = { 4, 7, 12, 0, //major
3, 7, 12, 0, //minor 3, 7, 12, 0, //minor
4, 7, 10, 12, //seventh 4, 7, 10, 12, //seventh
@ -21,12 +20,26 @@ uint8_t seq_chords[6][4] = { 4, 7, 12, 0, //major
3, 6, 12, 0, //dim 3, 6, 12, 0, //dim
4, 7, 11 , 0 //maj7, 4, 7, 11 , 0 //maj7,
}; };
char seq_chord_names[6][4] = { 'M', 'a', 'j', ' ' , //major
'M', 'i', 'n', ' ' ,
's', 'e', 'v', ' ' ,
'a', 'u', 'g', ' ' ,
'd', 'i', 'm', ' ' ,
'M', 'a', 'j', '7' ,
};
char arp_style_names[4][3] = { 'u', 'p', ' ',
'd', 'w', 'n',
'u', '&', 'd',
'R', 'N', 'D',
};
int seq_tempo_ms = 147; int seq_tempo_ms = 147;
int seq_bpm = 102; 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 = 3; // 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];
@ -36,23 +49,25 @@ uint8_t arp_chord;
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_counter = 0;
uint8_t arp_oct_usersetting = 1;
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 ,
60 , 61 , 62 , 63 , 64 , 65 , 66 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 60 , 61 , 62 , 63 , 64 , 65 , 66 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
55 , 0 , 0 , 0 , 0 , 0 , 52 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , //c1 55 , 0 , 0 , 0 , 0 , 0 , 52 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
57 , 0 , 0 , 0 , 0 , 0 , 53 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , //C2 57 , 0 , 0 , 0 , 0 , 0 , 53 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
74 , 0 , 0 , 72 , 0 , 0 , 74 , 0 , 0 , 0 , 76 , 0 , 0 , 0 , 0 , 0 , 74 , 0 , 0 , 72 , 0 , 0 , 74 , 0 , 0 , 0 , 76 , 0 , 0 , 0 , 0 , 0 ,
74 , 0 , 0 , 72 , 0 , 0 , 71 , 0 , 0 , 0 , 67 , 0 , 0 , 0 , 0 , 0 , 74 , 0 , 0 , 72 , 0 , 0 , 71 , 0 , 0 , 0 , 67 , 0 , 0 , 0 , 0 , 0 ,
69 , 0 , 0 , 76 , 0 , 0 , 69 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 69 , 0 , 0 , 76 , 0 , 0 , 69 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0
}; };
uint8_t seq_vel[10][16] = {120, 0, 0, 0, 120, 0, 0, 0, 120, 0, 0, 0, 120, 0, 0, 0, uint8_t seq_vel[10][16] = {120, 0, 0, 0, 120, 0, 0, 0, 120, 0, 0, 0, 120, 0, 0, 0,
105, 80, 105, 70, 106, 98, 106, 70, 126, 97, 106, 70, 106, 99, 90, 65, 105, 80, 105, 70, 106, 98, 106, 70, 126, 97, 106, 70, 106, 99, 90, 65,
120, 0, 0, 0, 120, 0, 0, 0, 120, 0, 120, 50, 120, 120, 0, 0, 120, 0, 0, 0, 120, 0, 0, 0, 120, 0, 120, 60, 120, 120, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 200,
200, 200, 200, 200, 200, 200, 201, 0, 0, 0, 0, 0, 0, 0, 0, 200, 200, 200, 200, 200, 200, 200, 201, 0, 0, 0, 0, 0, 0, 0, 0, 200,
201, 200, 200, 200, 200, 200, 200, 200, 0, 0, 0, 0, 0, 0, 0, 0, 201, 200, 200, 200, 200, 200, 200, 200, 0, 0, 0, 0, 0, 0, 0, 0,
98, 120, 0, 88, 120, 0, 127, 120, 0, 0, 125, 120, 0, 0, 0, 0, 98, 120, 0, 88, 120, 0, 127, 120, 0, 0, 125, 120, 0, 0, 0, 0,
@ -62,8 +77,8 @@ 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, 2, 2 , 1 , 1 , 1 }; // 0 = track is Drumtrack, 1= Instrumenttrack, 2= Chord, 3= 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, 3, 1 }; // 0 = track is Drumtrack, 1= Instrumenttrack, 2= Chord, 3=Arp, 4=Chord+Arp uint8_t seq_track_type[4] = { 0, 0, 1, 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,

Binary file not shown.
Loading…
Cancel
Save