Fixes for drumset.h

MicroDexed.ino

@@ -22,17 +22,6 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-/*
-  TODO
-  #if defined(ARDUINO_TEENSY41)
-  #define NUM_DRUMSET_CONFIG 71
-  #elif defined(ARDUINO_TEENSY40)
-  #define NUM_DRUMSET_CONFIG 47
-  #else
-  #define NUM_DRUMSET_CONFIG 19
-  #endif
-*/
-
 #include <limits.h>
 #include "config.h"
 #include <Audio.h>

config.h

@@ -122,7 +122,7 @@
 
 // NUMBER OF SAMPLES IN DRUMSET
 #if defined(ARDUINO_TEENSY41)
-#define NUM_DRUMSET_CONFIG 71
+#define NUM_DRUMSET_CONFIG 69 
 #elif defined(ARDUINO_TEENSY40)
 #define NUM_DRUMSET_CONFIG 47
 #else

drumset.h

@@ -5338,8 +5338,7 @@ PROGMEM const uint8_t DRUM_SQBass[] = {
   0x00, 0x00, 0xfa, 0xff, 0x01, 0x00, 0xfa, 0xff, 0x00, 0x00, 0xfc, 0xff,
   0xfe, 0xff, 0x00, 0x00, 0xfc, 0xff, 0x01, 0x00, 0xfd, 0xff, 0xff, 0xff,
   0x01, 0x00, 0xfc, 0xff, 0x02, 0x00, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00
-  , 0x00, 0x00, 0x00, 0x00,
+,0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from I_CALLIOP.wav, length = 45056 bytes
 PROGMEM const uint8_t DRUM_CALLIOP[] = {
   0x95, 0x03, 0x2b, 0x24, 0x6a, 0x46, 0xd9, 0x57, 0x59, 0x58, 0xa8, 0x54,
@@ -16404,8 +16403,7 @@ PROGMEM const uint8_t DRUM_ARR1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00,
+0x00, 0x00, };
-};
 // Converted from I_FVoicG2.wav, length = 39040 bytes
 PROGMEM const uint8_t DRUM_FVoice[] = {
   0x00, 0x00, 0x0e, 0x00, 0x10, 0x00, 0xfd, 0xff, 0xd9, 0xff, 0xb6, 0xff,
@@ -22920,8 +22918,7 @@ PROGMEM const uint8_t DRUM_FVoice[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00,
+0x00, 0x00, };
-};
 // Converted from S_kick_1.wav, length = 19520 bytes
 PROGMEM const uint8_t DRUM_Clap808[] = {
   0x6c, 0x00, 0x9c, 0x00, 0xd9, 0x00, 0x2e, 0x01, 0xae, 0x01, 0x88, 0x02,
@@ -31134,8 +31131,7 @@ PROGMEM const uint8_t DRUM_S_Stick_1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from S_snare_Ghost_1.wav, length = 19008 bytes
 PROGMEM const uint8_t DRUM_S_snare_Ghost_1[] = {
   0xf6, 0xff, 0xf6, 0xff, 0xf6, 0xff, 0xf0, 0xff, 0xf2, 0xff, 0xee, 0xff,
@@ -34309,8 +34305,7 @@ PROGMEM const uint8_t DRUM_S_snare_Ghost_1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from S_snare2_Ghost_1.wav, length = 22464 bytes
 PROGMEM const uint8_t DRUM_S_snare2_Ghost_1[] = {
   0x09, 0x00, 0x3f, 0x00, 0x79, 0x00, 0xce, 0x01, 0x1b, 0x06, 0x2c, 0x0e,
@@ -41053,8 +41048,7 @@ PROGMEM const uint8_t DRUM_S_snare_2[] = {
 ,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from S_loTom_1.wav, length = 40320 bytes
 PROGMEM const uint8_t DRUM_S_loTom_1[] = {
   0x4e, 0x00, 0x59, 0x00, 0x58, 0x00, 0x57, 0x00, 0x5e, 0x00, 0x53, 0x00,
@@ -47781,8 +47775,7 @@ PROGMEM const uint8_t DRUM_S_loTom_1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from S_hhClosed_1.wav, length = 6784 bytes
 PROGMEM const uint8_t DRUM_S_hhClosed_1[] = {
   0xd4, 0x00, 0xca, 0xff, 0x86, 0x01, 0x89, 0xff, 0x13, 0x01, 0x37, 0xfe,
@@ -51966,8 +51959,7 @@ PROGMEM const uint8_t DRUM_S_hh_o_1_2[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from S_hiTom_5.wav, length = 23040 bytes
 PROGMEM const uint8_t DRUM_S_hiTom_5[] = {
   0x46, 0x00, 0x8e, 0x00, 0x3f, 0x00, 0x9e, 0x00, 0x0e, 0x00, 0x6b, 0x00,
@@ -55811,8 +55803,7 @@ PROGMEM const uint8_t DRUM_S_hiTom_5[] = {
 ,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00,
+0x00, 0x00, };
-};
 // Converted from S_hh_o_5_4.wav, length = 80320 bytes
 PROGMEM const uint8_t DRUM_S_hh_o_5_4[] = {
   0xb0, 0x00, 0xf6, 0xff, 0x55, 0x00, 0x82, 0xff, 0x45, 0x01, 0xf3, 0x00,
@@ -69203,8 +69194,7 @@ PROGMEM const uint8_t DRUM_S_hh_o_5_4[] = {
 ,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00,
+0x00, 0x00, };
-};
 // Converted from S_splash1_1.wav, length = 57856 bytes
 PROGMEM const uint8_t DRUM_S_splash1_1[] = {
   0x03, 0x00, 0x06, 0x00, 0x04, 0x00, 0x06, 0x00, 0x04, 0x00, 0x05, 0x00,
@@ -78852,8 +78842,7 @@ PROGMEM const uint8_t DRUM_S_splash1_1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from S_china1_4.wav, length = 75840 bytes
 PROGMEM const uint8_t DRUM_S_china1_4[] = {
   0xfa, 0xff, 0x01, 0x00, 0xfb, 0xff, 0x00, 0x00, 0xfd, 0xff, 0xff, 0xff,
@@ -102982,8 +102971,7 @@ PROGMEM const uint8_t DRUM_S_china2_1[] = {
   0x02, 0x00, 0xfc, 0xff, 0x04, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x01, 0x00,
   0xff, 0xff, 0x00, 0x00, 0x01, 0x00, 0xfe, 0xff, 0x02, 0x00, 0xff, 0xff,
   0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0x04, 0x00, 0xfc, 0xff
-  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from S_ride1Bell_1.wav, length = 58752 bytes
 PROGMEM const uint8_t DRUM_S_ride1Bell_1[] = {
   0x17, 0x00, 0xbe, 0xff, 0x69, 0x00, 0x5a, 0x00, 0x2d, 0x00, 0x70, 0x07,
@@ -112781,8 +112769,7 @@ PROGMEM const uint8_t DRUM_S_ride1Bell_1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00,
+0x00, 0x00, };
-};
 // Converted from S_crash1_1.wav, length = 112064 bytes
 PROGMEM const uint8_t DRUM_S_crash1_1[] = {
   0x24, 0x00, 0xdf, 0xff, 0x5f, 0x00, 0xb0, 0xff, 0xdd, 0x00, 0x6c, 0xfc,
@@ -134533,8 +134520,7 @@ PROGMEM const uint8_t DRUM_S_cowbell_2[] = {
 ,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00,
+0x00, 0x00, };
-};
 // Converted from S_ride2Crash_2.wav, length = 132160 bytes
 PROGMEM const uint8_t DRUM_S_ride2Crash_2[] = {
   0xf3, 0xfe, 0xe6, 0x00, 0x98, 0xfc, 0x84, 0x03, 0x91, 0x1c, 0x2d, 0xf3,
@@ -169493,8 +169479,7 @@ PROGMEM const uint8_t DRUM_S_ride2_1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00,
+0x00, 0x00, };
-};
 // Converted from Kick808.wav, length = 26688 bytes
 PROGMEM const uint8_t DRUM_808Kick[] = {
   0x08, 0x00, 0x0a, 0x00, 0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0xfe, 0xff,
@@ -173948,8 +173933,7 @@ PROGMEM const uint8_t DRUM_808Kick[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from phKick1.wav, length = 4800 bytes
 PROGMEM const uint8_t DRUM_phkick1[] = {
   0x02, 0x00, 0x51, 0xfd, 0x2d, 0x10, 0xce, 0xfc, 0xaa, 0xef, 0xed, 0xe4,
@@ -174754,8 +174738,7 @@ PROGMEM const uint8_t DRUM_phkick1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from Rim808.wav, length = 768 bytes
 PROGMEM const uint8_t DRUM_rims1[] = {
   0xe1, 0xff, 0x33, 0xff, 0xd3, 0xfd, 0x2d, 0xfd, 0x3e, 0xfc, 0xb9, 0xfa,
@@ -174891,8 +174874,7 @@ PROGMEM const uint8_t DRUM_rims1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from Shaker.wav, length = 1792 bytes
 PROGMEM const uint8_t DRUM_Shaker[] = {
   0x44, 0x00, 0x8d, 0xfb, 0xf2, 0x00, 0x64, 0x02, 0xc8, 0xfd, 0xa3, 0x00,
@@ -175197,8 +175179,7 @@ PROGMEM const uint8_t DRUM_Shaker[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00,
+0x00, 0x00, };
-};
 // Converted from LnClap.wav, length = 6976 bytes
 PROGMEM const uint8_t DRUM_LNclap1[] = {
   0x03, 0x00, 0xeb, 0xff, 0x4b, 0xfb, 0xf9, 0xf4, 0x3e, 0xee, 0x98, 0xea,
@@ -178134,8 +178115,7 @@ PROGMEM const uint8_t DRUM_LNsnare1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from BDTrancy.wav, length = 7872 bytes
 PROGMEM const uint8_t DRUM_Bdtrancy[] = {
   0xfe, 0xff, 0x9f, 0xfe, 0x31, 0xfc, 0x05, 0xfd, 0x0f, 0xfe, 0x82, 0xfa,
@@ -179450,8 +179430,7 @@ PROGMEM const uint8_t DRUM_Bdtrancy[] = {
   0xf8, 0xff, 0xf3, 0xff, 0xf9, 0xff, 0xf6, 0xff, 0xfb, 0xff, 0xf9, 0xff,
   0xfb, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xfc, 0xff, 0x02, 0x00, 0xfb, 0xff
 ,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from HhCL1-808.wav, length = 6208 bytes
 PROGMEM const uint8_t DRUM_hhcl1[] = {
   0xb1, 0xff, 0x6d, 0x00, 0x8c, 0xff, 0x6f, 0x00, 0x75, 0xff, 0xc9, 0x00,
@@ -180492,8 +180471,7 @@ PROGMEM const uint8_t DRUM_hhcl1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from Belltree.wav, length = 121408 bytes
 PROGMEM const uint8_t DRUM_Belltree[] = {
   0x11, 0x03, 0x4a, 0xfe, 0xb9, 0xfb, 0x65, 0xfc, 0x93, 0x04, 0x40, 0xff,
@@ -203777,8 +203755,7 @@ PROGMEM const uint8_t DRUM_Bongo27[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from Casta.wav, length = 2048 bytes
 PROGMEM const uint8_t DRUM_Casta[] = {
   0x74, 0x00, 0x79, 0xff, 0x80, 0x00, 0x79, 0xff, 0x81, 0x00, 0x79, 0xff,
@@ -204127,8 +204104,7 @@ PROGMEM const uint8_t DRUM_Casta[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00,
+0x00, 0x00, };
-};
 // Converted from CR78Kick.wav, length = 10048 bytes
 PROGMEM const uint8_t DRUM_Cr78kick[] = {
   0x3b, 0x00, 0xa7, 0xff, 0x10, 0x00, 0x29, 0xf9, 0xdc, 0xf1, 0x8a, 0xf7,
@@ -205809,8 +205785,7 @@ PROGMEM const uint8_t DRUM_Cr78kick[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from CR78Tmb1.wav, length = 7552 bytes
 PROGMEM const uint8_t DRUM_Cr78tmb1[] = {
   0xff, 0xff, 0xf7, 0xff, 0xf8, 0xff, 0x0b, 0x00, 0x00, 0x00, 0xf7, 0xff,
@@ -207075,8 +207050,7 @@ PROGMEM const uint8_t DRUM_Cr78tmb1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from CR78Tmb2.wav, length = 10880 bytes
 PROGMEM const uint8_t DRUM_Cr78tmb2[] = {
   0x07, 0x00, 0x28, 0x00, 0x40, 0x00, 0x4d, 0x00, 0x2f, 0x00, 0xb5, 0xff,
@@ -208892,8 +208866,7 @@ PROGMEM const uint8_t DRUM_Cr78tmb2[] = {
   0x2f, 0x00, 0x9a, 0x00, 0xba, 0x00, 0x67, 0x00, 0x08, 0x00, 0xac, 0xff,
   0x56, 0xff, 0x58, 0xff, 0xb2, 0xff, 0x1a, 0x00, 0x77, 0x00, 0x9e, 0x00,
   0x71, 0x00, 0x1c, 0x00, 0xc7, 0xff, 0x7f, 0xff, 0x68, 0xff, 0x8c, 0xff
-  , 0x00, 0x00, 0x00, 0x00,
+,0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from Crash1.wav, length = 72768 bytes
 PROGMEM const uint8_t DRUM_Crash1[] = {
   0x75, 0x00, 0x74, 0x00, 0x89, 0x00, 0x5f, 0x00, 0x70, 0x00, 0x4e, 0x00,
@@ -222333,8 +222306,7 @@ PROGMEM const uint8_t DRUM_Dmpop[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00,
+0x00, 0x00, };
-};
 // Converted from Electr1.wav, length = 2880 bytes
 PROGMEM const uint8_t DRUM_Electr1[] = {
   0x00, 0x00, 0xd2, 0x10, 0x97, 0x13, 0x9f, 0x0c, 0x29, 0xfb, 0xa5, 0xe8,
@@ -227247,8 +227219,7 @@ PROGMEM const uint8_t DRUM_Tamb[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from CowBell.wav, length = 7296 bytes
 PROGMEM const uint8_t DRUM_Cowbell[] = {
   0x00, 0x00, 0x47, 0x00, 0x72, 0x00, 0x8b, 0x00, 0x82, 0x00, 0x64, 0x00,
@@ -228469,8 +228440,7 @@ PROGMEM const uint8_t DRUM_Cowbell[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from HatC660.wav, length = 5952 bytes
 PROGMEM const uint8_t DRUM_660HatC1[] = {
   0x4d, 0xfb, 0x32, 0xe7, 0x25, 0x21, 0x90, 0xf9, 0x49, 0xc4, 0xdd, 0x2f,
@@ -229467,8 +229437,7 @@ PROGMEM const uint8_t DRUM_660HatC1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from HHopen1.wav, length = 11200 bytes
 PROGMEM const uint8_t DRUM_Hhopen1[] = {
   0x90, 0xff, 0x0d, 0x00, 0x0e, 0xfe, 0xd4, 0xfe, 0x45, 0x02, 0x90, 0xfe,
@@ -231342,8 +231311,7 @@ PROGMEM const uint8_t DRUM_Hhopen1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from HiSticks.wav, length = 2432 bytes
 PROGMEM const uint8_t DRUM_Histicks[] = {
   0x15, 0x00, 0xe1, 0xff, 0x0f, 0x00, 0xef, 0xff, 0x21, 0x00, 0x57, 0xff,
@@ -231752,8 +231720,7 @@ PROGMEM const uint8_t DRUM_Histicks[] = {
   0xec, 0xff, 0xe7, 0xff, 0xea, 0xff
 ,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from HR16Snr2.wav, length = 15168 bytes
 PROGMEM const uint8_t DRUM_Hr16snr2[] = {
   0x6b, 0xfe, 0xde, 0xfb, 0x62, 0xf7, 0xd2, 0xf0, 0x07, 0xea, 0x14, 0xe3,
@@ -234286,8 +234253,7 @@ PROGMEM const uint8_t DRUM_Hr16snr2[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from XRHiTom.wav, length = 13504 bytes
 PROGMEM const uint8_t DRUM_Xrhitom[] = {
   0x00, 0x00, 0xf9, 0xff, 0xfe, 0xff, 0xf9, 0xff, 0xd6, 0xff, 0x45, 0xff,
@@ -236653,8 +236619,7 @@ PROGMEM const uint8_t DRUM_Tick1[] = {
   0x95, 0x00, 0x79, 0x00, 0x47, 0x00, 0x85, 0x00, 0x43, 0x00, 0x37, 0x00,
   0x91, 0x00, 0x6e, 0x00, 0x73, 0x00, 0x4c, 0x00, 0x3d, 0x00, 0x4d, 0x00,
   0xf7, 0xff
-  , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from M1-18.wav, length = 2240 bytes
 PROGMEM const uint8_t DRUM_M1_18[] = {
   0xdd, 0xfe, 0xa0, 0xfd, 0xe4, 0xfd, 0x73, 0xfd, 0x7f, 0xfd, 0x2b, 0xfd,
@@ -237032,8 +236997,7 @@ PROGMEM const uint8_t DRUM_M1_18[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from MD16_CLP.wav, length = 13312 bytes
 PROGMEM const uint8_t DRUM_Md16_clp[] = {
   0x16, 0x00, 0x39, 0x00, 0x3f, 0xff, 0xd8, 0xfd, 0xff, 0xff, 0x19, 0x01,
@@ -239260,8 +239224,7 @@ PROGMEM const uint8_t DRUM_Md16_clp[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from OHH909.wav, length = 23488 bytes
 PROGMEM const uint8_t DRUM_Ohhwav[] = {
   0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xba, 0x02, 0xe6, 0xf2, 0xbb, 0xf3,
@@ -243184,8 +243147,7 @@ PROGMEM const uint8_t DRUM_Ohhwav[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00,
+0x00, 0x00, };
-};
 // Converted from Quijada.wav, length = 36096 bytes
 PROGMEM const uint8_t DRUM_Quijada[] = {
   0xff, 0xff, 0x2a, 0x00, 0xde, 0x00, 0x82, 0x01, 0x89, 0x02, 0xe7, 0x02,
@@ -249206,8 +249168,7 @@ PROGMEM const uint8_t DRUM_Quijada[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00,
+0x00, 0x00, };
-};
 // Converted from R8Tabla1.wav, length = 15488 bytes
 PROGMEM const uint8_t DRUM_tabla1[] = {
   0x26, 0x00, 0x6d, 0xff, 0x6f, 0xfd, 0xf8, 0xfb, 0xd2, 0xfa, 0xba, 0xfa,
@@ -251793,8 +251754,7 @@ PROGMEM const uint8_t DRUM_tabla1[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from Ride808.wav, length = 21696 bytes
 PROGMEM const uint8_t DRUM_Ride808[] = {
   0x58, 0x00, 0x54, 0xfb, 0x0f, 0xf7, 0xfc, 0xed, 0xc5, 0xf5, 0xf6, 0x2d,
@@ -255414,8 +255374,7 @@ PROGMEM const uint8_t DRUM_Ride808[] = {
   0x00, 0x00, 0x00, 0x00
 ,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from scratch1.wav, length = 5888 bytes
 PROGMEM const uint8_t DRUM_Scratch1[] = {
   0xd5, 0xfb, 0xa9, 0xfa, 0x05, 0xfb, 0x0a, 0xfb, 0x3a, 0xfb, 0xb6, 0xfa,
@@ -258967,8 +258926,7 @@ PROGMEM const uint8_t DRUM_Tomlow[] = {
   0x00, 0x00
 ,0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from Tom808.wav, length = 6272 bytes
 PROGMEM const uint8_t DRUM_Tom808[] = {
   0x97, 0xfc, 0xf7, 0xeb, 0x0f, 0xd6, 0xb2, 0xc2, 0x55, 0xb2, 0xe7, 0xa2,
@@ -260020,8 +259978,7 @@ PROGMEM const uint8_t DRUM_Tom808[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00,
+0x00, 0x00, };
-};
 // Converted from vl1-Lbeep.wav, length = 3008 bytes
 PROGMEM const uint8_t DRUM_Vl1lbeep[] = {
   0xeb, 0xf9, 0x17, 0x07, 0xe8, 0x63, 0x8b, 0x7b, 0x80, 0x6f, 0x4d, 0x75,
@@ -260529,8 +260486,7 @@ PROGMEM const uint8_t DRUM_Vl1lbeep[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, };
-};
 // Converted from vl1-Hbeep.wav, length = 1984 bytes
 PROGMEM const uint8_t DRUM_Vl1hbeep[] = {
   0x06, 0x04, 0x16, 0xfd, 0xc9, 0x05, 0x94, 0x63, 0x7c, 0x79, 0xd6, 0x6e,
@@ -260871,7 +260827,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
 {
   {
     DRUM_HIHAT,
-    2,
+    1,
     210,
     "SQBass",
     DRUM_SQBass,
@@ -260886,7 +260842,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_MIDTOM,
-    3,
+    2,
     211,
     "CALLIOP",
     DRUM_CALLIOP,
@@ -260901,7 +260857,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_CRASH,
-    4,
+    3,
     212,
     "CALLIOP",
     DRUM_CALLIOP,
@@ -260916,7 +260872,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_RIDE,
-    5,
+    4,
     213,
     "ARR1",
     DRUM_ARR1,
@@ -260931,7 +260887,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    6,
+    5,
     214,
     "FVoice",
     DRUM_FVoice,
@@ -260946,7 +260902,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    7,
+    6,
     MIDI_A2,
     "Clap808",
     DRUM_Clap808,
@@ -260961,7 +260917,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    8,
+    7,
     MIDI_B2,
     "S_kick_1",
     DRUM_Clap808,
@@ -260976,7 +260932,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    9,
+    8,
     MIDI_C3,
     "S_kick2_8",
     DRUM_S_kick2_8,
@@ -260991,7 +260947,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_PERCUSSION,
-    10,
+    9,
     MIDI_CIS3,
     "S_Stick_1",
     DRUM_S_Stick_1,
@@ -261006,7 +260962,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_SNARE,
-    11,
+    10,
     MIDI_D3,
     "S_snare_Ghost_1",
     DRUM_S_snare_Ghost_1,
@@ -261021,7 +260977,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_SNARE,
-    12,
+    11,
     MIDI_DIS3,
     "S_snare2_Ghost_1",
     DRUM_S_snare2_Ghost_1,
@@ -261036,7 +260992,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_SNARE,
-    13,
+    12,
     MIDI_E3,
     "S_snare_2",
     DRUM_S_snare_2,
@@ -261051,7 +261007,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    14,
+    13,
     MIDI_F3,
     "S_loTom_1",
     DRUM_S_loTom_1,
@@ -261066,7 +261022,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    15,
+    14,
     MIDI_FIS3,
     "S_hhClosed_1",
     DRUM_S_hhClosed_1,
@@ -261081,7 +261037,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_LOWTOM,
-    16,
+    15,
     MIDI_G3,
     "S_loTom_1",
     DRUM_S_loTom_1,
@@ -261096,7 +261052,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    17,
+    16,
     MIDI_GIS3,
     "S_hh_o_1_2",
     DRUM_S_hh_o_1_2,
@@ -261111,7 +261067,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_HIGHTOM,
-    18,
+    17,
     MIDI_A3,
     "S_hiTom_5",
     DRUM_S_hiTom_5,
@@ -261126,7 +261082,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    19,
+    18,
     MIDI_AIS3,
     "S_hh_o_5_4",
     DRUM_S_hh_o_5_4,
@@ -261141,7 +261097,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_HIGHTOM,
-    20,
+    19,
     MIDI_B3,
     "S_hiTom_5",
     DRUM_S_hiTom_5,
@@ -261156,7 +261112,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_HIGHTOM,
-    21,
+    20,
     MIDI_C4,
     "S_hiTom_5",
     DRUM_S_hiTom_5,
@@ -261171,7 +261127,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    22,
+    21,
     MIDI_CIS4,
     "S_splash1_1",
     DRUM_S_splash1_1,
@@ -261186,7 +261142,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_HIGHTOM,
-    23,
+    22,
     MIDI_D4,
     "S_hiTom_5",
     DRUM_S_hiTom_5,
@@ -261201,7 +261157,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_CRASH,
-    24,
+    23,
     MIDI_DIS4,
     "S_china1_4",
     DRUM_S_china1_4,
@@ -261216,7 +261172,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_CRASH,
-    25,
+    24,
     MIDI_E4,
     "S_china2_1",
     DRUM_S_china2_1,
@@ -261231,7 +261187,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_RIDE,
-    26,
+    25,
     MIDI_F4,
     "S_ride1Bell_1",
     DRUM_S_ride1Bell_1,
@@ -261246,7 +261202,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_RIDE,
-    27,
+    26,
     MIDI_FIS4,
     "S_ride1Bell_1",
     DRUM_S_ride1Bell_1,
@@ -261261,7 +261217,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_CRASH,
-    28,
+    27,
     MIDI_G4,
     "S_crash1_1",
     DRUM_S_crash1_1,
@@ -261276,7 +261232,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    29,
+    28,
     MIDI_GIS4,
     "S_cowbell_2",
     DRUM_S_cowbell_2,
@@ -261291,7 +261247,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_RIDE,
-    30,
+    29,
     MIDI_A4,
     "S_ride2Crash_2",
     DRUM_S_ride2Crash_2,
@@ -261306,7 +261262,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_RIDE,
-    31,
+    30,
     MIDI_AIS4,
     "S_ride2_1",
     DRUM_S_ride2_1,
@@ -261321,7 +261277,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    32,
+    31,
     MIDI_B4,
     "808Kick",
     DRUM_808Kick,
@@ -261336,7 +261292,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    33,
+    32,
     MIDI_C5,
     "phkick1",
     DRUM_phkick1,
@@ -261351,7 +261307,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_SNARE,
-    34,
+    33,
     MIDI_CIS5,
     "rims1",
     DRUM_rims1,
@@ -261366,7 +261322,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_SNARE,
-    35,
+    34,
     MIDI_D5,
     "Shaker",
     DRUM_Shaker,
@@ -261381,7 +261337,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_HANDCLAP,
-    36,
+    35,
     MIDI_DIS5,
     "LNclap1",
     DRUM_LNclap1,
@@ -261396,7 +261352,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_SNARE,
-    37,
+    36,
     MIDI_E5,
     "LNsnare1",
     DRUM_LNsnare1,
@@ -261411,7 +261367,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    38,
+    37,
     MIDI_F5,
     "Bdtrancy",
     DRUM_Bdtrancy,
@@ -261426,7 +261382,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_HIHAT,
-    39,
+    38,
     MIDI_FIS5,
     "hhcl1",
     DRUM_hhcl1,
@@ -261441,7 +261397,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    40,
+    39,
     MIDI_G5,
     "Belltree",
     DRUM_Belltree,
@@ -261456,7 +261412,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    41,
+    40,
     MIDI_GIS5,
     "Bongo16",
     DRUM_Bongo16,
@@ -261471,7 +261427,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    42,
+    41,
     MIDI_A5,
     "Bongo27",
     DRUM_Bongo27,
@@ -261486,7 +261442,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    43,
+    42,
     MIDI_AIS5,
     "Casta",
     DRUM_Casta,
@@ -261501,7 +261457,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    44,
+    43,
     MIDI_B5,
     "Cr78kick",
     DRUM_Cr78kick,
@@ -261516,7 +261472,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_HIHAT,
-    45,
+    44,
     MIDI_C6,
     "Cr78tmb1",
     DRUM_Cr78tmb1,
@@ -261531,7 +261487,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_HIHAT,
-    46,
+    45,
     MIDI_CIS6,
     "Cr78tmb2",
     DRUM_Cr78tmb2,
@@ -261546,7 +261502,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    47,
+    46,
     MIDI_D6,
     "Crash1",
     DRUM_Crash1,
@@ -261561,7 +261517,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    48,
+    47,
     MIDI_DIS6,
     "Dmpop",
     DRUM_Dmpop,
@@ -261576,7 +261532,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    49,
+    48,
     MIDI_E6,
     "Electr1",
     DRUM_Electr1,
@@ -261591,7 +261547,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    50,
+    49,
     MIDI_F6,
     "Excow",
     DRUM_Excow,
@@ -261606,7 +261562,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_PERCUSSION,
-    51,
+    50,
     MIDI_FIS6,
     "Tamb",
     DRUM_Tamb,
@@ -261621,7 +261577,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_PERCUSSION,
-    52,
+    51,
     MIDI_GIS6,
     "Cowbell",
     DRUM_Cowbell,
@@ -261636,7 +261592,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_HIHAT,
-    53,
+    52,
     MIDI_G6,
     "660HatC1",
     DRUM_660HatC1,
@@ -261651,7 +261607,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_HIHAT,
-    54,
+    53,
     MIDI_A6,
     "Hhopen1",
     DRUM_Hhopen1,
@@ -261666,7 +261622,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_PERCUSSION,
-    55,
+    54,
     MIDI_AIS6,
     "Histicks",
     DRUM_Histicks,
@@ -261681,7 +261637,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_PERCUSSION,
-    56,
+    55,
     MIDI_B6,
     "Hr16snr2",
     DRUM_Hr16snr2,
@@ -261696,7 +261652,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_HIGHTOM,
-    57,
+    56,
     MIDI_C7,
     "Xrhitom",
     DRUM_Xrhitom,
@@ -261711,7 +261667,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_PERCUSSION,
-    58,
+    57,
     MIDI_CIS7,
     "Tick1",
     DRUM_Tick1,
@@ -261726,7 +261682,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_PERCUSSION,
-    59,
+    58,
     MIDI_D7,
     "M1-18",
     DRUM_M1_18,
@@ -261741,7 +261697,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_PERCUSSION,
-    60,
+    59,
     MIDI_DIS7,
     "Md16_clp",
     DRUM_Md16_clp,
@@ -261756,7 +261712,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_HIHAT,
-    61,
+    60,
     MIDI_E7,
     "Ohhwav",
     DRUM_Ohhwav,
@@ -261771,7 +261727,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_PERCUSSION,
-    62,
+    61,
     MIDI_F7,
     "Quijada",
     DRUM_Quijada,
@@ -261786,7 +261742,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_PERCUSSION,
-    63,
+    62,
     MIDI_FIS7,
     "tabla1",
     DRUM_tabla1,
@@ -261801,7 +261757,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_PERCUSSION,
-    64,
+    63,
     MIDI_G7,
     "Ride808",
     DRUM_Ride808,
@@ -261816,7 +261772,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_PERCUSSION,
-    65,
+    64,
     MIDI_GIS7,
     "Scratch1",
     DRUM_Scratch1,
@@ -261831,7 +261787,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_PERCUSSION,
-    66,
+    65,
     MIDI_A7,
     "Tomlow",
     DRUM_Tomlow,
@@ -261846,7 +261802,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_PERCUSSION,
-    67,
+    66,
     MIDI_AIS7,
     "Tom808",
     DRUM_Tom808,
@@ -261861,7 +261817,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    68,
+    67,
     MIDI_B7,
     "Vl1lbeep",
     DRUM_Vl1lbeep,
@@ -261876,7 +261832,7 @@ drum_config_t drum_config[NUM_DRUMSET_CONFIG] =
   },
   {
     DRUM_BASS,
-    69,
+    68,
     MIDI_C8,
     "Vl1hbeep",
     DRUM_Vl1hbeep,