From 3d1564b205e50b0f3a78ec698b13dc22fd296f9f Mon Sep 17 00:00:00 2001 From: Holger Wirtz Date: Sat, 7 Jan 2023 11:29:13 +0100 Subject: [PATCH] Several fixes. --- MicroDexed.ino | 2 +- addon/tools/drumset.cfg | 128 +-- addon/tools/drumset.h.orig | 1604 +++++++++++++++++------------------- addon/tools/wav2c.sh | 18 +- drumset.h | 555 ++++++------- 5 files changed, 1090 insertions(+), 1217 deletions(-) diff --git a/MicroDexed.ino b/MicroDexed.ino index c1729e2..9978924 100644 --- a/MicroDexed.ino +++ b/MicroDexed.ino @@ -1016,7 +1016,7 @@ void handleNoteOn(byte inChannel, byte inNumber, byte inVelocity) { } Drum[slot]->playRaw((int16_t*)drum_config[d].drum_data, drum_config[d].len, 1); #ifdef DEBUG - Serial.printf(PSTR("Playing sample [%s][%c%c] on slot [%d] main volume [%d]: drum_data=%p, len=%d\n"), drum_config[d].name, drum_config[d].shortname[0], drum_config[d].shortname[1], slot, configuration.drums.main_vol, drum_config[d].drum_data, drum_config[d].len); + Serial.printf(PSTR("Playing sample [%s][%c%c] on slot [%d] main volume [%d]: drum_data=%p, len=%d\n"), drum_config[d].name, slot, configuration.drums.main_vol, drum_config[d].drum_data, drum_config[d].len); Serial.print(F("Drum Slot [")); Serial.print(slot); diff --git a/addon/tools/drumset.cfg b/addon/tools/drumset.cfg index 4aa6156..cd9e885 100644 --- a/addon/tools/drumset.cfg +++ b/addon/tools/drumset.cfg @@ -1,64 +1,64 @@ -# class, midinote, name, shortname, pitch, p_offset, pan, vol_max, vol_min, reverb_send, filename -DRUM_BASS, MIDI_A1, Clap808, B, 1.0, 0.0, 0.8, 0.0, 0.0, Clap808.wav -DRUM_BASS, MIDI_B1, S_kick_1, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_kick_1.wav -DRUM_BASS, MIDI_C2, S_kick2_8, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_kick2_8.wav -DRUM_PERCUSSION, MIDI_CIS2, S_Stick_1, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_snareStick_1.wav -DRUM_SNARE, MIDI_D2, S_snare_Ghost_1, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_snare_Ghost_1.wav -DRUM_SNARE, MIDI_DIS2, S_snare2_Ghost_1, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_snare2_Ghost_1.wav -DRUM_SNARE, MIDI_E2, S_snare_2, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_snare_2.wav -DRUM_BASS, MIDI_F2, S_loTom_1, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_loTom_1.wav -DRUM_HIHAT, MIDI_FIS2, S_hhClosed_1, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_hhClosed_1.wav -DRUM_LOWTOM, MIDI_G2, S_loTom_1, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_loTom_1.wav -DRUM_HIHAT, MIDI_GIS2, S_hh_o_1_2, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_hh_o_1_2.wav -DRUM_HIGHTOM, MIDI_A2, S_hiTom_5, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_hiTom_5.wav -DRUM_BASS, MIDI_AIS2, S_hh_o_5_4, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_hh_o_5_4.wav -DRUM_HIGHTOM, MIDI_B2, S_hiTom_5, B, 1.3, 0.0, 0.8, 0.0, 0.0, S_hiTom_5.wav -DRUM_HIGHTOM, MIDI_C3, S_hiTom_5, B, 1.6, 0.0, 0.8, 0.0, 0.0, S_hiTom_5.wav -DRUM_BASS, MIDI_CIS3, S_splash1_1, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_splash1_1.wav -DRUM_HIGHTOM, MIDI_D3, S_hiTom_5, B, 1.9, 0.0, 0.8, 0.0, 0.0, S_hiTom_5.wav -DRUM_CRASH, MIDI_DIS3, S_china1_4, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_china1_4.wav -DRUM_CRASH, MIDI_E3, S_china2_1, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_china2_1.wav -DRUM_RIDE, MIDI_F3, S_ride1Bell_1, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_ride1Bell_1.wav -DRUM_RIDE, MIDI_FIS3, S_ride1Bell_1, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_ride1Bell_1.wav -DRUM_CRASH, MIDI_G3, S_crash1_1, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_crash1_1.wav -DRUM_BASS, MIDI_GIS3, S_cowbell_2, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_cowbell_2.wav -DRUM_RIDE, MIDI_A3, S_ride2Crash_2, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_ride2Crash_2.wav -DRUM_RIDE, MIDI_AIS3, S_ride2_1, B, 1.0, 0.0, 0.8, 0.0, 0.0, S_ride2_1.wav -DRUM_BASS, MIDI_B3, 808Kick, B, 1.0, 0.0, 0.8, 0.0, 0.0, Kick808.wav -DRUM_BASS, MIDI_C4, phkick1, B, 1.0, 0.0, 1.0, 0.0, 0.0, phKick1.wav -DRUM_SNARE, MIDI_CIS4, rims1, R, 1.0, -0.2, 0.7, 0.0, 0.0, Rim808.wav -DRUM_SNARE, MIDI_D4, Shaker, R, 1.0, -0.2, 0.5, 0.0, 0.0, Shaker.wav -DRUM_HANDCLAP, MIDI_DIS4, LNclap1, C, 1.0, 0.1, 0.9, 0.0, 0.1, LnClap.wav -DRUM_SNARE, MIDI_E4, LNsnare1, S, 1.0, 0.0, 0.9, 0.0, 0.0, LnSnare1.wav -DRUM_BASS, MIDI_F4, Bdtrancy, B, 1.0, 0.0, 0.9, 0.0, 0.0, BDTrancy.wav -DRUM_HIHAT, MIDI_FIS4, hhcl1, H, 1.0, 1.0, 0.6, 0.0, 0.0, HhCL1-808.wav -DRUM_BASS, MIDI_G4, Belltree, B, 1.0, 0.0, 0.7, 0.0, 0.0, Belltree.wav -DRUM_BASS, MIDI_GIS4, Bongo16, B, 1.0, 0.0, 0.9, 0.0, 0.0, Bongo16.wav -DRUM_BASS, MIDI_A4, Bongo27, B, 1.0, 0.0, 0.9, 0.0, 0.0, Bongo27.wav -DRUM_BASS, MIDI_AIS4, Casta, B, 1.0, 0.0, 0.9, 0.0, 0.0, Casta.wav -DRUM_BASS, MIDI_B4, Cr78kick, B, 1.0, 0.0, 1.0, 0.0, 0.0, CR78Kick.wav -DRUM_HIHAT, MIDI_C5, Cr78tmb1, B, 1.0, 0.0, 0.8, 0.0, 0.0, CR78Tmb1.wav -DRUM_HIHAT, MIDI_CIS5, Cr78tmb2, B, 1.0, 0.0, 0.8, 0.0, 0.0, CR78Tmb2.wav -DRUM_BASS, MIDI_D5, Crash1, B, 1.0, 0.0, 0.9, 0.0, 0.0, Crash1.wav -DRUM_BASS, MIDI_DIS5, Dmpop, B, 1.0, 0.0, 0.9, 0.0, 0.0, DMpop.wav -DRUM_BASS, MIDI_E5, Electr1, B, 1.0, 0.0, 0.9, 0.0, 0.0, Electr1.wav -DRUM_BASS, MIDI_F5, Excow, B, 1.0, 0.0, 0.9, 0.0, 0.0, EXcow.wav -DRUM_PERCUSSION, MIDI_FIS5, Tamb, T, 1.0, -0.2, 0.6, 0.0, 0.0, Tamb.wav -DRUM_PERCUSSION, MIDI_GIS5, Cowbell, S, 1.0, 0.2, 0.6, 0.0, 0.0, CowBell.wav -DRUM_HIHAT, MIDI_G5, 660HatC1, T, 1.0, 0.0, 0.6, 0.0, 0.0, HatC660.wav -DRUM_HIHAT, MIDI_A5, Hhopen1, S, 1.0, 0.0, 0.6, 0.0, 0.0, HHopen1.wav -DRUM_PERCUSSION, MIDI_AIS5, Histicks, S, 1.0, 0.0, 0.6, 0.0, 0.0, HiSticks.wav -DRUM_PERCUSSION, MIDI_B5, Hr16snr2, S, 1.0, 0.0, 0.6, 0.0, 0.0, HR16Snr2.wav -DRUM_HIGHTOM, MIDI_C6, Xrhitom, B, 1.0, 0.0, 0.8, 0.0, 0.0, XRHiTom.wav -DRUM_PERCUSSION, MIDI_CIS6, Tick1, S, 1.0, 0.0, 0.9, 0.0, 0.0, Tick1.wav -DRUM_PERCUSSION, MIDI_D6, M1-18, S, 1.0, 0.0, 0.9, 0.0, 0.0, M1-18.wav -DRUM_PERCUSSION, MIDI_DIS6, Md16_clp, S, 1.0, 0.0, 0.9, 0.0, 0.0, MD16_CLP.wav -DRUM_HIHAT, MIDI_E6, Ohhwav, S, 1.0, 0.0, 0.9, 0.0, 0.0, OHH909.wav -DRUM_PERCUSSION, MIDI_F6, Quijada, S, 1.0, 0.0, 0.9, 0.0, 0.0, Quijada.wav -DRUM_PERCUSSION, MIDI_FIS6, tabla1, S, 1.0, 0.0, 0.9, 0.0, 0.0, R8Tabla1.wav -DRUM_PERCUSSION, MIDI_G6, Ride808, S, 1.0, 0.0, 0.9, 0.0, 0.0, Ride808.wav -DRUM_PERCUSSION, MIDI_GIS6, Scratch1, S, 1.0, 0.0, 0.7, 0.0, 0.0, scratch1.wav -DRUM_PERCUSSION, MIDI_A6, Tomlow, S, 1.0, 0.0, 0.9, 0.0, 0.0, TomLow.wav -DRUM_PERCUSSION, MIDI_AIS6, Tom808, S, 1.0, 0.0, 0.9, 0.0, 0.0, Tom808.wav -DRUM_BASS, MIDI_B6, Vl1lbeep, B, 1.0, 0.0, 0.8, 0.0, 0.0, vl1-Lbeep.wav -DRUM_BASS, MIDI_C7, Vl1hbeep, B, 1.0, 0.0, 0.8, 0.0, 0.0, vl1-Hbeep.wav +# class, midinote, name, pitch, pan, vol_max, vol_min, reverb_send, filename +DRUM_BASS, MIDI_A1, Clap808,1,0,0.8,0,0, Clap808.wav +DRUM_BASS, MIDI_B1, S_kick_1,1,0,0.8,0,0, S_kick_1.wav +DRUM_BASS, MIDI_C2, S_kick2_8,1,0,0.8,0,0, S_kick2_8.wav +DRUM_PERCUSSION, MIDI_CIS2, S_Stick_1,1,0,0.8,0,0, S_snareStick_1.wav +DRUM_SNARE, MIDI_D2, S_snare_Ghost_1,1,0,0.8,0,0, S_snare_Ghost_1.wav +DRUM_SNARE, MIDI_DIS2, S_snare2_Ghost_1,1,0,0.8,0,0, S_snare2_Ghost_1.wav +DRUM_SNARE, MIDI_E2, S_snare_2,1,0,0.8,0,0, S_snare_2.wav +DRUM_BASS, MIDI_F2, S_loTom_1,1,0,0.8,0,0, S_loTom_1.wav +DRUM_HIHAT, MIDI_FIS2, S_hhClosed_1,1,0,0.8,0,0, S_hhClosed_1.wav +DRUM_LOWTOM, MIDI_G2, S_loTom_1,1,0,0.8,0,0, S_loTom_1.wav +DRUM_HIHAT, MIDI_GIS2, S_hh_o_1_2,1,0,0.8,0,0, S_hh_o_1_2.wav +DRUM_HIGHTOM, MIDI_A2, S_hiTom_5,1,0,0.8,0,0, S_hiTom_5.wav +DRUM_BASS, MIDI_AIS2, S_hh_o_5_4,1,0,0.8,0,0, S_hh_o_5_4.wav +DRUM_HIGHTOM, MIDI_B2, S_hiTom_5,1.3,0,0.8,0,0, S_hiTom_5.wav +DRUM_HIGHTOM, MIDI_C3, S_hiTom_5,1.6,0,0.8,0,0, S_hiTom_5.wav +DRUM_BASS, MIDI_CIS3, S_splash1_1,1,0,0.8,0,0, S_splash1_1.wav +DRUM_HIGHTOM, MIDI_D3, S_hiTom_5,1.9,0,0.8,0,0, S_hiTom_5.wav +DRUM_CRASH, MIDI_DIS3, S_china1_4,1,0,0.8,0,0, S_china1_4.wav +DRUM_CRASH, MIDI_E3, S_china2_1,1,0,0.8,0,0, S_china2_1.wav +DRUM_RIDE, MIDI_F3, S_ride1Bell_1,1,0,0.8,0,0, S_ride1Bell_1.wav +DRUM_RIDE, MIDI_FIS3, S_ride1Bell_1,1,0,0.8,0,0, S_ride1Bell_1.wav +DRUM_CRASH, MIDI_G3, S_crash1_1,1,0,0.8,0,0, S_crash1_1.wav +DRUM_BASS, MIDI_GIS3, S_cowbell_2,1,0,0.8,0,0, S_cowbell_2.wav +DRUM_RIDE, MIDI_A3, S_ride2Crash_2,1,0,0.8,0,0, S_ride2Crash_2.wav +DRUM_RIDE, MIDI_AIS3, S_ride2_1,1,0,0.8,0,0, S_ride2_1.wav +DRUM_BASS, MIDI_B3, 808Kick,1,0,0.8,0,0, Kick808.wav +DRUM_BASS, MIDI_C4, phkick1,1,0,1,0,0, phKick1.wav +DRUM_SNARE, MIDI_CIS4, rims1,1,-0.2,0.7,0,0, Rim808.wav +DRUM_SNARE, MIDI_D4, Shaker,1,-0.2,0.5,0,0, Shaker.wav +DRUM_HANDCLAP, MIDI_DIS4, LNclap1,1,0.1,0.9,0,0.1, LnClap.wav +DRUM_SNARE, MIDI_E4, LNsnare1,1,0,0.9,0,0, LnSnare1.wav +DRUM_BASS, MIDI_F4, Bdtrancy,1,0,0.9,0,0, BDTrancy.wav +DRUM_HIHAT, MIDI_FIS4, hhcl1,1,1,0.6,0,0, HhCL1-808.wav +DRUM_BASS, MIDI_G4, Belltree,1,0,0.7,0,0, Belltree.wav +DRUM_BASS, MIDI_GIS4, Bongo16,1,0,0.9,0,0, Bongo16.wav +DRUM_BASS, MIDI_A4, Bongo27,1,0,0.9,0,0, Bongo27.wav +DRUM_BASS, MIDI_AIS4, Casta,1,0,0.9,0,0, Casta.wav +DRUM_BASS, MIDI_B4, Cr78kick,1,0,1,0,0, CR78Kick.wav +DRUM_HIHAT, MIDI_C5, Cr78tmb1,1,0,0.8,0,0, CR78Tmb1.wav +DRUM_HIHAT, MIDI_CIS5, Cr78tmb2,1,0,0.8,0,0, CR78Tmb2.wav +DRUM_BASS, MIDI_D5, Crash1,1,0,0.9,0,0, Crash1.wav +DRUM_BASS, MIDI_DIS5, Dmpop,1,0,0.9,0,0, DMpop.wav +DRUM_BASS, MIDI_E5, Electr1,1,0,0.9,0,0, Electr1.wav +DRUM_BASS, MIDI_F5, Excow,1,0,0.9,0,0, EXcow.wav +DRUM_PERCUSSION, MIDI_FIS5, Tamb,1,-0.2,0.6,0,0, Tamb.wav +DRUM_PERCUSSION, MIDI_GIS5, Cowbell,1,0.2,0.6,0,0, CowBell.wav +DRUM_HIHAT, MIDI_G5, 660HatC1,1,0,0.6,0,0, HatC660.wav +DRUM_HIHAT, MIDI_A5, Hhopen1,1,0,0.6,0,0, HHopen1.wav +DRUM_PERCUSSION, MIDI_AIS5, Histicks,1,0,0.6,0,0, HiSticks.wav +DRUM_PERCUSSION, MIDI_B5, Hr16snr2,1,0,0.6,0,0, HR16Snr2.wav +DRUM_HIGHTOM, MIDI_C6, Xrhitom,1,0,0.8,0,0, XRHiTom.wav +DRUM_PERCUSSION, MIDI_CIS6, Tick1,1,0,0.9,0,0, Tick1.wav +DRUM_PERCUSSION, MIDI_D6, M1-18,1,0,0.9,0,0, M1-18.wav +DRUM_PERCUSSION, MIDI_DIS6, Md16_clp,1,0,0.9,0,0, MD16_CLP.wav +DRUM_HIHAT, MIDI_E6, Ohhwav,1,0,0.9,0,0, OHH909.wav +DRUM_PERCUSSION, MIDI_F6, Quijada,1,0,0.9,0,0, Quijada.wav +DRUM_PERCUSSION, MIDI_FIS6, tabla1,1,0,0.9,0,0, R8Tabla1.wav +DRUM_PERCUSSION, MIDI_G6, Ride808,1,0,0.9,0,0, Ride808.wav +DRUM_PERCUSSION, MIDI_GIS6, Scratch1,1,0,0.7,0,0, scratch1.wav +DRUM_PERCUSSION, MIDI_A6, Tomlow,1,0,0.9,0,0, TomLow.wav +DRUM_PERCUSSION, MIDI_AIS6, Tom808,1,0,0.9,0,0, Tom808.wav +DRUM_BASS, MIDI_B6, Vl1lbeep,1,0,0.8,0,0, vl1-Lbeep.wav +DRUM_BASS, MIDI_C7, Vl1hbeep,1,0,0.8,0,0, vl1-Hbeep.wav diff --git a/addon/tools/drumset.h.orig b/addon/tools/drumset.h.orig index b1dcc45..86d50aa 100644 --- a/addon/tools/drumset.h.orig +++ b/addon/tools/drumset.h.orig @@ -19,837 +19,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}; -PROGMEM const drum_config_t drum_config[NUM_DRUMSET_CONFIG] = -{ - { - DRUM_BASS, - MIDI_A1, - "Clap808", - DRUM_Clap808, - 7744, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_B1, - "S_kick_1", - DRUM_S_kick_1, - 19520, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_C2, - "S_kick2_8", - DRUM_S_kick2_8, - 19200, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_PERCUSSION, - MIDI_CIS2, - "S_Stick_1", - DRUM_S_Stick_1, - 10432, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_SNARE, - MIDI_D2, - "S_snare_Ghost_1", - DRUM_S_snare_Ghost_1, - 19008, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_SNARE, - MIDI_DIS2, - "S_snare2_Ghost_1", - DRUM_S_snare2_Ghost_1, - 22464, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_SNARE, - MIDI_E2, - "S_snare_2", - DRUM_S_snare_2, - 17920, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_F2, - "S_loTom_1", - DRUM_S_loTom_1, - 40320, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_HIHAT, - MIDI_FIS2, - "S_hhClosed_1", - DRUM_S_hhClosed_1, - 6784, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_LOWTOM, - MIDI_G2, - "S_loTom_1", - DRUM_S_loTom_1, - 40320, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_HIHAT, - MIDI_GIS2, - "S_hh_o_1_2", - DRUM_S_hh_o_1_2, - 18240, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_HIGHTOM, - MIDI_A2, - "S_hiTom_5", - DRUM_S_hiTom_5, - 23040, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_AIS2, - "S_hh_o_5_4", - DRUM_S_hh_o_5_4, - 80320, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_HIGHTOM, - MIDI_B2, - "S_hiTom_5", - DRUM_S_hiTom_5, - 23040, - 1.3, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_HIGHTOM, - MIDI_C3, - "S_hiTom_5", - DRUM_S_hiTom_5, - 23040, - 1.6, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_CIS3, - "S_splash1_1", - DRUM_S_splash1_1, - 57856, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_HIGHTOM, - MIDI_D3, - "S_hiTom_5", - DRUM_S_hiTom_5, - 23040, - 1.9, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_CRASH, - MIDI_DIS3, - "S_china1_4", - DRUM_S_china1_4, - 75840, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_CRASH, - MIDI_E3, - "S_china2_1", - DRUM_S_china2_1, - 68864, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_RIDE, - MIDI_F3, - "S_ride1Bell_1", - DRUM_S_ride1Bell_1, - 58752, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_RIDE, - MIDI_FIS3, - "S_ride1Bell_1", - DRUM_S_ride1Bell_1, - 58752, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_CRASH, - MIDI_G3, - "S_crash1_1", - DRUM_S_crash1_1, - 112064, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_GIS3, - "S_cowbell_2", - DRUM_S_cowbell_2, - 18368, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_RIDE, - MIDI_A3, - "S_ride2Crash_2", - DRUM_S_ride2Crash_2, - 132160, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_RIDE, - MIDI_AIS3, - "S_ride2_1", - DRUM_S_ride2_1, - 77504, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_B3, - "808Kick", - DRUM_808Kick, - 26688, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_C4, - "phkick1", - DRUM_phkick1, - 4800, - 1.0, - 0.0, - 1.0, - 0.0, - 0.0 - }, - { - DRUM_SNARE, - MIDI_CIS4, - "rims1", - DRUM_rims1, - 768, - 1.0, - -0.2, - 0.7, - 0.0, - 0.0 - }, - { - DRUM_SNARE, - MIDI_D4, - "Shaker", - DRUM_Shaker, - 1792, - 1.0, - -0.2, - 0.5, - 0.0, - 0.0 - }, - { - DRUM_HANDCLAP, - MIDI_DIS4, - "LNclap1", - DRUM_LNclap1, - 6976, - 1.0, - 0.1, - 0.9, - 0.0, - 0.1 - }, - { - DRUM_SNARE, - MIDI_E4, - "LNsnare1", - DRUM_LNsnare1, - 10560, - 1.0, - 0.0, - 0.9, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_F4, - "Bdtrancy", - DRUM_Bdtrancy, - 7872, - 1.0, - 0.0, - 0.9, - 0.0, - 0.0 - }, - { - DRUM_HIHAT, - MIDI_FIS4, - "hhcl1", - DRUM_hhcl1, - 6208, - 1.0, - 1.0, - 0.6, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_G4, - "Belltree", - DRUM_Belltree, - 121408, - 1.0, - 0.0, - 0.7, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_GIS4, - "Bongo16", - DRUM_Bongo16, - 6464, - 1.0, - 0.0, - 0.9, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_A4, - "Bongo27", - DRUM_Bongo27, - 11712, - 1.0, - 0.0, - 0.9, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_AIS4, - "Casta", - DRUM_Casta, - 2048, - 1.0, - 0.0, - 0.9, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_B4, - "Cr78kick", - DRUM_Cr78kick, - 10048, - 1.0, - 0.0, - 1.0, - 0.0, - 0.0 - }, - { - DRUM_HIHAT, - MIDI_C5, - "Cr78tmb1", - DRUM_Cr78tmb1, - 7552, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_HIHAT, - MIDI_CIS5, - "Cr78tmb2", - DRUM_Cr78tmb2, - 10880, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_D5, - "Crash1", - DRUM_Crash1, - 72768, - 1.0, - 0.0, - 0.9, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_DIS5, - "Dmpop", - DRUM_Dmpop, - 7808, - 1.0, - 0.0, - 0.9, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_E5, - "Electr1", - DRUM_Electr1, - 2880, - 1.0, - 0.0, - 0.9, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_F5, - "Excow", - DRUM_Excow, - 18368, - 1.0, - 0.0, - 0.9, - 0.0, - 0.0 - }, - { - DRUM_PERCUSSION, - MIDI_FIS5, - "Tamb", - DRUM_Tamb, - 8128, - 1.0, - -0.2, - 0.6, - 0.0, - 0.0 - }, - { - DRUM_PERCUSSION, - MIDI_GIS5, - "Cowbell", - DRUM_Cowbell, - 7296, - 1.0, - 0.2, - 0.6, - 0.0, - 0.0 - }, - { - DRUM_HIHAT, - MIDI_G5, - "660HatC1", - DRUM_660HatC1, - 5952, - 1.0, - 0.0, - 0.6, - 0.0, - 0.0 - }, - { - DRUM_HIHAT, - MIDI_A5, - "Hhopen1", - DRUM_Hhopen1, - 11200, - 1.0, - 0.0, - 0.6, - 0.0, - 0.0 - }, - { - DRUM_PERCUSSION, - MIDI_AIS5, - "Histicks", - DRUM_Histicks, - 2432, - 1.0, - 0.0, - 0.6, - 0.0, - 0.0 - }, - { - DRUM_PERCUSSION, - MIDI_B5, - "Hr16snr2", - DRUM_Hr16snr2, - 15168, - 1.0, - 0.0, - 0.6, - 0.0, - 0.0 - }, - { - DRUM_HIGHTOM, - MIDI_C6, - "Xrhitom", - DRUM_Xrhitom, - 13504, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_PERCUSSION, - MIDI_CIS6, - "Tick1", - DRUM_Tick1, - 640, - 1.0, - 0.0, - 0.9, - 0.0, - 0.0 - }, - { - DRUM_PERCUSSION, - MIDI_D6, - "M1-18", - DRUM_M1_18, - 2240, - 1.0, - 0.0, - 0.9, - 0.0, - 0.0 - }, - { - DRUM_PERCUSSION, - MIDI_DIS6, - "Md16_clp", - DRUM_Md16_clp, - 13312, - 1.0, - 0.0, - 0.9, - 0.0, - 0.0 - }, - { - DRUM_HIHAT, - MIDI_E6, - "Ohhwav", - DRUM_Ohhwav, - 23488, - 1.0, - 0.0, - 0.9, - 0.0, - 0.0 - }, - { - DRUM_PERCUSSION, - MIDI_F6, - "Quijada", - DRUM_Quijada, - 36096, - 1.0, - 0.0, - 0.9, - 0.0, - 0.0 - }, - { - DRUM_PERCUSSION, - MIDI_FIS6, - "tabla1", - DRUM_tabla1, - 15488, - 1.0, - 0.0, - 0.9, - 0.0, - 0.0 - }, - { - DRUM_PERCUSSION, - MIDI_G6, - "Ride808", - DRUM_Ride808, - 21696, - 1.0, - 0.0, - 0.9, - 0.0, - 0.0 - }, - { - DRUM_PERCUSSION, - MIDI_GIS6, - "Scratch1", - DRUM_Scratch1, - 5888, - 1.0, - 0.0, - 0.7, - 0.0, - 0.0 - }, - { - DRUM_PERCUSSION, - MIDI_A6, - "Tomlow", - DRUM_Tomlow, - 15360, - 1.0, - 0.0, - 0.9, - 0.0, - 0.0 - }, - { - DRUM_PERCUSSION, - MIDI_AIS6, - "Tom808", - DRUM_Tom808, - 6272, - 1.0, - 0.0, - 0.9, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_B6, - "Vl1lbeep", - DRUM_Vl1lbeep, - 3008, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_BASS, - MIDI_C7, - "Vl1hbeep", - DRUM_Vl1hbeep, - 1984, - 1.0, - 0.0, - 0.8, - 0.0, - 0.0 - }, - { - DRUM_NONE, - 0, - "EMPTY", - NULL, - "-", - 0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - } -}; -PROGMEM const uint8_t DRUM_Clap808[]; -PROGMEM const uint8_t DRUM_S_kick_1[]; -PROGMEM const uint8_t DRUM_S_kick2_8[]; -PROGMEM const uint8_t DRUM_S_Stick_1[]; -PROGMEM const uint8_t DRUM_S_snare_Ghost_1[]; -PROGMEM const uint8_t DRUM_S_snare2_Ghost_1[]; -PROGMEM const uint8_t DRUM_S_snare_2[]; -PROGMEM const uint8_t DRUM_S_loTom_1[]; -PROGMEM const uint8_t DRUM_S_hhClosed_1[]; -PROGMEM const uint8_t DRUM_S_hh_o_1_2[]; -PROGMEM const uint8_t DRUM_S_hiTom_5[]; -PROGMEM const uint8_t DRUM_S_hh_o_5_4[]; -PROGMEM const uint8_t DRUM_S_splash1_1[]; -PROGMEM const uint8_t DRUM_S_china1_4[]; -PROGMEM const uint8_t DRUM_S_china2_1[]; -PROGMEM const uint8_t DRUM_S_ride1Bell_1[]; -PROGMEM const uint8_t DRUM_S_crash1_1[]; -PROGMEM const uint8_t DRUM_S_cowbell_2[]; -PROGMEM const uint8_t DRUM_S_ride2Crash_2[]; -PROGMEM const uint8_t DRUM_S_ride2_1[]; -PROGMEM const uint8_t DRUM_808Kick[]; -PROGMEM const uint8_t DRUM_phkick1[]; -PROGMEM const uint8_t DRUM_rims1[]; -PROGMEM const uint8_t DRUM_Shaker[]; -PROGMEM const uint8_t DRUM_LNclap1[]; -PROGMEM const uint8_t DRUM_LNsnare1[]; -PROGMEM const uint8_t DRUM_Bdtrancy[]; -PROGMEM const uint8_t DRUM_hhcl1[]; -PROGMEM const uint8_t DRUM_Belltree[]; -PROGMEM const uint8_t DRUM_Bongo16[]; -PROGMEM const uint8_t DRUM_Bongo27[]; -PROGMEM const uint8_t DRUM_Casta[]; -PROGMEM const uint8_t DRUM_Cr78kick[]; -PROGMEM const uint8_t DRUM_Cr78tmb1[]; -PROGMEM const uint8_t DRUM_Cr78tmb2[]; -PROGMEM const uint8_t DRUM_Crash1[]; -PROGMEM const uint8_t DRUM_Dmpop[]; -PROGMEM const uint8_t DRUM_Electr1[]; -PROGMEM const uint8_t DRUM_Excow[]; -PROGMEM const uint8_t DRUM_Tamb[]; -PROGMEM const uint8_t DRUM_Cowbell[]; -PROGMEM const uint8_t DRUM_660HatC1[]; -PROGMEM const uint8_t DRUM_Hhopen1[]; -PROGMEM const uint8_t DRUM_Histicks[]; -PROGMEM const uint8_t DRUM_Hr16snr2[]; -PROGMEM const uint8_t DRUM_Xrhitom[]; -PROGMEM const uint8_t DRUM_Tick1[]; -PROGMEM const uint8_t DRUM_M1_18[]; -PROGMEM const uint8_t DRUM_Md16_clp[]; -PROGMEM const uint8_t DRUM_Ohhwav[]; -PROGMEM const uint8_t DRUM_Quijada[]; -PROGMEM const uint8_t DRUM_tabla1[]; -PROGMEM const uint8_t DRUM_Ride808[]; -PROGMEM const uint8_t DRUM_Scratch1[]; -PROGMEM const uint8_t DRUM_Tomlow[]; -PROGMEM const uint8_t DRUM_Tom808[]; -PROGMEM const uint8_t DRUM_Vl1lbeep[]; -PROGMEM const uint8_t DRUM_Vl1hbeep[]; - // Converted from Clap808.wav, length = 7744 bytes PROGMEM const uint8_t DRUM_Clap808[] = { 0x8e, 0xff, 0x10, 0x00, 0xc2, 0xff, 0x5b, 0x00, @@ -359360,4 +358529,777 @@ PROGMEM const uint8_t DRUM_Vl1hbeep[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +PROGMEM const drum_config_t drum_config[NUM_DRUMSET_CONFIG] = +{ + { + DRUM_BASS, + MIDI_A1, + "Clap808", + DRUM_Clap808, + 7744, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_B1, + "S_kick_1", + DRUM_S_kick_1, + 19520, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_C2, + "S_kick2_8", + DRUM_S_kick2_8, + 19200, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_PERCUSSION, + MIDI_CIS2, + "S_Stick_1", + DRUM_S_Stick_1, + 10432, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_SNARE, + MIDI_D2, + "S_snare_Ghost_1", + DRUM_S_snare_Ghost_1, + 19008, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_SNARE, + MIDI_DIS2, + "S_snare2_Ghost_1", + DRUM_S_snare2_Ghost_1, + 22464, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_SNARE, + MIDI_E2, + "S_snare_2", + DRUM_S_snare_2, + 17920, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_F2, + "S_loTom_1", + DRUM_S_loTom_1, + 40320, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_HIHAT, + MIDI_FIS2, + "S_hhClosed_1", + DRUM_S_hhClosed_1, + 6784, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_LOWTOM, + MIDI_G2, + "S_loTom_1", + DRUM_S_loTom_1, + 40320, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_HIHAT, + MIDI_GIS2, + "S_hh_o_1_2", + DRUM_S_hh_o_1_2, + 18240, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_HIGHTOM, + MIDI_A2, + "S_hiTom_5", + DRUM_S_hiTom_5, + 23040, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_AIS2, + "S_hh_o_5_4", + DRUM_S_hh_o_5_4, + 80320, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_HIGHTOM, + MIDI_B2, + "S_hiTom_5", + DRUM_S_hiTom_5, + 23040, + 1.3, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_HIGHTOM, + MIDI_C3, + "S_hiTom_5", + DRUM_S_hiTom_5, + 23040, + 1.6, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_CIS3, + "S_splash1_1", + DRUM_S_splash1_1, + 57856, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_HIGHTOM, + MIDI_D3, + "S_hiTom_5", + DRUM_S_hiTom_5, + 23040, + 1.9, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_CRASH, + MIDI_DIS3, + "S_china1_4", + DRUM_S_china1_4, + 75840, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_CRASH, + MIDI_E3, + "S_china2_1", + DRUM_S_china2_1, + 68864, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_RIDE, + MIDI_F3, + "S_ride1Bell_1", + DRUM_S_ride1Bell_1, + 58752, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_RIDE, + MIDI_FIS3, + "S_ride1Bell_1", + DRUM_S_ride1Bell_1, + 58752, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_CRASH, + MIDI_G3, + "S_crash1_1", + DRUM_S_crash1_1, + 112064, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_GIS3, + "S_cowbell_2", + DRUM_S_cowbell_2, + 18368, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_RIDE, + MIDI_A3, + "S_ride2Crash_2", + DRUM_S_ride2Crash_2, + 132160, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_RIDE, + MIDI_AIS3, + "S_ride2_1", + DRUM_S_ride2_1, + 77504, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_B3, + "808Kick", + DRUM_808Kick, + 26688, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_C4, + "phkick1", + DRUM_phkick1, + 4800, + 1, + 0, + 1, + 0, + 0 + }, + { + DRUM_SNARE, + MIDI_CIS4, + "rims1", + DRUM_rims1, + 768, + 1, + -0.2, + 0.7, + 0, + 0 + }, + { + DRUM_SNARE, + MIDI_D4, + "Shaker", + DRUM_Shaker, + 1792, + 1, + -0.2, + 0.5, + 0, + 0 + }, + { + DRUM_HANDCLAP, + MIDI_DIS4, + "LNclap1", + DRUM_LNclap1, + 6976, + 1, + 0.1, + 0.9, + 0, + 0.1 + }, + { + DRUM_SNARE, + MIDI_E4, + "LNsnare1", + DRUM_LNsnare1, + 10560, + 1, + 0, + 0.9, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_F4, + "Bdtrancy", + DRUM_Bdtrancy, + 7872, + 1, + 0, + 0.9, + 0, + 0 + }, + { + DRUM_HIHAT, + MIDI_FIS4, + "hhcl1", + DRUM_hhcl1, + 6208, + 1, + 1, + 0.6, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_G4, + "Belltree", + DRUM_Belltree, + 121408, + 1, + 0, + 0.7, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_GIS4, + "Bongo16", + DRUM_Bongo16, + 6464, + 1, + 0, + 0.9, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_A4, + "Bongo27", + DRUM_Bongo27, + 11712, + 1, + 0, + 0.9, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_AIS4, + "Casta", + DRUM_Casta, + 2048, + 1, + 0, + 0.9, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_B4, + "Cr78kick", + DRUM_Cr78kick, + 10048, + 1, + 0, + 1, + 0, + 0 + }, + { + DRUM_HIHAT, + MIDI_C5, + "Cr78tmb1", + DRUM_Cr78tmb1, + 7552, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_HIHAT, + MIDI_CIS5, + "Cr78tmb2", + DRUM_Cr78tmb2, + 10880, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_D5, + "Crash1", + DRUM_Crash1, + 72768, + 1, + 0, + 0.9, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_DIS5, + "Dmpop", + DRUM_Dmpop, + 7808, + 1, + 0, + 0.9, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_E5, + "Electr1", + DRUM_Electr1, + 2880, + 1, + 0, + 0.9, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_F5, + "Excow", + DRUM_Excow, + 18368, + 1, + 0, + 0.9, + 0, + 0 + }, + { + DRUM_PERCUSSION, + MIDI_FIS5, + "Tamb", + DRUM_Tamb, + 8128, + 1, + -0.2, + 0.6, + 0, + 0 + }, + { + DRUM_PERCUSSION, + MIDI_GIS5, + "Cowbell", + DRUM_Cowbell, + 7296, + 1, + 0.2, + 0.6, + 0, + 0 + }, + { + DRUM_HIHAT, + MIDI_G5, + "660HatC1", + DRUM_660HatC1, + 5952, + 1, + 0, + 0.6, + 0, + 0 + }, + { + DRUM_HIHAT, + MIDI_A5, + "Hhopen1", + DRUM_Hhopen1, + 11200, + 1, + 0, + 0.6, + 0, + 0 + }, + { + DRUM_PERCUSSION, + MIDI_AIS5, + "Histicks", + DRUM_Histicks, + 2432, + 1, + 0, + 0.6, + 0, + 0 + }, + { + DRUM_PERCUSSION, + MIDI_B5, + "Hr16snr2", + DRUM_Hr16snr2, + 15168, + 1, + 0, + 0.6, + 0, + 0 + }, + { + DRUM_HIGHTOM, + MIDI_C6, + "Xrhitom", + DRUM_Xrhitom, + 13504, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_PERCUSSION, + MIDI_CIS6, + "Tick1", + DRUM_Tick1, + 640, + 1, + 0, + 0.9, + 0, + 0 + }, + { + DRUM_PERCUSSION, + MIDI_D6, + "M1-18", + DRUM_M1_18, + 2240, + 1, + 0, + 0.9, + 0, + 0 + }, + { + DRUM_PERCUSSION, + MIDI_DIS6, + "Md16_clp", + DRUM_Md16_clp, + 13312, + 1, + 0, + 0.9, + 0, + 0 + }, + { + DRUM_HIHAT, + MIDI_E6, + "Ohhwav", + DRUM_Ohhwav, + 23488, + 1, + 0, + 0.9, + 0, + 0 + }, + { + DRUM_PERCUSSION, + MIDI_F6, + "Quijada", + DRUM_Quijada, + 36096, + 1, + 0, + 0.9, + 0, + 0 + }, + { + DRUM_PERCUSSION, + MIDI_FIS6, + "tabla1", + DRUM_tabla1, + 15488, + 1, + 0, + 0.9, + 0, + 0 + }, + { + DRUM_PERCUSSION, + MIDI_G6, + "Ride808", + DRUM_Ride808, + 21696, + 1, + 0, + 0.9, + 0, + 0 + }, + { + DRUM_PERCUSSION, + MIDI_GIS6, + "Scratch1", + DRUM_Scratch1, + 5888, + 1, + 0, + 0.7, + 0, + 0 + }, + { + DRUM_PERCUSSION, + MIDI_A6, + "Tomlow", + DRUM_Tomlow, + 15360, + 1, + 0, + 0.9, + 0, + 0 + }, + { + DRUM_PERCUSSION, + MIDI_AIS6, + "Tom808", + DRUM_Tom808, + 6272, + 1, + 0, + 0.9, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_B6, + "Vl1lbeep", + DRUM_Vl1lbeep, + 3008, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_BASS, + MIDI_C7, + "Vl1hbeep", + DRUM_Vl1hbeep, + 1984, + 1, + 0, + 0.8, + 0, + 0 + }, + { + DRUM_NONE, + 0, + "EMPTY", + NULL, + 0, + 0.0, + 0.0, + 0.0, + 0.0, + 0.0 + } +}; + #endif diff --git a/addon/tools/wav2c.sh b/addon/tools/wav2c.sh index 926e780..004160d 100755 --- a/addon/tools/wav2c.sh +++ b/addon/tools/wav2c.sh @@ -56,7 +56,7 @@ while [[ $# -gt 0 ]]; do shift # past value ;; -w|--wavs) - WAV_DIR="$2" + WAV_DIR=$(echo "$2" | sed 's/\/$//') shift # past argument shift # past value ;; @@ -108,7 +108,6 @@ typedef struct drum_config_s { uint8_t midinote; // Triggered by note char name[DRUM_NAME_LEN]; const uint8_t* drum_data; - char shortname[2]; // 1 char namer uint32_t len; // number of elements in drum_data float32_t pitch; // variable pitch per note float32_t pan; // Panorama (-1.0 - +1.0) @@ -143,13 +142,12 @@ do sample['name']=`echo "${samplecfg[2]}" | xargs` sample['c_name']=`echo "${samplecfg[2]}" | xargs | sed 's/[^a-zA-Z0-9]/_/g'` sample['c_name']=`echo "DRUM_${sample[c_name]}"` - sample['shortname']=`echo "${samplecfg[3]}" | xargs` - sample['pitch']=`echo "${samplecfg[4]}" | xargs` - sample['pan']=`echo "${samplecfg[5]}" | xargs` - sample['vol_max']=`echo "${samplecfg[6]}" | xargs` - sample['vol_min']=`echo "${samplecfg[7]}" | xargs` - sample['reverb_send']=`echo "${samplecfg[8]}" | xargs` - sample['filename']=`echo "${samplecfg[9]}" | xargs` + sample['pitch']=`echo "${samplecfg[3]}" | xargs` + sample['pan']=`echo "${samplecfg[4]}" | xargs` + sample['vol_max']=`echo "${samplecfg[5]}" | xargs` + sample['vol_min']=`echo "${samplecfg[6]}" | xargs` + sample['reverb_send']=`echo "${samplecfg[7]}" | xargs` + sample['filename']=`echo "${samplecfg[8]}" | xargs` if [ -f "${WAV_DIR}/${sample['filename']}" ] then @@ -229,7 +227,6 @@ do ${sample[midinote]}, "${sample[name]}", ${sample[c_name]}, - "${sample[shortname]}", ${sample[len]}, ${sample[pitch]}, ${sample[pan]}, @@ -258,7 +255,6 @@ cat >> "${DRUMS_H}" << EOF 0, "EMPTY", NULL, - "-", 0, 0.0, 0.0, diff --git a/drumset.h b/drumset.h index 3f102be..879d3da 100644 --- a/drumset.h +++ b/drumset.h @@ -9,7 +9,6 @@ typedef struct drum_config_s { uint8_t midinote; // Triggered by note char name[DRUM_NAME_LEN]; const uint8_t* drum_data; - char shortname[2]; // 1 char namer uint32_t len; // number of elements in drum_data float32_t pitch; // variable pitch per note float32_t pan; // Panorama (-1.0 - +1.0) @@ -358537,389 +358536,359 @@ PROGMEM const drum_config_t drum_config[NUM_DRUMSET_CONFIG] = { MIDI_A1, "Clap808", DRUM_Clap808, - "B", 7744, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_B1, "S_kick_1", DRUM_S_kick_1, - "B", 19520, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_C2, "S_kick2_8", DRUM_S_kick2_8, - "B", 19200, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_PERCUSSION, MIDI_CIS2, "S_Stick_1", DRUM_S_Stick_1, - "B", 10432, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_SNARE, MIDI_D2, "S_snare_Ghost_1", DRUM_S_snare_Ghost_1, - "B", 19008, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_SNARE, MIDI_DIS2, "S_snare2_Ghost_1", DRUM_S_snare2_Ghost_1, - "B", 22464, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_SNARE, MIDI_E2, "S_snare_2", DRUM_S_snare_2, - "B", 17920, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_F2, "S_loTom_1", DRUM_S_loTom_1, - "B", 40320, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_HIHAT, MIDI_FIS2, "S_hhClosed_1", DRUM_S_hhClosed_1, - "B", 6784, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_LOWTOM, MIDI_G2, "S_loTom_1", DRUM_S_loTom_1, - "B", 40320, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_HIHAT, MIDI_GIS2, "S_hh_o_1_2", DRUM_S_hh_o_1_2, - "B", 18240, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_HIGHTOM, MIDI_A2, "S_hiTom_5", DRUM_S_hiTom_5, - "B", 23040, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_AIS2, "S_hh_o_5_4", DRUM_S_hh_o_5_4, - "B", 80320, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_HIGHTOM, MIDI_B2, "S_hiTom_5", DRUM_S_hiTom_5, - "B", 23040, 1.3, - 0.0, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_HIGHTOM, MIDI_C3, "S_hiTom_5", DRUM_S_hiTom_5, - "B", 23040, 1.6, - 0.0, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_CIS3, "S_splash1_1", DRUM_S_splash1_1, - "B", 57856, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_HIGHTOM, MIDI_D3, "S_hiTom_5", DRUM_S_hiTom_5, - "B", 23040, 1.9, - 0.0, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_CRASH, MIDI_DIS3, "S_china1_4", DRUM_S_china1_4, - "B", 75840, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_CRASH, MIDI_E3, "S_china2_1", DRUM_S_china2_1, - "B", 68864, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_RIDE, MIDI_F3, "S_ride1Bell_1", DRUM_S_ride1Bell_1, - "B", 58752, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_RIDE, MIDI_FIS3, "S_ride1Bell_1", DRUM_S_ride1Bell_1, - "B", 58752, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_CRASH, MIDI_G3, "S_crash1_1", DRUM_S_crash1_1, - "B", 112064, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_GIS3, "S_cowbell_2", DRUM_S_cowbell_2, - "B", 18368, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_RIDE, MIDI_A3, "S_ride2Crash_2", DRUM_S_ride2Crash_2, - "B", 132160, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_RIDE, MIDI_AIS3, "S_ride2_1", DRUM_S_ride2_1, - "B", 77504, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_B3, "808Kick", DRUM_808Kick, - "B", 26688, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_C4, "phkick1", DRUM_phkick1, - "B", 4800, - 1.0, - 0.0, - 1.0, - 0.0, - 0.0 + 1, + 0, + 1, + 0, + 0 }, { DRUM_SNARE, MIDI_CIS4, "rims1", DRUM_rims1, - "R", 768, - 1.0, + 1, -0.2, 0.7, - 0.0, - 0.0 + 0, + 0 }, { DRUM_SNARE, MIDI_D4, "Shaker", DRUM_Shaker, - "R", 1792, - 1.0, + 1, -0.2, 0.5, - 0.0, - 0.0 + 0, + 0 }, { DRUM_HANDCLAP, MIDI_DIS4, "LNclap1", DRUM_LNclap1, - "C", 6976, - 1.0, + 1, 0.1, 0.9, - 0.0, + 0, 0.1 }, { @@ -358927,436 +358896,402 @@ PROGMEM const drum_config_t drum_config[NUM_DRUMSET_CONFIG] = { MIDI_E4, "LNsnare1", DRUM_LNsnare1, - "S", 10560, - 1.0, - 0.0, + 1, + 0, 0.9, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_F4, "Bdtrancy", DRUM_Bdtrancy, - "B", 7872, - 1.0, - 0.0, + 1, + 0, 0.9, - 0.0, - 0.0 + 0, + 0 }, { DRUM_HIHAT, MIDI_FIS4, "hhcl1", DRUM_hhcl1, - "H", 6208, - 1.0, - 1.0, + 1, + 1, 0.6, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_G4, "Belltree", DRUM_Belltree, - "B", 121408, - 1.0, - 0.0, + 1, + 0, 0.7, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_GIS4, "Bongo16", DRUM_Bongo16, - "B", 6464, - 1.0, - 0.0, + 1, + 0, 0.9, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_A4, "Bongo27", DRUM_Bongo27, - "B", 11712, - 1.0, - 0.0, + 1, + 0, 0.9, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_AIS4, "Casta", DRUM_Casta, - "B", 2048, - 1.0, - 0.0, + 1, + 0, 0.9, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_B4, "Cr78kick", DRUM_Cr78kick, - "B", 10048, - 1.0, - 0.0, - 1.0, - 0.0, - 0.0 + 1, + 0, + 1, + 0, + 0 }, { DRUM_HIHAT, MIDI_C5, "Cr78tmb1", DRUM_Cr78tmb1, - "B", 7552, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_HIHAT, MIDI_CIS5, "Cr78tmb2", DRUM_Cr78tmb2, - "B", 10880, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_D5, "Crash1", DRUM_Crash1, - "B", 72768, - 1.0, - 0.0, + 1, + 0, 0.9, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_DIS5, "Dmpop", DRUM_Dmpop, - "B", 7808, - 1.0, - 0.0, + 1, + 0, 0.9, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_E5, "Electr1", DRUM_Electr1, - "B", 2880, - 1.0, - 0.0, + 1, + 0, 0.9, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_F5, "Excow", DRUM_Excow, - "B", 18368, - 1.0, - 0.0, + 1, + 0, 0.9, - 0.0, - 0.0 + 0, + 0 }, { DRUM_PERCUSSION, MIDI_FIS5, "Tamb", DRUM_Tamb, - "T", 8128, - 1.0, + 1, -0.2, 0.6, - 0.0, - 0.0 + 0, + 0 }, { DRUM_PERCUSSION, MIDI_GIS5, "Cowbell", DRUM_Cowbell, - "S", 7296, - 1.0, + 1, 0.2, 0.6, - 0.0, - 0.0 + 0, + 0 }, { DRUM_HIHAT, MIDI_G5, "660HatC1", DRUM_660HatC1, - "T", 5952, - 1.0, - 0.0, + 1, + 0, 0.6, - 0.0, - 0.0 + 0, + 0 }, { DRUM_HIHAT, MIDI_A5, "Hhopen1", DRUM_Hhopen1, - "S", 11200, - 1.0, - 0.0, + 1, + 0, 0.6, - 0.0, - 0.0 + 0, + 0 }, { DRUM_PERCUSSION, MIDI_AIS5, "Histicks", DRUM_Histicks, - "S", 2432, - 1.0, - 0.0, + 1, + 0, 0.6, - 0.0, - 0.0 + 0, + 0 }, { DRUM_PERCUSSION, MIDI_B5, "Hr16snr2", DRUM_Hr16snr2, - "S", 15168, - 1.0, - 0.0, + 1, + 0, 0.6, - 0.0, - 0.0 + 0, + 0 }, { DRUM_HIGHTOM, MIDI_C6, "Xrhitom", DRUM_Xrhitom, - "B", 13504, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_PERCUSSION, MIDI_CIS6, "Tick1", DRUM_Tick1, - "S", 640, - 1.0, - 0.0, + 1, + 0, 0.9, - 0.0, - 0.0 + 0, + 0 }, { DRUM_PERCUSSION, MIDI_D6, "M1-18", DRUM_M1_18, - "S", 2240, - 1.0, - 0.0, + 1, + 0, 0.9, - 0.0, - 0.0 + 0, + 0 }, { DRUM_PERCUSSION, MIDI_DIS6, "Md16_clp", DRUM_Md16_clp, - "S", 13312, - 1.0, - 0.0, + 1, + 0, 0.9, - 0.0, - 0.0 + 0, + 0 }, { DRUM_HIHAT, MIDI_E6, "Ohhwav", DRUM_Ohhwav, - "S", 23488, - 1.0, - 0.0, + 1, + 0, 0.9, - 0.0, - 0.0 + 0, + 0 }, { DRUM_PERCUSSION, MIDI_F6, "Quijada", DRUM_Quijada, - "S", 36096, - 1.0, - 0.0, + 1, + 0, 0.9, - 0.0, - 0.0 + 0, + 0 }, { DRUM_PERCUSSION, MIDI_FIS6, "tabla1", DRUM_tabla1, - "S", 15488, - 1.0, - 0.0, + 1, + 0, 0.9, - 0.0, - 0.0 + 0, + 0 }, { DRUM_PERCUSSION, MIDI_G6, "Ride808", DRUM_Ride808, - "S", 21696, - 1.0, - 0.0, + 1, + 0, 0.9, - 0.0, - 0.0 + 0, + 0 }, { DRUM_PERCUSSION, MIDI_GIS6, "Scratch1", DRUM_Scratch1, - "S", 5888, - 1.0, - 0.0, + 1, + 0, 0.7, - 0.0, - 0.0 + 0, + 0 }, { DRUM_PERCUSSION, MIDI_A6, "Tomlow", DRUM_Tomlow, - "S", 15360, - 1.0, - 0.0, + 1, + 0, 0.9, - 0.0, - 0.0 + 0, + 0 }, { DRUM_PERCUSSION, MIDI_AIS6, "Tom808", DRUM_Tom808, - "S", 6272, - 1.0, - 0.0, + 1, + 0, 0.9, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_B6, "Vl1lbeep", DRUM_Vl1lbeep, - "B", 3008, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_BASS, MIDI_C7, "Vl1hbeep", DRUM_Vl1hbeep, - "B", 1984, - 1.0, - 0.0, + 1, + 0, 0.8, - 0.0, - 0.0 + 0, + 0 }, { DRUM_NONE, 0, "EMPTY", NULL, - "-", 0, 0.0, 0.0,