Replaced PlaySDRaw with PalySDWav because WAV playing has a much better buffer handling so dropouts no longer occur.

MicroDexed.ino

@@ -89,9 +89,7 @@ AudioMixer4                     audio_thru_mixer_l;
 
 // Drumset
 #if NUM_DRUMS > 0
-AudioPlaySdRaw*                 Drum[NUM_DRUMS];
+AudioPlaySdWav*                 Drum[NUM_DRUMS];
-AudioAmplifier*                 drum_volume[NUM_DRUMS];
-AudioEffectMonoStereo*          drum_mono2stereo[NUM_DRUMS];
 #if NUM_DRUMS < 5
 AudioMixer4                     drum_mixer_r;
 AudioMixer4                     drum_mixer_l;
@@ -196,11 +194,11 @@ AudioConnection          patchCord22(drum_mixer_l, 0, master_mixer_l, 2);
 //
 uint8_t nDynamic = 0;
 #if defined(USE_FX) && MOD_FILTER_OUTPUT != MOD_NO_FILTER_OUTPUT
-AudioConnection* dynamicConnections[NUM_DEXED * 16 + NUM_DRUMS * 6 ];
+AudioConnection* dynamicConnections[NUM_DEXED * 16 + NUM_DRUMS * 4 ];
 #elif defined(USE_FX) && MOD_FILTER_OUTPUT == MOD_NO_FILTER_OUTPUT
-AudioConnection* dynamicConnections[NUM_DEXED * 15 + NUM_DRUMS * 6];
+AudioConnection* dynamicConnections[NUM_DEXED * 15 + NUM_DRUMS * 4];
 #else
