|
|
|
@ -100,6 +100,7 @@ extern uint8_t arp_oct_usersetting; |
|
|
|
|
extern uint8_t arp_style; |
|
|
|
|
extern uint8_t arp_speed; |
|
|
|
|
extern char arp_style_names[4][3]; |
|
|
|
|
extern char seq_chord_names[7][4]; |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
#ifdef DISPLAY_LCD_SPI |
|
|
|
@ -4243,7 +4244,6 @@ void UI_func_seq_vel_editor(uint8_t param) |
|
|
|
|
else if (seq_vel[seq_active_track][seq_menu - 1] == 203) lcd.print("Aug" ); |
|
|
|
|
else if (seq_vel[seq_active_track][seq_menu - 1] == 204) lcd.print("Dim" ); |
|
|
|
|
else if (seq_vel[seq_active_track][seq_menu - 1] == 205) lcd.print("Mj7" ); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
@ -4301,8 +4301,6 @@ void arp_refresh_display_play_status() |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void UI_func_sequencer(uint8_t param) |
|
|
|
|
{ |
|
|
|
|
if (LCDML.FUNC_setup()) // ****** SETUP *********
|
|
|
|
@ -4786,17 +4784,19 @@ void UI_func_arpeggio(uint8_t param) |
|
|
|
|
if (LCDML.FUNC_setup()) // ****** SETUP *********
|
|
|
|
|
{ |
|
|
|
|
encoderDir[ENC_R].reset(); |
|
|
|
|
seq_temp_active_menu = 0; |
|
|
|
|
seq_temp_select_menu=0; |
|
|
|
|
seq_temp_active_menu=0; |
|
|
|
|
lcd.setCursor( 0, 0); |
|
|
|
|
lcd.print("Oct"); |
|
|
|
|
lcd.setCursor(7, 0); |
|
|
|
|
lcd.print( seq_chord_names[arp_chord][0]); |
|
|
|
|
lcd.print( seq_chord_names[arp_chord][1]); |
|
|
|
|
lcd.print( seq_chord_names[arp_chord][2]); |
|
|
|
|
lcd.print( seq_chord_names[arp_chord][3]); |
|
|
|
|
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 *********
|
|
|
|
@ -4830,6 +4830,7 @@ void UI_func_arpeggio(uint8_t param) |
|
|
|
|
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 ) |
|
|
|
@ -4849,7 +4850,6 @@ void UI_func_arpeggio(uint8_t param) |
|
|
|
|
seq_temp_active_menu = 0; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//else if ( seq_temp_select_menu == 2 && seq_temp_active_menu == 0 )
|
|
|
|
|
else if ( seq_temp_select_menu == 2 ) |
|
|
|
|
{ |
|
|
|
|
|
|
|
|
@ -4880,6 +4880,8 @@ void UI_func_arpeggio(uint8_t param) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
lcd.setCursor( 4, 0); |
|
|
|
|
lcd.print(arp_oct_usersetting); |
|
|
|
|
lcd.setCursor( 6, 1); |
|
|
|
@ -4894,10 +4896,6 @@ void UI_func_arpeggio(uint8_t param) |
|
|
|
|
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); |
|
|
|
@ -4910,6 +4908,11 @@ void UI_func_arpeggio(uint8_t param) |
|
|
|
|
} |
|
|
|
|
else if (seq_temp_select_menu == 1) |
|
|
|
|
{ |
|
|
|
|
|
|
|
|
|
lcd.setCursor( 5, 1); |
|
|
|
|
lcd.print("["); |
|
|
|
|
lcd.setCursor( 9, 1); |
|
|
|
|
lcd.print("]"); |
|
|
|
|
lcd.setCursor( 3, 0); |
|
|
|
|
lcd.print(" "); |
|
|
|
|
lcd.setCursor( 5, 0); |
|
|
|
@ -4918,10 +4921,6 @@ void UI_func_arpeggio(uint8_t param) |
|
|
|
|
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) |
|
|
|
|
{ |
|
|
|
@ -4929,14 +4928,14 @@ void UI_func_arpeggio(uint8_t param) |
|
|
|
|
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("]"); |
|
|
|
|
lcd.setCursor( 10, 1); |
|
|
|
|
lcd.print(" "); |
|
|
|
|
lcd.setCursor( 15, 1); |
|
|
|
|
lcd.print(" "); |
|
|
|
|
} |
|
|
|
|
else if (seq_temp_select_menu == 3) |
|
|
|
|
{ |
|
|
|
@ -4944,15 +4943,16 @@ void UI_func_arpeggio(uint8_t param) |
|
|
|
|
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("]"); |
|
|
|
|
lcd.setCursor( 3, 0); |
|
|
|
|
lcd.print(" "); |
|
|
|
|
lcd.setCursor( 5, 0); |
|
|
|
|
lcd.print(" "); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
if (LCDML.FUNC_close()) // ****** STABLE END *********
|
|
|
|
|
{ |
|
|
|
@ -4965,7 +4965,8 @@ void UI_func_seq_pat_chain(uint8_t param) |
|
|
|
|
if (LCDML.FUNC_setup()) // ****** SETUP *********
|
|
|
|
|
{ |
|
|
|
|
// setup function
|
|
|
|
|
|
|
|
|
|
seq_temp_select_menu = 0; |
|
|
|
|
seq_temp_active_menu = 99; |
|
|
|
|
lcd.setCursor( 12, 0); |
|
|
|
|
lcd.print(seq_chain_active_chainstep + 1); |
|
|
|
|
lcd.setCursor( 13, 0); |
|
|
|
@ -4974,22 +4975,22 @@ void UI_func_seq_pat_chain(uint8_t param) |
|
|
|
|
lcd.print(seq_chain_lenght + 1); |
|
|
|
|
|
|
|
|
|
lcd.setCursor(0 , 0); |
|
|
|
|
if (seq_track_type[0] == 0 ) lcd.print("D"); else lcd.print("I"); |
|
|
|
|
if (seq_track_type[0] == 0 ) lcd.print("D"); else if (seq_track_type[0] == 1 ) lcd.print("I"); else if (seq_track_type[0] == 2 ) lcd.print("C"); else lcd.print("A"); |
|
|
|
|
lcd.setCursor(2 , 0); |
|
|
|
|
lcd.print( seq_patternchain[seq_chain_active_chainstep][0]); |
|
|
|
|
|
|
|
|
|
lcd.setCursor(0 , 1); |
|
|
|
|
if (seq_track_type[1] == 0 )lcd.print("D"); else lcd.print("I"); |
|
|
|
|
if (seq_track_type[1] == 0 ) lcd.print("D"); else if (seq_track_type[1] == 1 ) lcd.print("I"); else if (seq_track_type[1] == 2 ) lcd.print("C"); else lcd.print("A"); |
|
|
|
|
lcd.setCursor(2 , 1); |
|
|
|
|
lcd.print( seq_patternchain[seq_chain_active_chainstep][1]); |
|
|
|
|
|
|
|
|
|
lcd.setCursor(6 , 0); |
|
|
|
|
if (seq_track_type[2] == 0 ) lcd.print("D"); else lcd.print("I"); |
|
|
|
|
if (seq_track_type[2] == 0 ) lcd.print("D"); else if (seq_track_type[2] == 1 ) lcd.print("I"); else if (seq_track_type[2] == 2 ) lcd.print("C"); else lcd.print("A"); |
|
|
|
|
lcd.setCursor(8 , 0); |
|
|
|
|
lcd.print( seq_patternchain[seq_chain_active_chainstep][2]); |
|
|
|
|
|
|
|
|
|
lcd.setCursor(6 , 1); |
|
|
|
|
if (seq_track_type[3] == 0 )lcd.print("D"); else lcd.print("I"); |
|
|
|
|
if (seq_track_type[3] == 0 ) lcd.print("D"); else if (seq_track_type[3] == 1 ) lcd.print("I"); else if (seq_track_type[3] == 2 ) lcd.print("C"); else lcd.print("A"); |
|
|
|
|
lcd.setCursor(8 , 1); |
|
|
|
|
lcd.print( seq_patternchain[seq_chain_active_chainstep][3]); |
|
|
|
|
} |
|
|
|
@ -5021,6 +5022,7 @@ void UI_func_seq_pat_chain(uint8_t param) |
|
|
|
|
seq_patternchain[seq_chain_active_chainstep][seq_temp_active_menu] = constrain(seq_patternchain[seq_chain_active_chainstep][seq_temp_active_menu] - 1, 0, 9); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (seq_temp_select_menu == 0 && seq_temp_active_menu == 99) // Drum 0
|
|
|
|
|
{ |
|
|
|
|
lcd.setCursor(1 , 0); |
|
|
|
|