Commit before merge-pull.

MicroDexed.ino

@@ -29,6 +29,7 @@
 #include <EEPROM.h>
 #include <SD.h>
 #include <SPI.h>
+#include <ArduinoJson.h>
 #include "midi_devices.hpp"
 #include "synth_dexed.h"
 #include "dexed_sd.h"
@@ -482,6 +483,32 @@ void setup()
 #endif
     create_audio_drum_chain(instance_id);
 
+    File json;
+    // first check if file exists...
+    AudioNoInterrupts();
+    if (SD.exists("/DRM/CFG_MDDrums.json"))
+    {
+      // ... and if: load
+#ifdef DEBUG
+      Serial.println(F("Found drum configuration file."));
+#endif
+      json = SD.open("/DRM/CFG_MDDrums.json");
+      if (json)
+      {
+        StaticJsonDocument<JSON_BUFFER> data_json;
+        JsonObject object = data_json.to<JsonObject>();
+
+        deserializeJson(data_json, json);
+        deserializeJson(data_json, Serial);
+        json.close();
+
+        Serial.print(F("objects: "));
+        Serial.println(object["drums"].size());
+
+      }
+    }
+    AudioInterrupts();
+
     drum_mixer_r.gain(instance_id, 1.0);
     drum_mixer_l.gain(instance_id, 1.0);
     drum_reverb_send_mixer_r.gain(instance_id, 0.0);

addon/SD/drm/CFG_MDDrums.json