-AudioConnection* dynamicConnections[NUM_DEXED * 4 + NUM_DRUMS * 4];
+AudioConnection* dynamicConnections[NUM_DEXED * 4 + NUM_DRUMS * 2];
 #endif
 void create_audio_dexed_chain(uint8_t instance_id)
 {
@@ -257,17 +255,13 @@ void create_audio_dexed_chain(uint8_t instance_id)
 #if NUM_DRUMS > 0
 void create_audio_drum_chain(uint8_t instance_id)
 {
-  Drum[instance_id] = new AudioPlaySdRaw();
+  Drum[instance_id] = new AudioPlaySdWav();
-  drum_volume[instance_id] = new AudioAmplifier();
-  drum_mono2stereo[instance_id] = new AudioEffectMonoStereo();
 
-  dynamicConnections[nDynamic++] = new AudioConnection(*Drum[instance_id], 0, *drum_volume[instance_id], 0);
+  dynamicConnections[nDynamic++] = new AudioConnection(*Drum[instance_id], 0, drum_mixer_r, instance_id);
-  dynamicConnections[nDynamic++] = new AudioConnection(*drum_volume[instance_id], 0, *drum_mono2stereo[instance_id], 0);
+  dynamicConnections[nDynamic++] = new AudioConnection(*Drum[instance_id], 1, drum_mixer_l, instance_id);
-  dynamicConnections[nDynamic++] = new AudioConnection(*drum_mono2stereo[instance_id], 0, drum_mixer_r, instance_id);
-  dynamicConnections[nDynamic++] = new AudioConnection(*drum_mono2stereo[instance_id], 1, drum_mixer_l, instance_id);
 #ifdef USE_FX
-  dynamicConnections[nDynamic++] = new AudioConnection(*drum_mono2stereo[instance_id], 0, drum_reverb_send_mixer_r, instance_id);
+  dynamicConnections[nDynamic++] = new AudioConnection(*Drum[instance_id], 0, drum_reverb_send_mixer_r, instance_id);
-  dynamicConnections[nDynamic++] = new AudioConnection(*drum_mono2stereo[instance_id], 1, drum_reverb_send_mixer_l, instance_id);
+  dynamicConnections[nDynamic++] = new AudioConnection(*Drum[instance_id], 1, drum_reverb_send_mixer_l, instance_id);
 #endif
 
 #ifdef DEBUG
@@ -823,13 +817,14 @@ void handleNoteOn(byte inChannel, byte inNumber, byte inVelocity)
       if (inNumber == drum_config[d].midinote)
       {
         uint8_t slot = drum_get_slot(drum_config[d].type);
-        if (Drum[slot]->isPlaying())
+        float fsin = mapfloat(arm_sin_f32(drum_config[d].pan * PI / 2.0), -1.0, 1.0, 0.0, 1.0);
-          Drum[slot]->stop();
+
-        drum_volume[slot]->gain(pseudo_log_curve(mapfloat(inVelocity, 0, 127, drum_config[d].vol_min, drum_config[d].vol_max)));
+        drum_mixer_r.gain(slot, (1.0 - fsin) * pseudo_log_curve(mapfloat(inVelocity, 0, 127, drum_config[d].vol_min, drum_config[d].vol_max)));
-        drum_mono2stereo[slot]->panorama(drum_config[d].pan);
+        drum_mixer_l.gain(slot, fsin * pseudo_log_curve(mapfloat(inVelocity, 0, 127, drum_config[d].vol_min, drum_config[d].vol_max)));
-        drum_reverb_send_mixer_r.gain(slot, pseudo_log_curve(drum_config[d].reverb_send));
+        drum_reverb_send_mixer_r.gain(slot, (1.0 - fsin) * pseudo_log_curve(drum_config[d].reverb_send));
-        drum_reverb_send_mixer_l.gain(slot, pseudo_log_curve(drum_config[d].reverb_send));
+        drum_reverb_send_mixer_l.gain(slot, fsin * pseudo_log_curve(drum_config[d].reverb_send));
         Drum[slot]->play(drum_config[d].filename);
+
 #ifdef DEBUG
         Serial.print(F("Drum "));
         Serial.print(drum_config[d].shortname);
@@ -842,7 +837,9 @@ void handleNoteOn(byte inChannel, byte inNumber, byte inVelocity)
         Serial.print(F(" P"));
         Serial.print(drum_config[d].pan, 2);
         Serial.print(F(" RS"));
-        Serial.println(drum_config[d].reverb_send, 2);
+        Serial.print(drum_config[d].reverb_send, 2);
+        Serial.print(F(" fsin"));
+        Serial.println(fsin, 2);
 #endif
         break;
       }

addon/SD/drm/CFG_MDDrums.json

@@ -1,24 +1,22 @@
 {
-	[
+	"bd01": {
-		type: "DRUM_BASS",
+		"type": "DRUM_BASS",
-    		midinote: "MIDI_C3",
+    		"midinote": "MIDI_C3",
-    		filename: "bd01.raw",
+    		"shortname": "B",
-    		shortname: "B",
+    		"pan": 0.0,
-    		pan: 0.0,
+    		"vol_max": 0.8,
-    		vol_max: 0.8,
+    		"vol_min": 0.0,
-    		vol_min: 0.0,
+    		"reverb_send": 0.0
-    		reverb_send: 0.0
+	}, 
-	], 
+	"cp02": {
-	[
+		"type": "DRUM_HANDCLAP",
-		type: "DRUM_HANDCLAP",
+    		"midinote": "MIDI_CIS3",
-    		midinote: "MIDI_CIS3",
+    		"shortname": "C",
-    		filename: "cp02.raw",
+    		"pan": -0.4,
-    		shortname: "C",
+    		"vol_max:" 0.6,
-    		pan: -0.4,
+    		"vol_min:" 0.0,
-    		vol_max: 0.6,
+    		"reverb_send:" 0.4 
-    		vol_min: 0.0,
+	}, 
-    		reverb_send: 0.4 
-	], 
 	[
 		type: "DRUM_SNARE",
     		midinote: "MIDI_D3",

doc/convert_wav2raw.txt

@@ -0,0 +1,11 @@
+Convert WAV to RAW:
+for i in *.wav
+do
+	sox $i -c 1 -b 16 -L `basename $i .wav`.raw
+done
+
+Convert RAW to WAV:
+for i in *.raw
+do
+	sox -r 44100 -c 1 -b 16 -L -e signed $i `basename $i .raw`.wav
+done

drums.h

@@ -49,7 +49,7 @@ drum_config_t drum_config[NUM_DRUMCONFIG] = {
   {
     DRUM_BASS,
     MIDI_C3,
-    "/drm/bd01.raw",
+    "/drm/bd01.wav",
     "B",
     0.0,
     0.8,
@@ -59,7 +59,7 @@ drum_config_t drum_config[NUM_DRUMCONFIG] = {
   {
     DRUM_HANDCLAP,
     MIDI_CIS3,
-    "/drm/cp02.raw",
+    "/drm/cp02.wav",
     "C",
     -0.4,
     0.6,
@@ -69,7 +69,7 @@ drum_config_t drum_config[NUM_DRUMCONFIG] = {
   {
     DRUM_SNARE,
     MIDI_D3,
-    "/drm/sd15.raw",
+    "/drm/sd15.wav",
     "S",
     0.2,
     0.6,
@@ -79,7 +79,7 @@ drum_config_t drum_config[NUM_DRUMCONFIG] = {
   {
     DRUM_HIHAT,
     MIDI_FIS3,
-    "/drm/hh01.raw",
+    "/drm/hh01.wav",
     "h",
     0.8,
     0.2,
@@ -89,7 +89,7 @@ drum_config_t drum_config[NUM_DRUMCONFIG] = {
   {
     DRUM_HIHAT,
     MIDI_GIS3,
-    "/drm/hh02.raw",
+    "/drm/hh02.wav",
     "h",
     0.8,
     0.2,
@@ -99,7 +99,7 @@ drum_config_t drum_config[NUM_DRUMCONFIG] = {
   {
     DRUM_HIHAT,
     MIDI_AIS3,
-    "/drm/oh02.raw",
+    "/drm/oh02.wav",
     "H",
     0.8,
     0.2,
@@ -109,7 +109,7 @@ drum_config_t drum_config[NUM_DRUMCONFIG] = {
   {
     DRUM_LOWTOM,
     MIDI_G3,
-    "/drm/lt01.raw",
+    "/drm/lt01.wav",
     "T",
     -0.7,
     0.8,
@@ -119,7 +119,7 @@ drum_config_t drum_config[NUM_DRUMCONFIG] = {
   {
     DRUM_HIGHTOM,
     MIDI_A3,
-    "/drm/ht01.raw",
+    "/drm/ht01.wav",
     "T",
     -0.5,
     0.8,
@@ -129,7 +129,7 @@ drum_config_t drum_config[NUM_DRUMCONFIG] = {
   {
     DRUM_RIDE,
     MIDI_CIS4,
-    "/drm/rd01.raw",
+    "/drm/rd01.wav",
     "R",
     -0.6,
     0.3,
@@ -139,7 +139,7 @@ drum_config_t drum_config[NUM_DRUMCONFIG] = {
   {
     DRUM_RIDE,
     MIDI_DIS4,
-    "/drm/rd02.raw",
+    "/drm/rd02.wav",
     "R",
     -0.6,
     0.3,
@@ -149,9 +149,9 @@ drum_config_t drum_config[NUM_DRUMCONFIG] = {
   {
     DRUM_BASS,
     MIDI_C5,
-    "/drm/PHKick1.raw",
+    "/drm/PHKick1.wav",
     "B",
-    0.0,
+    -1.0,
     0.9,
     0.0,
     0.0
@@ -159,9 +159,9 @@ drum_config_t drum_config[NUM_DRUMCONFIG] = {
   {
     DRUM_HANDCLAP,
     MIDI_DIS5,
-    "/drm/808Clap1.raw",
+    "/drm/808Clap1.wav",
     "C",
-    0.0,
+    1.0,
     0.9,
     0.0,
     0.4
@@ -169,7 +169,7 @@ drum_config_t drum_config[NUM_DRUMCONFIG] = {
   {
     DRUM_SNARE,
     MIDI_CIS5,
-    "/drm/808RimS1.raw",
+    "/drm/808RimS1.wav",
     "R",
     -0.3,
     0.5,
@@ -179,9 +179,9 @@ drum_config_t drum_config[NUM_DRUMCONFIG] = {
   {
     DRUM_HIHAT,
     MIDI_FIS5,
-    "/drm/808HHCL1.raw",
+    "/drm/808HHCL1.wav",
     "H",
-    0.4,
+    1.0,
     0.6,
     0.0,
     0.0