From af5edbfed9b82ad3bf6ab4a761e9e198ff9aaa68 Mon Sep 17 00:00:00 2001 From: positionhigh Date: Mon, 6 Sep 2021 20:54:54 +0200 Subject: [PATCH] =?UTF-8?q?Dateien=20hochladen=20nach=20=E2=80=9E=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sequencer.h | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/sequencer.h b/sequencer.h index c300cf3..d7cecda 100644 --- a/sequencer.h +++ b/sequencer.h @@ -3,7 +3,13 @@ float drums_volume; uint8_t seq_active_track = 0; uint8_t seq_menu; bool seq_button_r = false; -bool seq_noteoffsent[NUM_SEQ_TRACKS] = {false, false, false, false,false, false}; +#ifdef TEENSY4 +bool seq_noteoffsent[NUM_SEQ_TRACKS] = {false, false, false, false, false, false}; +uint8_t seq_inst_dexed[NUM_SEQ_TRACKS] = { 0, 0, 1, 1 , 1, 1 }; +#else +bool seq_noteoffsent[NUM_SEQ_TRACKS] = {false, false}; +uint8_t seq_inst_dexed[NUM_SEQ_TRACKS] = { 0, 0 }; +#endif uint8_t seq_step = 0; bool seq_running = false; bool seq_recording = false; @@ -14,7 +20,7 @@ char seq_name_temp[FILENAME_LEN]; uint8_t seq_note_in; uint8_t seq_note_in_velocity; int seq_transpose; -uint8_t seq_inst_dexed[NUM_SEQ_TRACKS] = { 0, 0, 1, 1 ,1,1 }; + uint8_t seq_chord_dexed_inst = 0; uint8_t seq_chord_velocity = 60; uint8_t seq_chord_key_ammount = 4; @@ -132,13 +138,20 @@ uint8_t seq_vel[NUM_SEQ_PATTERN][16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 // 124, 120, 0, 115, 0, 0, 126, 120, 0, 120, 127, 120, 0, 0, 0, 0, // 123, 120, 0, 110, 120, 0, 90, 120, 0, 0, 0, 0, 0, 0, 0, 0 // }; +uint8_t seq_content_type[NUM_SEQ_PATTERN] = { 0, 0, 0, 0 , 0, 0, 0 , 0 , 0 , 0 }; // 0 = track is Drumtrack, 1= Instrumenttrack, 2= Chord or Arpeggio +#ifdef TEENSY4 +uint8_t seq_patternchain[4][NUM_SEQ_TRACKS] = { 0 , 2 , 6 , 9 , 99, 99, + 1 , 2 , 5 , 8 , 99, 99, + 0 , 2 , 6 , 9 , 99, 99, + 1 , 2 , 5 , 7 , 99, 99 + }; -uint8_t seq_patternchain[4][NUM_SEQ_TRACKS] = { 0 , 2 , 6 , 9 , 99,99, - 1 , 2 , 5 , 8 , 99,99, - 0 , 2 , 6 , 9 , 99,99, - 1 , 2 , 5 , 7 ,99,99 - - +uint8_t seq_track_type[NUM_SEQ_TRACKS] = { 0, 0, 1, 1, 1, 1 }; // 0 = track is Drumtrack, 1 = Instrumenttrack, 2 = Chord, 3 = Arp +#else +uint8_t seq_patternchain[4][NUM_SEQ_TRACKS] = { 0 , 2 , + 1 , 2 , + 0 , 2 , + 1 , 2 , }; -uint8_t seq_content_type[NUM_SEQ_PATTERN] = { 0, 0, 0, 0 , 0, 0, 0 , 0 , 0 , 0 }; // 0 = track is Drumtrack, 1= Instrumenttrack, 2= Chord or Arpeggio -uint8_t seq_track_type[NUM_SEQ_TRACKS] = { 0, 0, 1, 1, 1,1 }; // 0 = track is Drumtrack, 1 = Instrumenttrack, 2 = Chord, 3 = Arp +uint8_t seq_track_type[NUM_SEQ_TRACKS] = { 0, 0 }; // 0 = track is Drumtrack, 1 = Instrumenttrack, 2 = Chord, 3 = Arp +#endif