Commit before merge-pull.

pull/58/head
Holger Wirtz 3 years ago
parent bf62c37cf7
commit 81a56cc3ab
  1. 27
      MicroDexed.ino
  2. BIN
      addon/SD/drm/808Clap1.raw
  3. BIN
      addon/SD/drm/808HHCL1.raw
  4. BIN
      addon/SD/drm/808RimS1.raw
  5. 261
      addon/SD/drm/CFG_MDDrums.json
  6. BIN
      addon/SD/drm/PHKick1.raw
  7. BIN
      addon/SD/drm/bd01.raw
  8. BIN
      addon/SD/drm/bd02.raw
  9. BIN
      addon/SD/drm/bd03.raw
  10. BIN
      addon/SD/drm/bd04.raw
  11. BIN
      addon/SD/drm/bd05.raw
  12. BIN
      addon/SD/drm/bd06.raw
  13. BIN
      addon/SD/drm/bd07.raw
  14. BIN
      addon/SD/drm/bd08.raw
  15. BIN
      addon/SD/drm/bd09.raw
  16. BIN
      addon/SD/drm/bd10.raw
  17. BIN
      addon/SD/drm/cp01.raw
  18. BIN
      addon/SD/drm/cp02.raw
  19. BIN
      addon/SD/drm/cr01.raw
  20. BIN
      addon/SD/drm/cr02.raw
  21. BIN
      addon/SD/drm/hh01.raw
  22. BIN
      addon/SD/drm/hh02.raw
  23. BIN
      addon/SD/drm/ht01.raw
  24. BIN
      addon/SD/drm/ht02.raw
  25. BIN
      addon/SD/drm/lt01.raw
  26. BIN
      addon/SD/drm/lt02.raw
  27. BIN
      addon/SD/drm/mt01.raw
  28. BIN
      addon/SD/drm/mt02.raw
  29. BIN
      addon/SD/drm/oh01.raw
  30. BIN
      addon/SD/drm/oh02.raw
  31. BIN
      addon/SD/drm/rd01.raw
  32. BIN
      addon/SD/drm/rd02.raw
  33. BIN
      addon/SD/drm/rs01.raw
  34. BIN
      addon/SD/drm/sd01.raw
  35. BIN
      addon/SD/drm/sd02.raw
  36. BIN
      addon/SD/drm/sd03.raw
  37. BIN
      addon/SD/drm/sd04.raw
  38. BIN
      addon/SD/drm/sd05.raw
  39. BIN
      addon/SD/drm/sd06.raw
  40. BIN
      addon/SD/drm/sd07.raw
  41. BIN
      addon/SD/drm/sd08.raw
  42. BIN
      addon/SD/drm/sd09.raw
  43. BIN
      addon/SD/drm/sd10.raw
  44. BIN
      addon/SD/drm/sd11.raw
  45. BIN
      addon/SD/drm/sd12.raw
  46. BIN
      addon/SD/drm/sd13.raw
  47. BIN
      addon/SD/drm/sd14.raw
  48. BIN
      addon/SD/drm/sd15.raw

@ -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);

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -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_min:" 0.0,
"reverb_send:" 0.4
"vol_max": 0.6,
"vol_min": 0.0,
"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": {
"drum_class": "DRUM_RIDE",
"midinote": "MIDI_CIS4",
"shortname": "R",
"pan": -0.6,
"vol_max": 0.3,
"vol_min": 0.0,
"reverb_send": 0.0
},
[
type: "DRUM_SNARE",
midinote: "MIDI_D3",
filename: "sd15.raw",
shortname: "S",
pan: 0.2,
vol_max: 0.6,
vol_min: 0.2,
reverb_send: 0.0
],
[
type: "DRUM_HIHAT",
midinote: "MIDI_FIS3",
filename: "hh01.raw",
shortname: "h",
pan: 0.8,
vol_max: 0.2,
vol_min: 0.0,
reverb_send: 0.0
],
[
type: "DRUM_HIHAT",
midinote: "MIDI_GIS3",
filename: "hh02.raw",
shortname: "h",
pan: 0.8,
vol_max: 0.2,
vol_min: 0.0,
reverb_send: 0.0
],
[
type: "DRUM_HIHAT",
midinote: "MIDI_AIS3",
filename: "oh02.raw",
shortname: "H",
pan: 0.8,
vol_max: 0.2,
vol_min: 0.0,
reverb_send: 0.0
],
[
type: "DRUM_LOWTOM",
midinote: "MIDI_G3",
filename: "lt01.raw",
shortname: "T",
pan: -0.7,
vol_max: 0.8,
vol_min: 0.0,
reverb_send: 0.0
],
[
type: "DRUM_HIGHTOM",
midinote: "MIDI_A3",
filename: "ht01.raw",
shortname: "T",
pan: -0.5
vol_max: 0.8
vol_min: 0.0
reverb_send: 0.0
],
[
type: "DRUM_RIDE",
midinote: "MIDI_CIS4",
filename: "rd01.raw",
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
],
"rd02": {
"drum_class": "DRUM_RIDE",
"midinote": "MIDI_DIS4",
"shortname": "R",
"pan": -0.6,
"vol_max": 0.3,
"vol_min": 0.0,
"reverb_send": 0.0
},
"PHKick1": {
"drum_class": "DRUM_BASS",
"midinote": "MIDI_C5",
"shortname": "B",
"pan": 0.0,
"vol_max": 0.9,
"vol_min": 0.0,
"reverb_send": 0.0
},
"808Clap1": {
"drum_class": "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
},
"808RimS1": {
"drum_class": "DRUM_SNARE",
"midinote": "MIDI_CIS5",
"shortname": "R",
"pan": -0.3,
"vol_max": 0.5,
"vol_min": 0.0,
"reverb_send": 0.0
},
"808HHCL1": {
"drum_class": "DRUM_HIHAT",
"midinote": "MIDI_FIS5",
"shortname": "H",
"pan": 0.4,
"vol_max": 0.6,
"vol_min": 0.0,
"reverb_send": 0.0
},
"EMPTY": {
"drum_class": "DRUM_NONE",
"midinote": "MIDI_NONE",
"filename": "EMPTY",
"shortname": "-",
"pan": 0.0,
"vol_max": 0.0,
"vol_min": 0.0,
"reverb_send": 0.0
}
}
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.
Loading…
Cancel
Save