@@ -1,6 +1,7 @@
 {
+	"drums": {
 	"bd01": {
-		"type": "DRUM_BASS",
+		"drum_class": "DRUM_BASS",
     		"midinote": "MIDI_C3",
     		"shortname": "B",
     		"pan": 0.0,
@@ -9,142 +10,132 @@
     		"reverb_send": 0.0
 	}, 
 	"cp02": {
-		"type": "DRUM_HANDCLAP",
+		"drum_class": "DRUM_HANDCLAP",
     		"midinote": "MIDI_CIS3",
     		"shortname": "C",
     		"pan": -0.4,
-    		"vol_max:" 0.6,
+    		"vol_max": 0.6,
-    		"vol_min:" 0.0,
+    		"vol_min": 0.0,
-    		"reverb_send:" 0.4 
+    		"reverb_send": 0.4 
+	}, 
+	"sd15": {
+		"drum_class": "DRUM_SNARE",
+    		"midinote": "MIDI_D3",
+    		"shortname": "S",
+    		"pan": 0.2, 
+    		"vol_max": 0.6,
+    		"vol_min": 0.2,
+    		"reverb_send": 0.0
+	}, 
+	"hh01": {
+		"drum_class": "DRUM_HIHAT",
+    		"midinote": "MIDI_FIS3",
+    		"shortname": "h",
+    		"pan": 0.8,
+    		"vol_max": 0.2,
+    		"vol_min": 0.0,
+    		"reverb_send": 0.0
+	}, 
+	"hh02": {
+		"drum_class": "DRUM_HIHAT",
+    		"midinote": "MIDI_GIS3",
+    		"shortname": "h",
+    		"pan": 0.8,
+    		"vol_max": 0.2,
+    		"vol_min": 0.0,
+    		"reverb_send": 0.0
+	}, 
+	"oh02": {
+		"drum_class": "DRUM_HIHAT",
+    		"midinote": "MIDI_AIS3",
+    		"shortname": "H",
+    		"pan": 0.8, 
+    		"vol_max": 0.2,
+    		"vol_min": 0.0,
+    		"reverb_send": 0.0
+	}, 
+	"lt01": {
+		"drum_class": "DRUM_LOWTOM",
+    		"midinote": "MIDI_G3",
+    		"shortname": "T",
+    		"pan": -0.7,
+    		"vol_max": 0.8,
+    		"vol_min": 0.0,
+    		"reverb_send": 0.0
+	}, 
+	"ht01": {
+		"drum_class": "DRUM_HIGHTOM",
+    		"midinote": "MIDI_A3",
+    		"shortname": "T",
+    		"pan": -0.5,
+    		"vol_max": 0.8,
+    		"vol_min": 0.0,
+    		"reverb_send": 0.0
 	}, 
-	[
+	"rd01": {
-		type: "DRUM_SNARE",
+		"drum_class": "DRUM_RIDE",
-    		midinote: "MIDI_D3",
+    		"midinote": "MIDI_CIS4",
-    		filename: "sd15.raw",
+    		"shortname": "R",
-    		shortname: "S",
+    		"pan": -0.6,
-    		pan: 0.2, 
+    		"vol_max": 0.3,
-    		vol_max: 0.6,
+    		"vol_min": 0.0,
-    		vol_min: 0.2,
+    		"reverb_send": 0.0 
-    		reverb_send: 0.0
+	}, 
-	], 
+	"rd02": {
-	[
+		"drum_class": "DRUM_RIDE",
-		type: "DRUM_HIHAT",
+    		"midinote": "MIDI_DIS4",
-    		midinote: "MIDI_FIS3",
+    		"shortname": "R",
-    		filename: "hh01.raw",
+    		"pan": -0.6,
-    		shortname: "h",
+    		"vol_max": 0.3,
-    		pan: 0.8,
+    		"vol_min": 0.0,
-    		vol_max: 0.2,
+    		"reverb_send": 0.0 
-    		vol_min: 0.0,
+	}, 
-    		reverb_send: 0.0
+	"PHKick1": {
-	], 
+		"drum_class": "DRUM_BASS",
-	[
+    		"midinote": "MIDI_C5",
-		type: "DRUM_HIHAT",
+    		"shortname": "B",
-    		midinote: "MIDI_GIS3",
+    		"pan": 0.0,
-    		filename: "hh02.raw",
+    		"vol_max": 0.9,
-    		shortname: "h",
+    		"vol_min": 0.0,
-    		pan: 0.8,
+    		"reverb_send": 0.0 
-    		vol_max: 0.2,
+	}, 
-    		vol_min: 0.0,
+	"808Clap1": {
-    		reverb_send: 0.0
+		"drum_class": "DRUM_HANDCLAP",
-	], 
+    		"midinote": "MIDI_DIS5",
-	[
+    		"filename": "808Clap1.raw",
-		type: "DRUM_HIHAT",
+    		"shortname": "C",
-    		midinote: "MIDI_AIS3",
+    		"pan": 0.0,
-    		filename: "oh02.raw",
+    		"vol_max": 0.9,
-    		shortname: "H",
+    		"vol_min": 0.0,
-    		pan: 0.8, 
+    		"reverb_send": 0.4 
-    		vol_max: 0.2,
+	}, 
-    		vol_min: 0.0,
+	"808RimS1": {
-    		reverb_send: 0.0
+		"drum_class": "DRUM_SNARE",
-	], 
+    		"midinote": "MIDI_CIS5",
-	[
+    		"shortname": "R",
-		type: "DRUM_LOWTOM",
+    		"pan": -0.3,
-    		midinote: "MIDI_G3",
+    		"vol_max": 0.5,
-    		filename: "lt01.raw",
+    		"vol_min": 0.0,
-    		shortname: "T",
+    		"reverb_send": 0.0 
-    		pan: -0.7,
+	}, 
-    		vol_max: 0.8,
+	"808HHCL1": {
-    		vol_min: 0.0,
+		"drum_class": "DRUM_HIHAT",
-    		reverb_send: 0.0
+    		"midinote": "MIDI_FIS5",
-	], 
+    		"shortname": "H",
-	[
+    		"pan": 0.4,
-		type: "DRUM_HIGHTOM",
+    		"vol_max": 0.6,
-    		midinote: "MIDI_A3",
+    		"vol_min": 0.0,
-    		filename: "ht01.raw",
+    		"reverb_send": 0.0 
-    		shortname: "T",
+	}, 
-    		pan: -0.5
+	"EMPTY": {
-    		vol_max: 0.8
+		"drum_class": "DRUM_NONE",
-    		vol_min: 0.0
+    		"midinote": "MIDI_NONE",
-    		reverb_send: 0.0
+    		"filename": "EMPTY",
-	], 
+    		"shortname": "-",
-	[
+    		"pan": 0.0,
-		type: "DRUM_RIDE",
+    		"vol_max": 0.0,
-    		midinote: "MIDI_CIS4",
+    		"vol_min": 0.0,
-    		filename: "rd01.raw",
+    		"reverb_send": 0.0 
-    		shortname: "R",
+	} 
-    		pan: -0.6,
+}
-    		vol_max: 0.3,
-    		vol_min: 0.0
-    		reverb_send: 0.0 
-	], 
-	[
-		type: "DRUM_RIDE",
-    		midinote: "MIDI_DIS4",
-    		filename: "rd02.raw",
-    		shortname: "R",
-    		pan: -0.6,
-    		vol_max: 0.3,
-    		vol_min: 0.0
-    		reverb_send: 0.0 
-	], 
-	[
-		type: "DRUM_BASS",
-    		midinote: "MIDI_C5",
-    		filename: "PHKick1.raw",
-    		shortname: "B",
-    		pan: 0.0,
-    		vol_max: 0.9,
-    		vol_min: 0.0
-    		reverb_send: 0.0 
-	], 
-	[
-		type: "DRUM_HANDCLAP",
-    		midinote: "MIDI_DIS5",
-    		filename: "808Clap1.raw",
-    		shortname: "C",
-    		pan: 0.0,
-    		vol_max: 0.9,
-    		vol_min: 0.0
-    		reverb_send: 0.4 
-	], 
-	[
-		type: "DRUM_SNARE",
-    		midinote: "MIDI_CIS5",
-    		filename: "808RimS1.raw",
-    		shortname: "R",
-    		pan: -0.3,
-    		vol_max: 0.5,
-    		vol_min: 0.0
-    		reverb_send: 0.0 
-	], 
-	[
-		type: "DRUM_HIHAT",
-    		midinote: "MIDI_FIS5",
-    		filename: "808HHCL1.raw",
-    		shortname: "H",
-    		pan: 0.4,
-    		vol_max: 0.6,
-    		vol_min: 0.0
-    		reverb_send: 0.0 
-	], 
-	[
-		type: "DRUM_NONE",
-    		midinote: "MIDI_NONE",
-    		filename: "EMPTY",
-    		shortname: "-",
-    		pan: 0.0,
-    		vol_max: 0.0,
-    		vol_min: 0.0
-    		reverb_send: 0.0 
-	], 
 }