diff --git a/UI.hpp b/UI.hpp index 67d1ed3..2c6a962 100644 --- a/UI.hpp +++ b/UI.hpp @@ -4539,9 +4539,9 @@ void UI_func_seq_vel_editor(uint8_t param) if ((LCDML.BT_checkDown() && encoderDir[ENC_R].Down()) || (LCDML.BT_checkUp() && encoderDir[ENC_R].Up())) { if (LCDML.BT_checkDown()) - seq_active_track = constrain(seq_active_track + 1, 0, 9); + seq_active_track = constrain(seq_active_track + 1, 0, NUM_SEQ_PATTERN - 1); else if (LCDML.BT_checkUp()) - seq_active_track = constrain(seq_active_track - 1, 0, 9); + seq_active_track = constrain(seq_active_track - 1, 0, NUM_SEQ_PATTERN - 1); } } if ( seq_data[seq_active_track][seq_menu - 1] > 0 ) @@ -4897,14 +4897,14 @@ void UI_func_seq_pattern_editor(uint8_t param) { if (LCDML.BT_checkDown()) { - temp_int = constrain(temp_int + 1, 0, 9); + temp_int = constrain(temp_int + 1, 0, NUM_SEQ_PATTERN - 1); if (temp_int == seq_active_track)temp_int++; if (temp_int > 9)temp_int = 0; } else if (LCDML.BT_checkUp()) { - temp_int = constrain(temp_int - 1, 0, 9); + temp_int = constrain(temp_int - 1, 0, NUM_SEQ_PATTERN - 1); if (temp_int == seq_active_track)temp_int--; - if (temp_int < 0)temp_int = 9; + if (temp_int < 0)temp_int = NUM_SEQ_PATTERN - 1; } } } else if (seq_active_function == 99) @@ -4941,9 +4941,9 @@ void UI_func_seq_pattern_editor(uint8_t param) if ((LCDML.BT_checkDown() && encoderDir[ENC_R].Down()) || (LCDML.BT_checkUp() && encoderDir[ENC_R].Up())) { if (LCDML.BT_checkDown()) - seq_active_track = constrain(seq_active_track + 1, 0, 9); + seq_active_track = constrain(seq_active_track + 1, 0, NUM_SEQ_PATTERN - 1); else if (LCDML.BT_checkUp()) - seq_active_track = constrain(seq_active_track - 1, 0, 9); + seq_active_track = constrain(seq_active_track - 1, 0, NUM_SEQ_PATTERN - 1); lcd.setCursor(1, 0); 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 "); @@ -5055,7 +5055,6 @@ void UI_func_seq_pattern_editor(uint8_t param) } if ( seq_menu == 1) { - //lcd.setCursor(11, 0); if (seq_running == false && seq_recording == false) { seq_running = true; @@ -5448,6 +5447,9 @@ void UI_func_arpeggio(uint8_t param) seq_running = !seq_running; timer1.stop(); MicroDexed[0]->panic(); +#if NUM_DEXED > 1 + MicroDexed[1]->panic(); +#endif arp_refresh_display_play_status(); seq_step = 0; arp_octave = 0; @@ -5459,7 +5461,6 @@ void UI_func_arpeggio(uint8_t param) arp_refresh_display_play_status(); timer1.start(); } - } else if ( seq_temp_select_menu == 3 && seq_temp_active_menu == 0 ) { diff --git a/addon/Drums/BDTrancy.wav b/addon/Drums/BDTrancy.wav new file mode 100644 index 0000000..43aaf9f Binary files /dev/null and b/addon/Drums/BDTrancy.wav differ diff --git a/addon/Drums/Belltree.wav b/addon/Drums/Belltree.wav new file mode 100644 index 0000000..bd23197 Binary files /dev/null and b/addon/Drums/Belltree.wav differ diff --git a/addon/Drums/Bongo16.wav b/addon/Drums/Bongo16.wav new file mode 100644 index 0000000..e70de61 Binary files /dev/null and b/addon/Drums/Bongo16.wav differ diff --git a/addon/Drums/Bongo27.wav b/addon/Drums/Bongo27.wav new file mode 100644 index 0000000..eaac52c Binary files /dev/null and b/addon/Drums/Bongo27.wav differ diff --git a/addon/Drums/CR78Kick.wav b/addon/Drums/CR78Kick.wav new file mode 100644 index 0000000..1ce1ce2 Binary files /dev/null and b/addon/Drums/CR78Kick.wav differ diff --git a/addon/Drums/CR78Tmb1.wav b/addon/Drums/CR78Tmb1.wav new file mode 100644 index 0000000..683a00d Binary files /dev/null and b/addon/Drums/CR78Tmb1.wav differ diff --git a/addon/Drums/CR78Tmb2.wav b/addon/Drums/CR78Tmb2.wav new file mode 100644 index 0000000..33e9100 Binary files /dev/null and b/addon/Drums/CR78Tmb2.wav differ diff --git a/addon/Drums/Casta.wav b/addon/Drums/Casta.wav new file mode 100644 index 0000000..a4702db Binary files /dev/null and b/addon/Drums/Casta.wav differ diff --git a/addon/Drums/Clap808.wav b/addon/Drums/Clap808.wav new file mode 100644 index 0000000..91ccd28 Binary files /dev/null and b/addon/Drums/Clap808.wav differ diff --git a/addon/Drums/CowBell.wav b/addon/Drums/CowBell.wav new file mode 100644 index 0000000..01f9e59 Binary files /dev/null and b/addon/Drums/CowBell.wav differ diff --git a/addon/Drums/Crash1.wav b/addon/Drums/Crash1.wav new file mode 100644 index 0000000..def38b2 Binary files /dev/null and b/addon/Drums/Crash1.wav differ diff --git a/addon/Drums/DMpop.wav b/addon/Drums/DMpop.wav new file mode 100644 index 0000000..44d6b0f Binary files /dev/null and b/addon/Drums/DMpop.wav differ diff --git a/addon/Drums/Drums.txt b/addon/Drums/Drums.txt new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/addon/Drums/Drums.txt @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/addon/Drums/EXcow.wav b/addon/Drums/EXcow.wav new file mode 100644 index 0000000..b1c5911 Binary files /dev/null and b/addon/Drums/EXcow.wav differ diff --git a/addon/Drums/Electr1.wav b/addon/Drums/Electr1.wav new file mode 100644 index 0000000..31c7520 Binary files /dev/null and b/addon/Drums/Electr1.wav differ diff --git a/addon/Drums/HHo808.wav b/addon/Drums/HHo808.wav new file mode 100644 index 0000000..a3b6736 Binary files /dev/null and b/addon/Drums/HHo808.wav differ diff --git a/addon/Drums/HHopen1.wav b/addon/Drums/HHopen1.wav new file mode 100644 index 0000000..2611373 Binary files /dev/null and b/addon/Drums/HHopen1.wav differ diff --git a/addon/Drums/HR16Snr2.wav b/addon/Drums/HR16Snr2.wav new file mode 100644 index 0000000..c063b28 Binary files /dev/null and b/addon/Drums/HR16Snr2.wav differ diff --git a/addon/Drums/HatC660.wav b/addon/Drums/HatC660.wav new file mode 100644 index 0000000..488a4cc Binary files /dev/null and b/addon/Drums/HatC660.wav differ diff --git a/addon/Drums/HhCL1-808.wav b/addon/Drums/HhCL1-808.wav new file mode 100644 index 0000000..593a4f9 Binary files /dev/null and b/addon/Drums/HhCL1-808.wav differ diff --git a/addon/Drums/HiSticks.wav b/addon/Drums/HiSticks.wav new file mode 100644 index 0000000..89930a3 Binary files /dev/null and b/addon/Drums/HiSticks.wav differ diff --git a/addon/Drums/I_ARR1.wav b/addon/Drums/I_ARR1.wav new file mode 100644 index 0000000..c74f48e Binary files /dev/null and b/addon/Drums/I_ARR1.wav differ diff --git a/addon/Drums/I_CALLIOP.wav b/addon/Drums/I_CALLIOP.wav new file mode 100644 index 0000000..e6db29d Binary files /dev/null and b/addon/Drums/I_CALLIOP.wav differ diff --git a/addon/Drums/I_FVoicG2.wav b/addon/Drums/I_FVoicG2.wav new file mode 100644 index 0000000..968c240 Binary files /dev/null and b/addon/Drums/I_FVoicG2.wav differ diff --git a/addon/Drums/I_SQBass.wav b/addon/Drums/I_SQBass.wav new file mode 100644 index 0000000..1131371 Binary files /dev/null and b/addon/Drums/I_SQBass.wav differ diff --git a/addon/Drums/Kick808.wav b/addon/Drums/Kick808.wav new file mode 100644 index 0000000..7a068b1 Binary files /dev/null and b/addon/Drums/Kick808.wav differ diff --git a/addon/Drums/LnClap.wav b/addon/Drums/LnClap.wav new file mode 100644 index 0000000..14e9ecd Binary files /dev/null and b/addon/Drums/LnClap.wav differ diff --git a/addon/Drums/LnSnare1.wav b/addon/Drums/LnSnare1.wav new file mode 100644 index 0000000..565e55c Binary files /dev/null and b/addon/Drums/LnSnare1.wav differ diff --git a/addon/Drums/LongGuiro.wav b/addon/Drums/LongGuiro.wav new file mode 100644 index 0000000..6ddbbb1 Binary files /dev/null and b/addon/Drums/LongGuiro.wav differ diff --git a/addon/Drums/M1-18.wav b/addon/Drums/M1-18.wav new file mode 100644 index 0000000..7f26585 Binary files /dev/null and b/addon/Drums/M1-18.wav differ diff --git a/addon/Drums/MD16_CLP.wav b/addon/Drums/MD16_CLP.wav new file mode 100644 index 0000000..9836cdd Binary files /dev/null and b/addon/Drums/MD16_CLP.wav differ diff --git a/addon/Drums/OHH808.wav b/addon/Drums/OHH808.wav new file mode 100644 index 0000000..2c096bc Binary files /dev/null and b/addon/Drums/OHH808.wav differ diff --git a/addon/Drums/OHH909.wav b/addon/Drums/OHH909.wav new file mode 100644 index 0000000..4fa7687 Binary files /dev/null and b/addon/Drums/OHH909.wav differ diff --git a/addon/Drums/Quijada.wav b/addon/Drums/Quijada.wav new file mode 100644 index 0000000..6c203b2 Binary files /dev/null and b/addon/Drums/Quijada.wav differ diff --git a/addon/Drums/R8Darbuka1.wav b/addon/Drums/R8Darbuka1.wav new file mode 100644 index 0000000..d6c2806 Binary files /dev/null and b/addon/Drums/R8Darbuka1.wav differ diff --git a/addon/Drums/R8Tabla1.wav b/addon/Drums/R8Tabla1.wav new file mode 100644 index 0000000..7d8b439 Binary files /dev/null and b/addon/Drums/R8Tabla1.wav differ diff --git a/addon/Drums/Ride808.wav b/addon/Drums/Ride808.wav new file mode 100644 index 0000000..d57aadd Binary files /dev/null and b/addon/Drums/Ride808.wav differ diff --git a/addon/Drums/Rim808.wav b/addon/Drums/Rim808.wav new file mode 100644 index 0000000..1dda19c Binary files /dev/null and b/addon/Drums/Rim808.wav differ diff --git a/addon/Drums/S_china1_4.wav b/addon/Drums/S_china1_4.wav new file mode 100644 index 0000000..fd10adb Binary files /dev/null and b/addon/Drums/S_china1_4.wav differ diff --git a/addon/Drums/S_china2_1.wav b/addon/Drums/S_china2_1.wav new file mode 100644 index 0000000..2f7a734 Binary files /dev/null and b/addon/Drums/S_china2_1.wav differ diff --git a/addon/Drums/S_cowbell_2.wav b/addon/Drums/S_cowbell_2.wav new file mode 100644 index 0000000..c62a08e Binary files /dev/null and b/addon/Drums/S_cowbell_2.wav differ diff --git a/addon/Drums/S_crash1_1.wav b/addon/Drums/S_crash1_1.wav new file mode 100644 index 0000000..1426f17 Binary files /dev/null and b/addon/Drums/S_crash1_1.wav differ diff --git a/addon/Drums/S_hhClosed_1.wav b/addon/Drums/S_hhClosed_1.wav new file mode 100644 index 0000000..940fff3 Binary files /dev/null and b/addon/Drums/S_hhClosed_1.wav differ diff --git a/addon/Drums/S_hh_o_1_2.wav b/addon/Drums/S_hh_o_1_2.wav new file mode 100644 index 0000000..f51dbb5 Binary files /dev/null and b/addon/Drums/S_hh_o_1_2.wav differ diff --git a/addon/Drums/S_hh_o_5_4.wav b/addon/Drums/S_hh_o_5_4.wav new file mode 100644 index 0000000..eda4b5b Binary files /dev/null and b/addon/Drums/S_hh_o_5_4.wav differ diff --git a/addon/Drums/S_hiTom_5.wav b/addon/Drums/S_hiTom_5.wav new file mode 100644 index 0000000..da902cd Binary files /dev/null and b/addon/Drums/S_hiTom_5.wav differ diff --git a/addon/Drums/S_kick2_8.wav b/addon/Drums/S_kick2_8.wav new file mode 100644 index 0000000..33ad534 Binary files /dev/null and b/addon/Drums/S_kick2_8.wav differ diff --git a/addon/Drums/S_kick_1.wav b/addon/Drums/S_kick_1.wav new file mode 100644 index 0000000..f4c74a3 Binary files /dev/null and b/addon/Drums/S_kick_1.wav differ diff --git a/addon/Drums/S_loTom_1.wav b/addon/Drums/S_loTom_1.wav new file mode 100644 index 0000000..af6b59e Binary files /dev/null and b/addon/Drums/S_loTom_1.wav differ diff --git a/addon/Drums/S_ride1Bell_1.wav b/addon/Drums/S_ride1Bell_1.wav new file mode 100644 index 0000000..2812023 Binary files /dev/null and b/addon/Drums/S_ride1Bell_1.wav differ diff --git a/addon/Drums/S_ride1_1.wav b/addon/Drums/S_ride1_1.wav new file mode 100644 index 0000000..6bae9af Binary files /dev/null and b/addon/Drums/S_ride1_1.wav differ diff --git a/addon/Drums/S_ride2Crash_2.wav b/addon/Drums/S_ride2Crash_2.wav new file mode 100644 index 0000000..2aca130 Binary files /dev/null and b/addon/Drums/S_ride2Crash_2.wav differ diff --git a/addon/Drums/S_ride2_1.wav b/addon/Drums/S_ride2_1.wav new file mode 100644 index 0000000..a8075cc Binary files /dev/null and b/addon/Drums/S_ride2_1.wav differ diff --git a/addon/Drums/S_snare2_8.wav b/addon/Drums/S_snare2_8.wav new file mode 100644 index 0000000..b4a239e Binary files /dev/null and b/addon/Drums/S_snare2_8.wav differ diff --git a/addon/Drums/S_snare2_Ghost_1.wav b/addon/Drums/S_snare2_Ghost_1.wav new file mode 100644 index 0000000..494735d Binary files /dev/null and b/addon/Drums/S_snare2_Ghost_1.wav differ diff --git a/addon/Drums/S_snareStick_1.wav b/addon/Drums/S_snareStick_1.wav new file mode 100644 index 0000000..e4ae483 Binary files /dev/null and b/addon/Drums/S_snareStick_1.wav differ diff --git a/addon/Drums/S_snare_2.wav b/addon/Drums/S_snare_2.wav new file mode 100644 index 0000000..caa71e7 Binary files /dev/null and b/addon/Drums/S_snare_2.wav differ diff --git a/addon/Drums/S_snare_Ghost_1.wav b/addon/Drums/S_snare_Ghost_1.wav new file mode 100644 index 0000000..5503532 Binary files /dev/null and b/addon/Drums/S_snare_Ghost_1.wav differ diff --git a/addon/Drums/S_splash1_1.wav b/addon/Drums/S_splash1_1.wav new file mode 100644 index 0000000..eba201d Binary files /dev/null and b/addon/Drums/S_splash1_1.wav differ diff --git a/addon/Drums/Shaker.wav b/addon/Drums/Shaker.wav new file mode 100644 index 0000000..9490efb Binary files /dev/null and b/addon/Drums/Shaker.wav differ diff --git a/addon/Drums/Tamb.wav b/addon/Drums/Tamb.wav new file mode 100644 index 0000000..f34b447 Binary files /dev/null and b/addon/Drums/Tamb.wav differ diff --git a/addon/Drums/Tick1.wav b/addon/Drums/Tick1.wav new file mode 100644 index 0000000..91f1984 Binary files /dev/null and b/addon/Drums/Tick1.wav differ diff --git a/addon/Drums/Tom808.wav b/addon/Drums/Tom808.wav new file mode 100644 index 0000000..42b585e Binary files /dev/null and b/addon/Drums/Tom808.wav differ diff --git a/addon/Drums/TomLow.wav b/addon/Drums/TomLow.wav new file mode 100644 index 0000000..ca0f4f4 Binary files /dev/null and b/addon/Drums/TomLow.wav differ diff --git a/addon/Drums/XRHiTom.wav b/addon/Drums/XRHiTom.wav new file mode 100644 index 0000000..ccbb5c4 Binary files /dev/null and b/addon/Drums/XRHiTom.wav differ diff --git a/addon/Drums/drumset.cfg b/addon/Drums/drumset.cfg new file mode 100644 index 0000000..08e10da --- /dev/null +++ b/addon/Drums/drumset.cfg @@ -0,0 +1,69 @@ +# class, midinote, name, shortname, pitch, pan, vol_max, vol_min, reverb_send, filename +DRUM_HIHAT, 210, SQBass, B, 0.0, 0.0, 0.8, 0.0, 0.0, I_SQBass.wav +DRUM_MIDTOM, 211, CALLIOP, B, 0.0, 0.0, 0.8, 0.0, 0.0, I_CALLIOP.wav +DRUM_CRASH, 212, CALLIOP, B, 0.0, 0.0, 0.8, 0.0, 0.0, I_CALLIOP.wav +DRUM_RIDE, 213, ARR1, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_I_ARR1.wav +DRUM_BASS, 214, FVoice, B, 0.0, 0.0, 0.8, 0.0, 0.0, I_FVoicG2.wav +DRUM_BASS, MIDI_A2, Clap808, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_kick_1.wav +DRUM_BASS, MIDI_B2, S_kick_1, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_kick_1.wav +DRUM_BASS, MIDI_C3, S_kick2_8, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_kick2_8.wav +DRUM_PERCUSSION, MIDI_CIS3, S_Stick_1, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_snareStick_1.wav +DRUM_SNARE, MIDI_D3, S_snare_Ghost_1, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_snare_Ghost_1.wav +DRUM_SNARE, MIDI_DIS3, S_snare2_Ghost_1, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_snare2_Ghost_1.wav +DRUM_SNARE, MIDI_E3, S_snare_2, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_snare_2.wav +DRUM_BASS, MIDI_F3, S_loTom_1, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_loTom_1.wav +DRUM_BASS, MIDI_FIS3, S_hhClosed_1, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_hhClosed_1.wav +DRUM_LOWTOM, MIDI_G3, S_loTom_1, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_loTom_1.wav +DRUM_BASS, MIDI_GIS3, S_hh_o_1_2, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_hh_o_1_2.wav +DRUM_HIGHTOM, MIDI_A3, S_hiTom_5, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_hiTom_5.wav +DRUM_BASS, MIDI_AIS3, S_hh_o_5_4 , B, 0.0, 0.0, 0.8, 0.0, 0.0, S_hh_o_5_4.wav +DRUM_HIGHTOM, MIDI_B3, S_hiTom_5, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_hiTom_5.wav +DRUM_HIGHTOM, MIDI_C4, S_hiTom_5, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_hiTom_5.wav +DRUM_BASS, MIDI_CIS4, S_splash1_1, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_splash1_1.wav +DRUM_HIGHTOM, MIDI_D4, S_hiTom_5, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_hiTom_5.wav +DRUM_CRASH, MIDI_DIS4, S_china1_4, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_china1_4.wav +DRUM_CRASH, MIDI_E4, S_china2_1, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_china2_1.wav +DRUM_RIDE, MIDI_F4, S_ride1Bell_1, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_ride1Bell_1.wav +DRUM_RIDE, MIDI_FIS4, S_ride1Bell_1, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_ride1Bell_1.wav +DRUM_CRASH, MIDI_G4, S_crash1_1, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_crash1_1.wav +DRUM_BASS, MIDI_GIS4, S_cowbell_2, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_cowbell_2.wav +DRUM_RIDE, MIDI_A4, S_ride2Crash_2, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_ride2Crash_2.wav +DRUM_RIDE, MIDI_AIS4, S_ride2_1, B, 0.0, 0.0, 0.8, 0.0, 0.0, S_ride2_1.wav +DRUM_BASS, MIDI_B4, 808Kick, B, 0.0, 0.0, 0.8, 0.0, 0.0, Kick808.wav +DRUM_BASS, MIDI_C5, phkick1, B, 0.0, 0.0, 1.0, 0.0, 0.0, phKick1.wav +DRUM_SNARE, MIDI_CIS5, rims1, R, 0.0, -0.2, 0.7, 0.0, 0.0, Rim808.wav +DRUM_SNARE, MIDI_D5, Shaker, R, 0.0, -0.2, 0.5, 0.0, 0.0, Shaker.wav +DRUM_HANDCLAP, MIDI_DIS5, LNclap1, C, 0.0, 0.1, 0.9, 0.0, 0.1, LnClap.wav +DRUM_SNARE, MIDI_E5, LNsnare1, S, 0.0, 0.0, 0.9, 0.0, 0.0, LnSnare1.wav +DRUM_BASS, MIDI_F5, Bdtrancy, B, 0.0, 0.0, 0.9, 0.0, 0.0, BDTrancy.wav +DRUM_HIHAT, MIDI_FIS5, hhcl1, H, 0.0, 1.0, 0.6, 0.0, 0.0, HhCL1-808.wav +DRUM_BASS, MIDI_G5, Belltree, B, 0.0, 0.0, 0.7, 0.0, 0.0, Belltree.wav +DRUM_BASS, MIDI_GIS5, Bongo16, B, 0.0, 0.0, 0.9, 0.0, 0.0, Bongo16.wav +DRUM_BASS, MIDI_A5, Bongo27, B, 0.0, 0.0, 0.9, 0.0, 0.0, Bongo27.wav +DRUM_BASS, MIDI_AIS5, Casta, B, 0.0, 0.0, 0.9, 0.0, 0.0, Casta.wav +DRUM_BASS, MIDI_B5, Cr78kick, B, 0.0, 0.0, 1.0, 0.0, 0.0, CR78Kick.wav +DRUM_HIHAT, MIDI_C6, Cr78tmb1, B, 0.0, 0.0, 0.8, 0.0, 0.0, CR78Tmb1.wav +DRUM_HIHAT, MIDI_CIS6, Cr78tmb2, B, 0.0, 0.0, 0.8, 0.0, 0.0, CR78Tmb2.wav +DRUM_BASS, MIDI_D6, Crash1, B, 0.0, 0.0, 0.9, 0.0, 0.0, Crash1.wav +DRUM_BASS, MIDI_DIS6, Dmpop, B, 0.0, 0.0, 0.9, 0.0, 0.0, DMpop.wav +DRUM_BASS, MIDI_E6, Electr1, B, 0.0, 0.0, 0.9, 0.0, 0.0, Electr1.wav +DRUM_BASS, MIDI_F6, Excow, B, 0.0, 0.0, 0.9, 0.0, 0.0, EXcow.wav +DRUM_PERCUSSION, MIDI_FIS6, Tamb, T, 0.0, -0.2, 0.6, 0.0, 0.0, Tamb.wav +DRUM_PERCUSSION, MIDI_GIS6, Cowbell, S, 0.0, 0.2, 0.6, 0.0, 0.0, CowBell.wav +DRUM_HIHAT, MIDI_G6, 660HatC1, T, 0.0, 0.0, 0.6, 0.0, 0.0, HatC660.wav +DRUM_HIHAT, MIDI_A6, Hhopen1, S, 0.0, 0.0, 0.6, 0.0, 0.0, HHopen1.wav +DRUM_PERCUSSION, MIDI_AIS6, Histicks, S, 0.0, 0.0, 0.6, 0.0, 0.0, HiSticks.wav +DRUM_PERCUSSION, MIDI_B6, Hr16snr2, S, 0.0, 0.0, 0.6, 0.0, 0.0, HR16Snr2.wav +DRUM_HIGHTOM, MIDI_C7, Xrhitom, B, 0.0, 0.0, 0.8, 0.0, 0.0, XRHiTom.wav +DRUM_PERCUSSION, MIDI_CIS7, Tick1, S, 0.0, 0.0, 0.9, 0.0, 0.0, Tick1.wav +DRUM_PERCUSSION, MIDI_D7, M1-18, S, 0.0, 0.0, 0.9, 0.0, 0.0, M1-18.wav +DRUM_PERCUSSION, MIDI_DIS7, Md16_clp, S, 0.0, 0.0, 0.9, 0.0, 0.0, MD16_CLP.wav +DRUM_HIHAT, MIDI_E7, Ohhwav, S, 0.0, 0.0, 0.9, 0.0, 0.0, OHH909.wav +DRUM_PERCUSSION, MIDI_F7, Quijada, S, 0.0, 0.0, 0.9, 0.0, 0.0, Quijada.wav +DRUM_PERCUSSION, MIDI_FIS7, tabla1, S, 0.0, 0.0, 0.9, 0.0, 0.0, R8Tabla1.wav +DRUM_PERCUSSION, MIDI_G7, Ride808, S, 0.0, 0.0, 0.9, 0.0, 0.0, Ride808.wav +DRUM_PERCUSSION, MIDI_GIS7, Scratch1, S, 0.0, 0.0, 0.7, 0.0, 0.0, scratch1.wav +DRUM_PERCUSSION, MIDI_A7, Tomlow, S, 0.0, 0.0, 0.9, 0.0, 0.0, TomLow.wav +DRUM_PERCUSSION, MIDI_AIS7, Tom808, S, 0.0, 0.0, 0.9, 0.0, 0.0, Tom808.wav +DRUM_BASS, MIDI_B7, Vl1lbeep, B, 0.0, 0.0, 0.8, 0.0, 0.0, vl1-Lbeep.wav +DRUM_BASS, MIDI_C8, Vl1hbeep, B, 0.0, 0.0, 0.8, 0.0, 0.0, vl1-Hbeep.wav \ No newline at end of file diff --git a/addon/Drums/phKick1.wav b/addon/Drums/phKick1.wav new file mode 100644 index 0000000..ec8cff8 Binary files /dev/null and b/addon/Drums/phKick1.wav differ diff --git a/addon/Drums/scratch1.wav b/addon/Drums/scratch1.wav new file mode 100644 index 0000000..7f18485 Binary files /dev/null and b/addon/Drums/scratch1.wav differ diff --git a/addon/Drums/vl1-Hbeep.wav b/addon/Drums/vl1-Hbeep.wav new file mode 100644 index 0000000..aebaea3 Binary files /dev/null and b/addon/Drums/vl1-Hbeep.wav differ diff --git a/addon/Drums/vl1-Lbeep.wav b/addon/Drums/vl1-Lbeep.wav new file mode 100644 index 0000000..014dde3 Binary files /dev/null and b/addon/Drums/vl1-Lbeep.wav differ diff --git a/addon/SD/SEQ/0-S.json b/addon/SD/SEQ/0-S.json index 7e65549..00cf4d3 100644 --- a/addon/SD/SEQ/0-S.json +++ b/addon/SD/SEQ/0-S.json @@ -1,328 +1,4 @@ { - "seq_data": [ - 72, - 0, - 0, - 73, - 72, - 0, - 0, - 0, - 72, - 0, - 74, - 74, - 72, - 0, - 0, - 0, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 72, - 87, - 87, - 92, - 72, - 90, - 90, - 90, - 72, - 0, - 0, - 75, - 72, - 95, - 95, - 95, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 77, - 77, - 77, - 77, - 77, - 77, - 77, - 77, - 77, - 77, - 77, - 77, - 77, - 77, - 0, - 0, - 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, - 74, - 0, - 0, - 72, - 0, - 0, - 74, - 0, - 0, - 0, - 76, - 130, - 130, - 130, - 130, - 0, - 74, - 0, - 0, - 72, - 0, - 0, - 71, - 0, - 0, - 0, - 67, - 130, - 0, - 0, - 0, - 0, - 69, - 0, - 0, - 76, - 0, - 0, - 69, - 130, - 130, - 130, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "seq_velocity": [ - 120, - 120, - 120, - 120, - 120, - 0, - 0, - 0, - 120, - 0, - 120, - 120, - 120, - 0, - 0, - 0, - 105, - 80, - 105, - 70, - 106, - 98, - 106, - 70, - 126, - 97, - 106, - 70, - 106, - 99, - 90, - 65, - 120, - 120, - 120, - 120, - 120, - 86, - 106, - 99, - 120, - 0, - 120, - 72, - 120, - 79, - 95, - 109, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 10, - 30, - 50, - 70, - 90, - 100, - 127, - 100, - 60, - 40, - 30, - 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, - 98, - 120, - 0, - 88, - 120, - 0, - 127, - 120, - 0, - 0, - 125, - 120, - 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 - ], "seq_patternchain": [ 0, 1, diff --git a/addon/SD/SEQ/0-d.json b/addon/SD/SEQ/0-d.json index 4a49d7b..1961a7d 100644 --- a/addon/SD/SEQ/0-d.json +++ b/addon/SD/SEQ/0-d.json @@ -245,13 +245,13 @@ 0.56, 1, 1, - 0.9, - 0.68, - 0.7, + 1, + 0.79, + 0.73, 1, 0.9, 0.9, - 0.8, + 0.87, 1, 1, 0.9, @@ -260,15 +260,15 @@ 0.9, 0.8, 0.8, - 0.75, + 0.77, 0.8, 0.8, 0.85, 1, - 0.72, + 0.78, 0.9, 0.9, - 0.82, + 0.94, 0.9, 0.9, 0.9, diff --git a/addon/SD/SEQ/0-pat.json b/addon/SD/SEQ/0-pat.json new file mode 100644 index 0000000..127f049 --- /dev/null +++ b/addon/SD/SEQ/0-pat.json @@ -0,0 +1,164 @@ +{ + "seq_data": [ + 72, + 0, + 0, + 73, + 72, + 0, + 0, + 0, + 72, + 0, + 74, + 74, + 72, + 0, + 0, + 0, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 72, + 87, + 87, + 92, + 72, + 90, + 90, + 90, + 72, + 0, + 0, + 75, + 72, + 95, + 95, + 95, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 77, + 77, + 77, + 77, + 77, + 77, + 77, + 77, + 77, + 77, + 77, + 77, + 77, + 77, + 0, + 0, + 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, + 74, + 0, + 0, + 72, + 0, + 0, + 74, + 0, + 0, + 0, + 76, + 130, + 130, + 130, + 130, + 0, + 74, + 0, + 0, + 72, + 0, + 0, + 71, + 0, + 0, + 0, + 67, + 130, + 0, + 0, + 0, + 0, + 69, + 0, + 0, + 76, + 0, + 0, + 69, + 130, + 130, + 130, + 0, + 0, + 0, + 0, + 0, + 0 + ] +} \ No newline at end of file diff --git a/addon/SD/SEQ/0-vel.json b/addon/SD/SEQ/0-vel.json new file mode 100644 index 0000000..8e6910b --- /dev/null +++ b/addon/SD/SEQ/0-vel.json @@ -0,0 +1,164 @@ +{ + "seq_velocity": [ + 120, + 120, + 120, + 120, + 120, + 0, + 0, + 0, + 120, + 0, + 120, + 120, + 120, + 0, + 0, + 0, + 105, + 80, + 105, + 70, + 106, + 98, + 106, + 70, + 126, + 97, + 106, + 70, + 106, + 99, + 90, + 65, + 120, + 120, + 120, + 120, + 120, + 86, + 106, + 99, + 120, + 0, + 120, + 72, + 120, + 79, + 95, + 109, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 10, + 30, + 50, + 70, + 90, + 100, + 127, + 100, + 60, + 40, + 30, + 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, + 98, + 120, + 0, + 88, + 120, + 0, + 127, + 120, + 0, + 0, + 125, + 120, + 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 + ] +} \ No newline at end of file diff --git a/addon/SD/SEQ/1-S.json b/addon/SD/SEQ/1-S.json index ef9e01a..0b48ded 100644 --- a/addon/SD/SEQ/1-S.json +++ b/addon/SD/SEQ/1-S.json @@ -1,328 +1,4 @@ { - "seq_data": [ - 72, - 0, - 0, - 92, - 72, - 0, - 0, - 0, - 72, - 90, - 90, - 90, - 72, - 0, - 0, - 0, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 72, - 0, - 0, - 92, - 72, - 90, - 90, - 90, - 72, - 0, - 0, - 75, - 72, - 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, - 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, - 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 - ], - "seq_velocity": [ - 120, - 0, - 0, - 120, - 120, - 0, - 0, - 0, - 120, - 90, - 100, - 84, - 120, - 0, - 0, - 0, - 105, - 80, - 105, - 70, - 106, - 98, - 106, - 70, - 126, - 97, - 106, - 70, - 106, - 99, - 90, - 65, - 120, - 0, - 0, - 120, - 120, - 83, - 106, - 79, - 120, - 0, - 120, - 91, - 120, - 120, - 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, - 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, - 98, - 120, - 0, - 88, - 120, - 0, - 127, - 120, - 0, - 0, - 125, - 120, - 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 - ], "seq_patternchain": [ 0, 1, diff --git a/addon/SD/SEQ/1-d.json b/addon/SD/SEQ/1-d.json index e57d377..36bf515 100644 --- a/addon/SD/SEQ/1-d.json +++ b/addon/SD/SEQ/1-d.json @@ -174,7 +174,7 @@ -0.191919, 0, 0, - 0.272727, + 0.010101, 0.212121, 0, 0, @@ -192,16 +192,16 @@ -0.242424, 0, 0, + -0.505051, 0, + 0.30303, 0, 0, 0, 0, - 0, - 0, - 0, - 0, - 0, + -0.444444, + 0.383838, + -0.383838, 0, 0, 0, @@ -245,14 +245,14 @@ 0.93, 0.95, 0, - 0.77, + 1, 0.79, 0.6, - 0.77, - 0, + 0.95, 0, - 0.62, 0, + 0.76, + 0.19, 0, 0.38, 0, @@ -263,16 +263,16 @@ 0.76, 0, 0, - 0.63, - 0, - 0.71, - 0, - 0, + 0.89, + 0.02, + 0.86, 0, 0, 0, 0, + 0.09, 0, + 0.42, 0, 0, 0, diff --git a/addon/SD/SEQ/1-pat.json b/addon/SD/SEQ/1-pat.json new file mode 100644 index 0000000..6a710d5 --- /dev/null +++ b/addon/SD/SEQ/1-pat.json @@ -0,0 +1,164 @@ +{ + "seq_data": [ + 72, + 0, + 0, + 92, + 72, + 0, + 0, + 0, + 72, + 90, + 90, + 90, + 72, + 0, + 0, + 0, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 72, + 0, + 0, + 92, + 72, + 90, + 90, + 90, + 72, + 0, + 0, + 75, + 72, + 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, + 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, + 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 + ] +} \ No newline at end of file diff --git a/addon/SD/SEQ/1-vel.json b/addon/SD/SEQ/1-vel.json new file mode 100644 index 0000000..9769bd4 --- /dev/null +++ b/addon/SD/SEQ/1-vel.json @@ -0,0 +1,164 @@ +{ + "seq_velocity": [ + 120, + 0, + 0, + 120, + 120, + 0, + 0, + 0, + 120, + 90, + 100, + 84, + 120, + 0, + 0, + 0, + 105, + 80, + 105, + 70, + 106, + 98, + 106, + 70, + 126, + 97, + 106, + 70, + 106, + 99, + 90, + 65, + 120, + 0, + 0, + 120, + 120, + 83, + 106, + 79, + 120, + 0, + 120, + 91, + 120, + 120, + 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, + 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, + 98, + 120, + 0, + 88, + 120, + 0, + 127, + 120, + 0, + 0, + 125, + 120, + 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 + ] +} \ No newline at end of file diff --git a/addon/SD/SEQ/2-S.json b/addon/SD/SEQ/2-S.json index 6b0c413..f49e63a 100644 --- a/addon/SD/SEQ/2-S.json +++ b/addon/SD/SEQ/2-S.json @@ -1,328 +1,4 @@ { - "seq_data": [ - 72, - 0, - 76, - 0, - 72, - 72, - 76, - 0, - 72, - 0, - 76, - 0, - 72, - 72, - 76, - 0, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 72, - 0, - 76, - 0, - 72, - 72, - 76, - 0, - 72, - 0, - 76, - 0, - 72, - 75, - 76, - 75, - 50, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 55, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 52, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 57, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 38, - 0, - 0, - 48, - 0, - 0, - 45, - 0, - 74, - 71, - 0, - 69, - 0, - 0, - 67, - 0, - 74, - 71, - 0, - 69, - 0, - 0, - 67, - 69, - 69, - 0, - 0, - 0, - 69, - 0, - 0, - 67, - 69, - 71, - 0, - 64, - 0, - 0, - 67, - 0 - ], - "seq_velocity": [ - 108, - 0, - 127, - 120, - 98, - 114, - 125, - 120, - 108, - 0, - 127, - 0, - 90, - 106, - 115, - 120, - 127, - 127, - 124, - 116, - 124, - 127, - 125, - 120, - 125, - 127, - 123, - 124, - 125, - 127, - 123, - 100, - 109, - 0, - 127, - 120, - 92, - 103, - 125, - 120, - 103, - 0, - 126, - 0, - 106, - 119, - 127, - 119, - 200, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 200, - 200, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 200, - 201, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 200, - 201, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 120, - 0, - 0, - 120, - 0, - 0, - 120, - 0, - 107, - 126, - 0, - 124, - 0, - 0, - 123, - 0, - 96, - 127, - 0, - 110, - 0, - 0, - 115, - 120, - 127, - 0, - 0, - 0, - 127, - 0, - 0, - 113, - 125, - 125, - 0, - 105, - 0, - 0, - 125, - 0 - ], "seq_patternchain": [ 0, 1, diff --git a/addon/SD/SEQ/2-pat.json b/addon/SD/SEQ/2-pat.json new file mode 100644 index 0000000..6f8db5c --- /dev/null +++ b/addon/SD/SEQ/2-pat.json @@ -0,0 +1,164 @@ +{ + "seq_data": [ + 72, + 0, + 76, + 0, + 72, + 72, + 76, + 0, + 72, + 0, + 76, + 0, + 72, + 72, + 76, + 0, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 72, + 0, + 76, + 0, + 72, + 72, + 76, + 0, + 72, + 0, + 76, + 0, + 72, + 75, + 76, + 75, + 50, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 55, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 52, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 57, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 38, + 0, + 0, + 48, + 0, + 0, + 45, + 0, + 74, + 71, + 0, + 69, + 0, + 0, + 67, + 0, + 74, + 71, + 0, + 69, + 0, + 0, + 67, + 69, + 69, + 0, + 0, + 0, + 69, + 0, + 0, + 67, + 69, + 71, + 0, + 64, + 0, + 0, + 67, + 0 + ] +} \ No newline at end of file diff --git a/addon/SD/SEQ/2-vel.json b/addon/SD/SEQ/2-vel.json new file mode 100644 index 0000000..9a0c557 --- /dev/null +++ b/addon/SD/SEQ/2-vel.json @@ -0,0 +1,164 @@ +{ + "seq_velocity": [ + 108, + 0, + 127, + 120, + 98, + 114, + 125, + 120, + 108, + 0, + 127, + 0, + 90, + 106, + 115, + 120, + 127, + 127, + 124, + 116, + 124, + 127, + 125, + 120, + 125, + 127, + 123, + 124, + 125, + 127, + 123, + 100, + 109, + 0, + 127, + 120, + 92, + 103, + 125, + 120, + 103, + 0, + 126, + 0, + 106, + 119, + 127, + 119, + 200, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 200, + 200, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 200, + 201, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 200, + 201, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 120, + 0, + 0, + 120, + 0, + 0, + 120, + 0, + 107, + 126, + 0, + 124, + 0, + 0, + 123, + 0, + 96, + 127, + 0, + 110, + 0, + 0, + 115, + 120, + 127, + 0, + 0, + 0, + 127, + 0, + 0, + 113, + 125, + 125, + 0, + 105, + 0, + 0, + 125, + 0 + ] +} \ No newline at end of file diff --git a/addon/SD/SEQ/3-S.json b/addon/SD/SEQ/3-S.json index d72c269..8c223fd 100644 --- a/addon/SD/SEQ/3-S.json +++ b/addon/SD/SEQ/3-S.json @@ -1,328 +1,4 @@ { - "seq_data": [ - 72, - 72, - 0, - 72, - 78, - 0, - 0, - 72, - 0, - 0, - 72, - 0, - 78, - 0, - 78, - 78, - 78, - 78, - 78, - 78, - 45, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 45, - 78, - 0, - 0, - 78, - 78, - 78, - 78, - 45, - 78, - 78, - 78, - 78, - 78, - 78, - 78, - 45, - 78, - 45, - 45, - 73, - 0, - 0, - 73, - 0, - 0, - 73, - 0, - 0, - 0, - 73, - 73, - 73, - 0, - 0, - 0, - 73, - 0, - 0, - 73, - 0, - 0, - 73, - 0, - 0, - 0, - 73, - 0, - 0, - 73, - 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, - 0, - 0, - 40, - 40, - 0, - 40, - 0, - 0, - 40, - 43, - 0, - 43, - 0, - 43, - 45, - 47, - 0, - 40, - 0, - 0, - 0, - 40, - 0, - 0, - 0, - 43, - 0, - 0, - 45, - 0, - 0, - 40, - 0 - ], - "seq_velocity": [ - 120, - 120, - 0, - 120, - 120, - 0, - 0, - 120, - 0, - 0, - 120, - 0, - 120, - 0, - 120, - 102, - 120, - 105, - 120, - 102, - 120, - 104, - 120, - 106, - 120, - 109, - 120, - 103, - 120, - 108, - 120, - 120, - 120, - 99, - 120, - 106, - 120, - 113, - 113, - 105, - 120, - 108, - 120, - 110, - 120, - 109, - 120, - 120, - 120, - 0, - 0, - 120, - 0, - 0, - 120, - 0, - 0, - 0, - 120, - 120, - 120, - 0, - 0, - 0, - 120, - 120, - 120, - 120, - 120, - 120, - 120, - 120, - 120, - 120, - 120, - 120, - 120, - 120, - 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, - 127, - 127, - 0, - 120, - 0, - 0, - 120, - 127, - 0, - 125, - 0, - 127, - 127, - 124, - 0, - 127, - 0, - 0, - 0, - 124, - 0, - 0, - 0, - 115, - 0, - 0, - 127, - 0, - 0, - 122, - 0 - ], "seq_patternchain": [ 0, 1, diff --git a/addon/SD/SEQ/3-d.json b/addon/SD/SEQ/3-d.json index 07abfe3..f8890b1 100644 --- a/addon/SD/SEQ/3-d.json +++ b/addon/SD/SEQ/3-d.json @@ -219,7 +219,7 @@ 0.89, 0.6, 0.8, - 0.8, + 0.91, 0.8, 0.8, 0.8, @@ -245,13 +245,13 @@ 0, 0.85, 0, - 0.96, - 0.74, + 1, + 0.88, 0, 0, 0, 0, - 0.68, + 0.72, 0, 0, 0, diff --git a/addon/SD/SEQ/3-pat.json b/addon/SD/SEQ/3-pat.json new file mode 100644 index 0000000..48663a0 --- /dev/null +++ b/addon/SD/SEQ/3-pat.json @@ -0,0 +1,164 @@ +{ + "seq_data": [ + 72, + 72, + 0, + 72, + 78, + 0, + 0, + 72, + 0, + 0, + 72, + 0, + 78, + 0, + 78, + 78, + 78, + 78, + 78, + 78, + 45, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 45, + 78, + 0, + 0, + 78, + 78, + 78, + 78, + 45, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 45, + 78, + 45, + 45, + 73, + 0, + 0, + 73, + 0, + 0, + 73, + 0, + 0, + 0, + 73, + 73, + 73, + 0, + 0, + 0, + 73, + 0, + 0, + 73, + 0, + 0, + 73, + 0, + 0, + 0, + 73, + 0, + 0, + 73, + 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, + 0, + 0, + 40, + 40, + 0, + 40, + 0, + 0, + 40, + 43, + 0, + 43, + 0, + 43, + 45, + 47, + 0, + 40, + 0, + 0, + 0, + 40, + 0, + 0, + 0, + 43, + 0, + 0, + 45, + 0, + 0, + 40, + 0 + ] +} \ No newline at end of file diff --git a/addon/SD/SEQ/3-vel.json b/addon/SD/SEQ/3-vel.json new file mode 100644 index 0000000..2dd9168 --- /dev/null +++ b/addon/SD/SEQ/3-vel.json @@ -0,0 +1,164 @@ +{ + "seq_velocity": [ + 120, + 120, + 0, + 120, + 120, + 0, + 0, + 120, + 0, + 0, + 120, + 0, + 120, + 0, + 120, + 102, + 120, + 105, + 120, + 102, + 120, + 104, + 120, + 106, + 120, + 109, + 120, + 103, + 120, + 108, + 120, + 120, + 120, + 99, + 120, + 106, + 120, + 113, + 113, + 105, + 120, + 108, + 120, + 110, + 120, + 109, + 120, + 120, + 120, + 0, + 0, + 120, + 0, + 0, + 120, + 0, + 0, + 0, + 120, + 120, + 120, + 0, + 0, + 0, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 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, + 127, + 127, + 0, + 120, + 0, + 0, + 120, + 127, + 0, + 125, + 0, + 127, + 127, + 124, + 0, + 127, + 0, + 0, + 0, + 124, + 0, + 0, + 0, + 115, + 0, + 0, + 127, + 0, + 0, + 122, + 0 + ] +} \ No newline at end of file diff --git a/addon/SD/SEQ/4-S.json b/addon/SD/SEQ/4-S.json index a226f0e..a12b714 100644 --- a/addon/SD/SEQ/4-S.json +++ b/addon/SD/SEQ/4-S.json @@ -1,328 +1,4 @@ { - "seq_data": [ - 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, - 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, - 57, - 0, - 0, - 0, - 0, - 0, - 53, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 74, - 130, - 130, - 72, - 130, - 130, - 74, - 130, - 130, - 0, - 76, - 130, - 130, - 130, - 130, - 0, - 74, - 130, - 130, - 72, - 130, - 130, - 71, - 130, - 130, - 0, - 67, - 130, - 130, - 130, - 130, - 0, - 69, - 130, - 130, - 76, - 130, - 130, - 69, - 130, - 130, - 130, - 130, - 130, - 130, - 0, - 0, - 0 - ], - "seq_velocity": [ - 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, - 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, - 201, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 200, - 201, - 200, - 200, - 200, - 200, - 200, - 200, - 200, - 200, - 200, - 200, - 0, - 0, - 0, - 0, - 0, - 98, - 120, - 0, - 88, - 120, - 0, - 108, - 120, - 0, - 0, - 107, - 120, - 0, - 0, - 0, - 0, - 111, - 120, - 0, - 103, - 0, - 0, - 100, - 120, - 0, - 0, - 99, - 120, - 0, - 0, - 0, - 0, - 115, - 120, - 0, - 105, - 120, - 0, - 93, - 120, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], "seq_patternchain": [ 0, 1, diff --git a/addon/SD/SEQ/4-pat.json b/addon/SD/SEQ/4-pat.json new file mode 100644 index 0000000..9b3d636 --- /dev/null +++ b/addon/SD/SEQ/4-pat.json @@ -0,0 +1,164 @@ +{ + "seq_data": [ + 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, + 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, + 57, + 0, + 0, + 0, + 0, + 0, + 53, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 74, + 130, + 130, + 72, + 130, + 130, + 74, + 130, + 130, + 0, + 76, + 130, + 130, + 130, + 130, + 0, + 74, + 130, + 130, + 72, + 130, + 130, + 71, + 130, + 130, + 0, + 67, + 130, + 130, + 130, + 130, + 0, + 69, + 130, + 130, + 76, + 130, + 130, + 69, + 130, + 130, + 130, + 130, + 130, + 130, + 0, + 0, + 0 + ] +} \ No newline at end of file diff --git a/addon/SD/SEQ/4-vel.json b/addon/SD/SEQ/4-vel.json new file mode 100644 index 0000000..17f549e --- /dev/null +++ b/addon/SD/SEQ/4-vel.json @@ -0,0 +1,164 @@ +{ + "seq_velocity": [ + 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, + 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, + 201, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 200, + 201, + 200, + 200, + 200, + 200, + 200, + 200, + 200, + 200, + 200, + 200, + 0, + 0, + 0, + 0, + 0, + 98, + 120, + 0, + 88, + 120, + 0, + 108, + 120, + 0, + 0, + 107, + 120, + 0, + 0, + 0, + 0, + 111, + 120, + 0, + 103, + 0, + 0, + 100, + 120, + 0, + 0, + 99, + 120, + 0, + 0, + 0, + 0, + 115, + 120, + 0, + 105, + 120, + 0, + 93, + 120, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ] +} \ No newline at end of file diff --git a/addon/SD/SEQ/5-S.json b/addon/SD/SEQ/5-S.json index d844e14..d699d28 100644 --- a/addon/SD/SEQ/5-S.json +++ b/addon/SD/SEQ/5-S.json @@ -1,328 +1,4 @@ { - "seq_data": [ - 48, - 47, - 0, - 49, - 48, - 0, - 0, - 47, - 74, - 48, - 50, - 51, - 50, - 59, - 0, - 51, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 54, - 63, - 0, - 0, - 0, - 50, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 50, - 0, - 66, - 0, - 0, - 0, - 0, - 49, - 49, - 49, - 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, - 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 - ], - "seq_velocity": [ - 125, - 120, - 0, - 127, - 125, - 0, - 0, - 120, - 120, - 120, - 80, - 120, - 120, - 120, - 120, - 120, - 127, - 127, - 127, - 103, - 127, - 103, - 125, - 98, - 127, - 101, - 127, - 102, - 127, - 103, - 104, - 113, - 127, - 123, - 127, - 105, - 110, - 107, - 127, - 110, - 126, - 113, - 126, - 113, - 126, - 116, - 126, - 116, - 127, - 0, - 0, - 0, - 126, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 120, - 0, - 0, - 0, - 120, - 0, - 0, - 0, - 126, - 0, - 125, - 0, - 0, - 0, - 120, - 120, - 120, - 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, - 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 - ], "seq_patternchain": [ 0, 1, diff --git a/addon/SD/SEQ/5-d.json b/addon/SD/SEQ/5-d.json index 2d6efe2..1036acb 100644 --- a/addon/SD/SEQ/5-d.json +++ b/addon/SD/SEQ/5-d.json @@ -222,24 +222,24 @@ 0.8, 1, 1, - 0.71, - 0.89, - 0.6, + 0.82, + 0.97, + 0.74, 0.8, 0.61, - 0.49, + 0.53, 0.5, 0.55, 0.6, 0.62, - 0.56, + 0.6, 0, 0.49, 0.44, - 0.56, + 0.64, 0, 0, - 0.49, + 0.59, 1, 0.86, 0, @@ -278,7 +278,7 @@ 0, 0.64, 0, - 0.82, + 0.94, 0, 0, 0, diff --git a/addon/SD/SEQ/5-pat.json b/addon/SD/SEQ/5-pat.json new file mode 100644 index 0000000..681928c --- /dev/null +++ b/addon/SD/SEQ/5-pat.json @@ -0,0 +1,164 @@ +{ + "seq_data": [ + 48, + 47, + 0, + 49, + 48, + 0, + 0, + 47, + 74, + 48, + 50, + 51, + 50, + 59, + 0, + 51, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 54, + 63, + 0, + 0, + 0, + 50, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 50, + 0, + 66, + 0, + 0, + 0, + 0, + 49, + 49, + 49, + 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, + 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 + ] +} \ No newline at end of file diff --git a/addon/SD/SEQ/5-vel.json b/addon/SD/SEQ/5-vel.json new file mode 100644 index 0000000..f7cf317 --- /dev/null +++ b/addon/SD/SEQ/5-vel.json @@ -0,0 +1,164 @@ +{ + "seq_velocity": [ + 125, + 120, + 0, + 127, + 125, + 0, + 0, + 120, + 120, + 120, + 80, + 120, + 120, + 120, + 120, + 120, + 127, + 127, + 127, + 103, + 127, + 103, + 125, + 98, + 127, + 101, + 127, + 102, + 127, + 103, + 104, + 113, + 127, + 123, + 127, + 105, + 110, + 107, + 127, + 110, + 126, + 113, + 126, + 113, + 126, + 116, + 126, + 116, + 127, + 0, + 0, + 0, + 126, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 120, + 0, + 0, + 0, + 120, + 0, + 0, + 0, + 126, + 0, + 125, + 0, + 0, + 0, + 120, + 120, + 120, + 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, + 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 + ] +} \ No newline at end of file diff --git a/addon/SD/SEQ/6-S.json b/addon/SD/SEQ/6-S.json index 09a7186..5524026 100644 --- a/addon/SD/SEQ/6-S.json +++ b/addon/SD/SEQ/6-S.json @@ -1,328 +1,4 @@ { - "seq_data": [ - 69, - 69, - 0, - 69, - 69, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 67, - 67, - 0, - 67, - 67, - 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, - 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, - 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, - 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 - ], - "seq_velocity": [ - 210, - 210, - 0, - 210, - 210, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 210, - 210, - 0, - 210, - 210, - 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, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 213, - 0, - 0, - 0, - 0, - 0, - 213, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 213, - 0, - 0, - 0, - 0, - 0, - 213, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 211, - 0, - 0, - 211, - 0, - 0, - 211, - 0, - 0, - 0, - 211, - 0, - 0, - 0, - 0, - 0, - 211, - 0, - 0, - 211, - 0, - 0, - 211, - 0, - 0, - 0, - 211, - 0, - 0, - 0, - 0, - 0, - 211, - 0, - 0, - 211, - 0, - 0, - 211, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], "seq_patternchain": [ 0, 2, diff --git a/addon/SD/SEQ/6-d.json b/addon/SD/SEQ/6-d.json index 4eba2b5..c0bc2e7 100644 --- a/addon/SD/SEQ/6-d.json +++ b/addon/SD/SEQ/6-d.json @@ -1,10 +1,10 @@ { "drums_volume": 0.95, "pitch": [ - 1.168846, - 0.840896, + 1.041323, + 1.122462, 1, - 0.216911, + 0.243475, 1, 0, 0, @@ -215,9 +215,9 @@ ], "vol_max": [ 1, - 0.73, + 0.75, 0.8, - 0.79, + 0.81, 0.8, 1, 1, diff --git a/addon/SD/SEQ/6-pat.json b/addon/SD/SEQ/6-pat.json new file mode 100644 index 0000000..5bc947b --- /dev/null +++ b/addon/SD/SEQ/6-pat.json @@ -0,0 +1,164 @@ +{ + "seq_data": [ + 69, + 69, + 0, + 69, + 69, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 67, + 67, + 0, + 67, + 67, + 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, + 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, + 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, + 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 + ] +} \ No newline at end of file diff --git a/addon/SD/SEQ/6-vel.json b/addon/SD/SEQ/6-vel.json new file mode 100644 index 0000000..10d8efb --- /dev/null +++ b/addon/SD/SEQ/6-vel.json @@ -0,0 +1,164 @@ +{ + "seq_velocity": [ + 210, + 210, + 0, + 210, + 210, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 210, + 210, + 0, + 210, + 210, + 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, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 213, + 0, + 0, + 0, + 0, + 0, + 213, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 213, + 0, + 0, + 0, + 0, + 0, + 213, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 211, + 0, + 0, + 211, + 0, + 0, + 211, + 0, + 0, + 0, + 211, + 0, + 0, + 0, + 0, + 0, + 211, + 0, + 0, + 211, + 0, + 0, + 211, + 0, + 0, + 0, + 211, + 0, + 0, + 0, + 0, + 0, + 211, + 0, + 0, + 211, + 0, + 0, + 211, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ] +} \ No newline at end of file diff --git a/addon/SD/SEQ/7-S.json b/addon/SD/SEQ/7-S.json new file mode 100644 index 0000000..3a84791 --- /dev/null +++ b/addon/SD/SEQ/7-S.json @@ -0,0 +1,90 @@ +{ + "seq_patternchain": [ + 0, + 1, + 2, + 9, + 0, + 1, + 2, + 8, + 0, + 1, + 2, + 9, + 0, + 1, + 2, + 7 + ], + "seq_tempo_ms": 150000, + "seq_bpm": 100, + "arp_play_basenote": true, + "arp_speed": 0, + "arp_lenght": 8, + "arp_style": 0, + "seq_chord_velocity": 60, + "seq_chord_dexed_inst": 0, + "seq_chain_lenght": 3, + "seq_transpose": 0, + "chord_key_ammount": 4, + "seq_oct_shift": 0, + "seq_element_shift": 0, + "bank": [ + 63, + 91 + ], + "voice": [ + 2, + 27 + ], + "track_type": [ + 0, + 0, + 0, + 0 + ], + "content_type": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ], + "seq_inst_dexed": [ + 0, + 0, + 1, + 1 + ], + "seq_name": [ + 74, + 97, + 112, + 97, + 110, + 45, + 65, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ] +} \ No newline at end of file diff --git a/addon/SD/SEQ/7-d.json b/addon/SD/SEQ/7-d.json new file mode 100644 index 0000000..58bf439 --- /dev/null +++ b/addon/SD/SEQ/7-d.json @@ -0,0 +1,429 @@ +{ + "drums_volume": 0.95, + "pitch": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1.2, + 0, + 0, + 0, + 1.1, + 1.3, + 0, + 1.4, + 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 + ], + "p_offset": [ + 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, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ], + "pan": [ + 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.2, + -0.2, + 0.1, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + -0.2, + 0, + 0.2, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ], + "vol_max": [ + 0.89, + 0.54, + 0.53, + 0.7, + 0.8, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 0.7, + 1, + 0.7, + 1, + 0.7, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 1, + 0.9, + 0.7, + 1, + 1, + 0.9, + 0.6, + 0.7, + 0.9, + 0.9, + 0.9, + 1, + 1, + 1, + 0.9, + 0.9, + 0.9, + 0.9, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 1, + 1, + 0.9, + 0.9, + 0.9, + 0.9, + 0.9, + 0.9, + 0.9, + 0.8, + 0.9, + 0.9, + 1, + 1, + 0 + ], + "vol_min": [ + 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, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ], + "reverb_send": [ + 0, + 0.9, + 0.86, + 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.1, + 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 + ] +} \ No newline at end of file diff --git a/addon/SD/SEQ/7-fx.json b/addon/SD/SEQ/7-fx.json new file mode 100644 index 0000000..5ef3d4b --- /dev/null +++ b/addon/SD/SEQ/7-fx.json @@ -0,0 +1,60 @@ +{ + "filter_cutoff": [ + 0, + 0 + ], + "filter_resonance": [ + 0, + 0 + ], + "chorus_frequency": [ + 0, + 0 + ], + "chorus_waveform": [ + 0, + 0 + ], + "chorus_depth": [ + 0, + 0 + ], + "chorus_level": [ + 0, + 0 + ], + "delay_time": [ + 0, + 0 + ], + "delay_feedback": [ + 73, + 81 + ], + "delay_level": [ + 83, + 80 + ], + "delay_sync": [ + 3, + 3 + ], + "reverb_send": [ + 51, + 100 + ], + "reverb_roomsize": 100, + "reverb_damping": 0, + "reverb_lowpass": 94, + "reverb_lodamp": 6, + "reverb_hidamp": 0, + "reverb_diffusion": 100, + "reverb_level": 72, + "eq_1": 0, + "eq_2": 0, + "eq_3": 1, + "eq_4": 0, + "eq_5": 0, + "eq_6": -2, + "eq_7": 8 +} \ No newline at end of file diff --git a/addon/SD/SEQ/7-pat.json b/addon/SD/SEQ/7-pat.json new file mode 100644 index 0000000..6f85c19 --- /dev/null +++ b/addon/SD/SEQ/7-pat.json @@ -0,0 +1,164 @@ +{ + "seq_data": [ + 210, + 210, + 0, + 210, + 210, + 0, + 210, + 210, + 210, + 210, + 0, + 210, + 210, + 0, + 210, + 210, + 77, + 0, + 0, + 0, + 77, + 0, + 0, + 0, + 77, + 0, + 0, + 0, + 77, + 0, + 0, + 0, + 78, + 78, + 78, + 78, + 95, + 78, + 78, + 78, + 78, + 78, + 78, + 78, + 95, + 78, + 78, + 78, + 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, + 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, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ] +} \ No newline at end of file diff --git a/addon/SD/SEQ/7-v0.json b/addon/SD/SEQ/7-v0.json new file mode 100644 index 0000000..c31f6ec --- /dev/null +++ b/addon/SD/SEQ/7-v0.json @@ -0,0 +1,31 @@ +{ + "lowest_note": 21, + "highest_note": 108, + "transpose": 24, + "tune": 100, + "sound_intensity": 93, + "pan": 23, + "polyphony": 16, + "velocity_level": 100, + "monopoly": 0, + "note_refresh": 0, + "pb_range": 1, + "pb_step": 0, + "mw_range": 50, + "mw_assign": 0, + "mw_mode": 0, + "fc_range": 50, + "fc_assign": 0, + "fc_mode": 0, + "bc_range": 50, + "bc_assign": 0, + "bc_mode": 0, + "at_range": 50, + "at_assign": 0, + "at_mode": 0, + "portamento_mode": 0, + "portamento_glissando": 0, + "portamento_time": 0, + "op_enabled": 63, + "midi_channel": 5 +} \ No newline at end of file diff --git a/addon/SD/SEQ/7-v1.json b/addon/SD/SEQ/7-v1.json new file mode 100644 index 0000000..23324e9 --- /dev/null +++ b/addon/SD/SEQ/7-v1.json @@ -0,0 +1,31 @@ +{ + "lowest_note": 21, + "highest_note": 108, + "transpose": 24, + "tune": 100, + "sound_intensity": 100, + "pan": 15, + "polyphony": 16, + "velocity_level": 100, + "monopoly": 0, + "note_refresh": 0, + "pb_range": 1, + "pb_step": 0, + "mw_range": 50, + "mw_assign": 0, + "mw_mode": 0, + "fc_range": 50, + "fc_assign": 0, + "fc_mode": 0, + "bc_range": 50, + "bc_assign": 0, + "bc_mode": 0, + "at_range": 50, + "at_assign": 0, + "at_mode": 0, + "portamento_mode": 0, + "portamento_glissando": 0, + "portamento_time": 0, + "op_enabled": 63, + "midi_channel": 6 +} \ No newline at end of file diff --git a/addon/SD/SEQ/7-vel.json b/addon/SD/SEQ/7-vel.json new file mode 100644 index 0000000..546c00a --- /dev/null +++ b/addon/SD/SEQ/7-vel.json @@ -0,0 +1,164 @@ +{ + "seq_velocity": [ + 120, + 120, + 0, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 0, + 120, + 120, + 120, + 0, + 0, + 0, + 120, + 0, + 0, + 0, + 120, + 0, + 0, + 0, + 120, + 0, + 0, + 0, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 120, + 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, + 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, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ] +} \ No newline at end of file diff --git a/config.h b/config.h index 614cd11..6cdbd01 100644 --- a/config.h +++ b/config.h @@ -118,6 +118,11 @@ // NUMBER OF SAMPLES IN DRUMSET #define NUM_DRUMSET_CONFIG 69 +// SEQUENCER + +#define NUM_SEQ_PATTERN 10 +#define NUM_SEQ_TRACKS 4 + // CHORUS parameters #define MOD_DELAY_SAMPLE_BUFFER int32_t(TIME_MS2SAMPLES(20.0)) // 20.0 ms delay buffer. #define MOD_WAVEFORM WAVEFORM_TRIANGLE // WAVEFORM_SINE WAVEFORM_TRIANGLE WAVEFORM_SAWTOOTH WAVEFORM_SAWTOOTH_REVERSE diff --git a/dexed_sd.cpp b/dexed_sd.cpp index a0639d6..a4b317a 100644 --- a/dexed_sd.cpp +++ b/dexed_sd.cpp @@ -45,11 +45,11 @@ extern void sequencer(); extern float drums_volume; //extern StaticJsonDocument data_json; extern uint8_t seq_chain_lenght; -extern uint8_t seq_data[10][16]; -extern uint8_t seq_vel[10][16]; -extern uint8_t seq_patternchain[4][4]; -extern uint8_t seq_content_type[10]; -extern uint8_t seq_track_type[4]; +extern uint8_t seq_data[NUM_SEQ_PATTERN][16]; +extern uint8_t seq_vel[NUM_SEQ_PATTERN][16]; +extern uint8_t seq_patternchain[NUM_SEQ_TRACKS][4]; +extern uint8_t seq_content_type[NUM_SEQ_PATTERN]; +extern uint8_t seq_track_type[NUM_SEQ_TRACKS]; extern uint8_t seq_chord_key_ammount; extern uint8_t seq_element_shift; extern int seq_oct_shift; @@ -63,7 +63,7 @@ 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 uint8_t seq_inst_dexed[NUM_SEQ_TRACKS]; extern char seq_name[FILENAME_LEN]; extern char seq_name_temp[FILENAME_LEN]; extern PeriodicTimer timer1; @@ -945,24 +945,132 @@ bool save_sd_fx_json(uint8_t fx, uint8_t target) return (false); } +bool save_sd_seq_sub_vel_json(uint8_t seq_number) +{ + char filename[FILENAME_LEN]; + int count = 0; + seq_number = constrain(seq_number, 0, 99); + if (sd_card > 0) + { + File json; + StaticJsonDocument data_json; + sprintf(filename, "/%s/%d-vel.json", SEQ_CONFIG_PATH, seq_number); +#ifdef DEBUG + Serial.print(F("Saving sequencer velocity ")); + Serial.print(seq_number); + Serial.print(F(" to ")); + Serial.println(filename); +#endif + int total = sizeof(seq_vel); + int columns = sizeof(seq_vel[0]); + int rows = total / columns; + AudioNoInterrupts(); + SD.begin(); + SD.remove(filename); + json = SD.open(filename, FILE_WRITE); + if (json) + { + for (uint8_t i = 0; i < rows; i++) + { + for (uint8_t j = 0; j < columns; j++) { + data_json["seq_velocity"][count] = seq_vel[i][j]; + count++; + } + } +#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 + } + return (false); +} + +bool save_sd_seq_sub_patterns_json(uint8_t seq_number) +{ + char filename[FILENAME_LEN]; + int count = 0; + seq_number = constrain(seq_number, 0, 99); + if (sd_card > 0) + { + File json; + StaticJsonDocument data_json; + sprintf(filename, "/%s/%d-pat.json", SEQ_CONFIG_PATH, seq_number); +#ifdef DEBUG + Serial.print(F("Saving sequencer patterns ")); + Serial.print(seq_number); + Serial.print(F(" to ")); + Serial.println(filename); +#endif + int total = sizeof(seq_data); + int columns = sizeof(seq_data[0]); + int rows = total / columns; + AudioNoInterrupts(); + SD.begin(); + SD.remove(filename); + json = SD.open(filename, FILE_WRITE); + if (json) + { + for (uint8_t i = 0; i < rows; i++) + { + for (uint8_t j = 0; j < columns; j++) { + data_json["seq_data"][count] = seq_data[i][j]; + count++; + } + } +#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 + } + return (false); +} bool save_sd_seq_json(uint8_t seq_number) { char filename[FILENAME_LEN]; int count = 0; seq_number = constrain(seq_number, 0, 99); + save_sd_seq_sub_vel_json(seq_number); + save_sd_seq_sub_patterns_json(seq_number); sprintf(filename, "/%s/%d-fx.json", SEQ_CONFIG_PATH, seq_number); - #ifdef DEBUG Serial.print(F("write SEQ-FX-Config ")); Serial.print(seq_number); Serial.print(F(" ")); #endif save_sd_fx_json(seq_number, 1); - for (uint8_t i = 0; i < MAX_DEXED; i++) { sprintf(filename, "/%s/%d-v%d.json", SEQ_CONFIG_PATH, seq_number, i); - #ifdef DEBUG Serial.print(F("Write Voice-Config for sequencer")); Serial.print(filename); @@ -989,32 +1097,15 @@ bool save_sd_seq_json(uint8_t seq_number) Serial.print(" Columns: "); Serial.print(columns); Serial.print(F(" ")); - AudioNoInterrupts(); SD.begin(); SD.remove(filename); json = SD.open(filename, FILE_WRITE); if (json) { - for (uint8_t i = 0; i < rows; i++) - { - for (uint8_t j = 0; j < columns; j++) { - data_json["seq_data"][count] = seq_data[i][j]; - count++; - } - } - count = 0; - for (uint8_t i = 0; i < rows; i++) - { - for (uint8_t j = 0; j < columns; j++) { - data_json["seq_velocity"][count] = seq_vel[i][j]; - count++; - } - } total = sizeof(seq_patternchain); columns = sizeof(seq_patternchain[0]); rows = total / columns; - Serial.print(F("Chain Rows: ")); Serial.print(rows); Serial.print(" Chain Columns: "); @@ -1042,13 +1133,11 @@ bool save_sd_seq_json(uint8_t seq_number) 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; - 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]; } - for (uint8_t i = 0; i < sizeof(seq_track_type); i++) { data_json["track_type"][i] = seq_track_type[i]; } @@ -1061,8 +1150,6 @@ bool save_sd_seq_json(uint8_t seq_number) for (uint8_t i = 0; i < FILENAME_LEN; i++) { data_json["seq_name"][i] = seq_name[i]; } - - #ifdef DEBUG Serial.println(F("Write JSON data:")); serializeJsonPretty(data_json, Serial); @@ -1074,7 +1161,6 @@ bool save_sd_seq_json(uint8_t seq_number) return (true); } json.close(); - } else { @@ -1123,22 +1209,20 @@ void get_sd_seq_name_json(uint8_t seq_number) } } -bool load_sd_seq_json(uint8_t seq_number) +bool load_sd_seq_sub_vel_json(uint8_t seq_number) { if (seq_number < 0) return (false); seq_number = constrain(seq_number, 0, 99); - load_sd_fx_json(seq_number, 1); - if (sd_card > 0) { File json; StaticJsonDocument data_json; char filename[FILENAME_LEN]; - sprintf(filename, "/%s/%d-S.json", SEQ_CONFIG_PATH, seq_number); + sprintf(filename, "/%s/%d-vel.json", SEQ_CONFIG_PATH, seq_number); // first check if file exists... AudioNoInterrupts(); @@ -1146,7 +1230,7 @@ bool load_sd_seq_json(uint8_t seq_number) { // ... and if: load #ifdef DEBUG - Serial.print(F("Found Sequencer configuration [")); + Serial.print(F("Found velocity data [")); Serial.print(filename); Serial.println(F("]... loading...")); Serial.println(F(" ")); @@ -1155,7 +1239,6 @@ bool load_sd_seq_json(uint8_t seq_number) if (json) { deserializeJson(data_json, json); - json.close(); AudioInterrupts(); @@ -1164,30 +1247,158 @@ bool load_sd_seq_json(uint8_t seq_number) serializeJsonPretty(data_json, Serial); Serial.println(); #endif - int total = sizeof(seq_data); - int columns = sizeof(seq_data[0]); + int total = sizeof(seq_vel); + int columns = sizeof(seq_vel[0]); int rows = total / columns; int count = 0; - for (uint8_t i = 0; i < rows; i++) { for (uint8_t j = 0; j < columns; j++) { - seq_data[i][j] = data_json["seq_data"][count]; + seq_vel[i][j] = data_json["seq_velocity"][count]; count++; } } - count = 0; + 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 + } + } + return (false); +} + +bool load_sd_seq_sub_patterns_json(uint8_t seq_number) +{ + if (seq_number < 0) + return (false); + + seq_number = constrain(seq_number, 0, 99); + + if (sd_card > 0) + { + File json; + StaticJsonDocument data_json; + char filename[FILENAME_LEN]; + + sprintf(filename, "/%s/%d-pat.json", SEQ_CONFIG_PATH, seq_number); + + // first check if file exists... + AudioNoInterrupts(); + if (SD.exists(filename)) + { + // ... and if: load +#ifdef DEBUG + Serial.print(F("Found pattern data [")); + Serial.print(filename); + Serial.println(F("]... loading...")); + Serial.println(F(" ")); +#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 + int total = sizeof(seq_data); + int columns = sizeof(seq_data[0]); + int rows = total / columns; + int count = 0; + for (uint8_t i = 0; i < rows; i++) { for (uint8_t j = 0; j < columns; j++) { - seq_vel[i][j] = data_json["seq_velocity"][count]; + seq_data[i][j] = data_json["seq_data"][count]; count++; } } - total = sizeof(seq_patternchain); - columns = sizeof(seq_patternchain[0]); - rows = total / columns; - count = 0; + 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 + } + } + return (false); +} + +bool load_sd_seq_json(uint8_t seq_number) +{ + if (seq_number < 0) + return (false); + + seq_number = constrain(seq_number, 0, 99); + + load_sd_seq_sub_patterns_json(seq_number); + load_sd_seq_sub_vel_json(seq_number); + + load_sd_fx_json(seq_number, 1); + + if (sd_card > 0) + { + File json; + StaticJsonDocument data_json; + char filename[FILENAME_LEN]; + + sprintf(filename, "/%s/%d-S.json", SEQ_CONFIG_PATH, seq_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...")); + Serial.println(F(" ")); +#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 + int total = sizeof(seq_patternchain); + int columns = sizeof(seq_patternchain[0]); + int rows = total / columns; + int count = 0; for (uint8_t i = 0; i < rows; i++) { for (uint8_t j = 0; j < columns; j++) { @@ -1210,7 +1421,6 @@ bool load_sd_seq_json(uint8_t seq_number) seq_name[i] = data_json["seq_name"][i]; } } - count = 0; seq_tempo_ms = data_json["seq_tempo_ms"] ; seq_bpm = data_json["seq_bpm"]; @@ -1225,17 +1435,12 @@ bool load_sd_seq_json(uint8_t seq_number) 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"]; - - for (uint8_t instance_id = 0; instance_id < NUM_DEXED; instance_id++) { configuration.performance.bank[instance_id] = data_json["bank"][instance_id]; configuration.performance.voice[instance_id] = data_json["voice"][instance_id]; load_sd_voice(configuration.performance.bank[instance_id], configuration.performance.voice[instance_id], instance_id); load_sd_voiceconfig_json(seq_number, instance_id, 1); - //check_configuration_dexed(instance_id); - //set_voiceconfig_params(instance_id); - //MicroDexed[instance_id]->ControllersRefresh(); MicroDexed[instance_id]->setGain(midi_volume_transform(map(configuration.dexed[instance_id].sound_intensity, SOUND_INTENSITY_MIN, SOUND_INTENSITY_MAX, 0, 127))); MicroDexed[instance_id]->panic(); #ifdef DEBUG @@ -1245,16 +1450,13 @@ bool load_sd_seq_json(uint8_t seq_number) Serial.print(F(" ")); #endif } - for (uint8_t instance_id = 0; instance_id < NUM_DEXED; instance_id++) set_voiceconfig_params(instance_id); set_fx_params(); - if (seq_running) timer1.begin(sequencer, seq_tempo_ms / 2); else timer1.begin(sequencer, seq_tempo_ms / 2, false); - return (true); } #ifdef DEBUG diff --git a/drums.h b/drums.h index baeb98a..8cab2d3 100644 --- a/drums.h +++ b/drums.h @@ -46,4 +46,6 @@ typedef struct drum_config_s { enum {DRUM_NONE, DRUM_BASS, DRUM_SNARE, DRUM_HIHAT, DRUM_HANDCLAP, DRUM_RIDE, DRUM_CRASH, DRUM_LOWTOM, DRUM_MIDTOM, DRUM_HIGHTOM, DRUM_PERCUSSION}; + + #endif diff --git a/sequencer.cpp b/sequencer.cpp index de695aa..c6eaeac 100644 --- a/sequencer.cpp +++ b/sequencer.cpp @@ -37,7 +37,7 @@ void sequencer_part1(void) seq_note_in_velocity = 0; } - for (uint8_t d = 0; d < 4; d++) + for (uint8_t d = 0; d < NUM_SEQ_TRACKS; d++) { if ( seq_track_type[d] == 0) { // drum track (drum samples and pitched one-shot samples) if (seq_data[ seq_patternchain[seq_chain_active_step][d] ][seq_step] > 0 ) @@ -171,7 +171,7 @@ void sequencer_part1(void) void sequencer_part2(void) { - for (uint8_t d = 0; d < 4; d++) + for (uint8_t d = 0; d < NUM_SEQ_TRACKS; d++) { if (seq_noteoffsent[d] == false) { if ( seq_prev_note[d] > 0 && seq_track_type[d] > 0) diff --git a/sequencer.h b/sequencer.h index b4b8d3a..7d37bf5 100644 --- a/sequencer.h +++ b/sequencer.h @@ -14,7 +14,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[4] = { 0, 0, 1, 1 }; +uint8_t seq_inst_dexed[NUM_SEQ_TRACKS] = { 0, 0, 1, 1 }; uint8_t seq_chord_dexed_inst = 0; uint8_t seq_chord_velocity = 60; uint8_t seq_chord_key_ammount = 4; @@ -52,8 +52,8 @@ uint8_t seq_temp_active_menu = 99; 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_active_step = 0; -uint8_t seq_prev_note[4]; // note_offs for every (instr.) track -uint8_t seq_prev_vel[4]; +uint8_t seq_prev_note[NUM_SEQ_TRACKS]; // note_offs for every (instr.) track +uint8_t seq_prev_vel[NUM_SEQ_TRACKS]; uint8_t arp_step; uint8_t arp_note; uint8_t arp_chord = 6; @@ -64,7 +64,7 @@ uint8_t arp_prev_oct; uint8_t arp_speed = 0; uint8_t arp_counter = 0; uint8_t arp_lenght = 8; -uint8_t seq_data[10][16] = {0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , +uint8_t seq_data[NUM_SEQ_PATTERN][16] = {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 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , @@ -75,7 +75,7 @@ uint8_t seq_data[10][16] = {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 }; -uint8_t seq_vel[10][16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +uint8_t seq_vel[NUM_SEQ_PATTERN][16] = {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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -132,13 +132,10 @@ uint8_t seq_vel[10][16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 123, 120, 0, 110, 120, 0, 90, 120, 0, 0, 0, 0, 0, 0, 0, 0 // }; -uint8_t seq_patternchain[4][4] = { 0 , 2 , 6 , 9 , +uint8_t seq_patternchain[NUM_SEQ_TRACKS][4] = { 0 , 2 , 6 , 9 , 1 , 2 , 5 , 8 , 0 , 2 , 6 , 9 , 1 , 2 , 5 , 7 }; -uint8_t seq_content_type[10] = { 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[4] = { 0, 0, 0, 0 }; // 0 = track is Drumtrack, 1 = Instrumenttrack, 2 = Chord, 3 = Arp - -//uint8_t seq_content_type[10] = { 0, 0, 0, 0 , 2, 2, 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 +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, 0, 0 }; // 0 = track is Drumtrack, 1 = Instrumenttrack, 2 = Chord, 3 = Arp