From d272ef327f6c25ee1821260120174d4fef1862e9 Mon Sep 17 00:00:00 2001
From: Holger Wirtz <wirtz@parasitstudio.de>
Date: Tue, 11 Jan 2022 11:56:55 +0100
Subject: [PATCH] mall fixes for drum mapping.

---
 addon/SD/PERFORMANCE/0/drmmap.json | 174 ++++++++++++++++-------------
 addon/SD/PERFORMANCE/0/epiano.json |   0
 addon/SD/PERFORMANCE/1/drmmap.json | 106 ++++++++++++++++++
 addon/SD/PERFORMANCE/2/drmmap.json | 106 ++++++++++++++++++
 addon/SD/PERFORMANCE/3/drmmap.json | 106 ++++++++++++++++++
 addon/SD/PERFORMANCE/4/drmmap.json | 106 ++++++++++++++++++
 addon/SD/PERFORMANCE/5/drmmap.json | 106 ++++++++++++++++++
 addon/SD/PERFORMANCE/6/drmmap.json | 106 ++++++++++++++++++
 addon/SD/PERFORMANCE/7/drmmap.json | 106 ++++++++++++++++++
 addon/SD/PERFORMANCE/8/drmmap.json | 106 ++++++++++++++++++
 config.h                           |   4 +-
 dexed_sd.cpp                       |   2 +-
 12 files changed, 948 insertions(+), 80 deletions(-)
 mode change 100755 => 100644 addon/SD/PERFORMANCE/0/epiano.json
 create mode 100644 addon/SD/PERFORMANCE/1/drmmap.json
 create mode 100644 addon/SD/PERFORMANCE/2/drmmap.json
 create mode 100644 addon/SD/PERFORMANCE/3/drmmap.json
 create mode 100644 addon/SD/PERFORMANCE/4/drmmap.json
 create mode 100644 addon/SD/PERFORMANCE/5/drmmap.json
 create mode 100644 addon/SD/PERFORMANCE/6/drmmap.json
 create mode 100644 addon/SD/PERFORMANCE/7/drmmap.json
 create mode 100644 addon/SD/PERFORMANCE/8/drmmap.json

diff --git a/addon/SD/PERFORMANCE/0/drmmap.json b/addon/SD/PERFORMANCE/0/drmmap.json
index 9db99e3..46af412 100644
--- a/addon/SD/PERFORMANCE/0/drmmap.json
+++ b/addon/SD/PERFORMANCE/0/drmmap.json
@@ -1,86 +1,106 @@
 {
   "type": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1
   ],
   "in": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
+    36,
+    37,
+    38,
+    39,
+    40,
+    41,
+    42,
+    43,
+    44,
+    45,
+    46,
+    47,
+    48,
+    49,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    59 
   ],
   "out": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
+    45,
+    46,
+    47,
+    48,
+    49,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    59,
+    60,
+    61,
+    62,
+    63,
+    64,
+    65,
+    66,
+    67,
+    68 
   ],
   "channel": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10
   ]
-}
\ No newline at end of file
+}
diff --git a/addon/SD/PERFORMANCE/0/epiano.json b/addon/SD/PERFORMANCE/0/epiano.json
old mode 100755
new mode 100644
diff --git a/addon/SD/PERFORMANCE/1/drmmap.json b/addon/SD/PERFORMANCE/1/drmmap.json
new file mode 100644
index 0000000..46af412
--- /dev/null
+++ b/addon/SD/PERFORMANCE/1/drmmap.json
@@ -0,0 +1,106 @@
+{
+  "type": [
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1
+  ],
+  "in": [
+    36,
+    37,
+    38,
+    39,
+    40,
+    41,
+    42,
+    43,
+    44,
+    45,
+    46,
+    47,
+    48,
+    49,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    59 
+  ],
+  "out": [
+    45,
+    46,
+    47,
+    48,
+    49,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    59,
+    60,
+    61,
+    62,
+    63,
+    64,
+    65,
+    66,
+    67,
+    68 
+  ],
+  "channel": [
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10
+  ]
+}
diff --git a/addon/SD/PERFORMANCE/2/drmmap.json b/addon/SD/PERFORMANCE/2/drmmap.json
new file mode 100644
index 0000000..46af412
--- /dev/null
+++ b/addon/SD/PERFORMANCE/2/drmmap.json
@@ -0,0 +1,106 @@
+{
+  "type": [
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1
+  ],
+  "in": [
+    36,
+    37,
+    38,
+    39,
+    40,
+    41,
+    42,
+    43,
+    44,
+    45,
+    46,
+    47,
+    48,
+    49,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    59 
+  ],
+  "out": [
+    45,
+    46,
+    47,
+    48,
+    49,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    59,
+    60,
+    61,
+    62,
+    63,
+    64,
+    65,
+    66,
+    67,
+    68 
+  ],
+  "channel": [
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10
+  ]
+}
diff --git a/addon/SD/PERFORMANCE/3/drmmap.json b/addon/SD/PERFORMANCE/3/drmmap.json
new file mode 100644
index 0000000..46af412
--- /dev/null
+++ b/addon/SD/PERFORMANCE/3/drmmap.json
@@ -0,0 +1,106 @@
+{
+  "type": [
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1
+  ],
+  "in": [
+    36,
+    37,
+    38,
+    39,
+    40,
+    41,
+    42,
+    43,
+    44,
+    45,
+    46,
+    47,
+    48,
+    49,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    59 
+  ],
+  "out": [
+    45,
+    46,
+    47,
+    48,
+    49,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    59,
+    60,
+    61,
+    62,
+    63,
+    64,
+    65,
+    66,
+    67,
+    68 
+  ],
+  "channel": [
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10
+  ]
+}
diff --git a/addon/SD/PERFORMANCE/4/drmmap.json b/addon/SD/PERFORMANCE/4/drmmap.json
new file mode 100644
index 0000000..46af412
--- /dev/null
+++ b/addon/SD/PERFORMANCE/4/drmmap.json
@@ -0,0 +1,106 @@
+{
+  "type": [
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1
+  ],
+  "in": [
+    36,
+    37,
+    38,
+    39,
+    40,
+    41,
+    42,
+    43,
+    44,
+    45,
+    46,
+    47,
+    48,
+    49,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    59 
+  ],
+  "out": [
+    45,
+    46,
+    47,
+    48,
+    49,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    59,
+    60,
+    61,
+    62,
+    63,
+    64,
+    65,
+    66,
+    67,
+    68 
+  ],
+  "channel": [
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10
+  ]
+}
diff --git a/addon/SD/PERFORMANCE/5/drmmap.json b/addon/SD/PERFORMANCE/5/drmmap.json
new file mode 100644
index 0000000..46af412
--- /dev/null
+++ b/addon/SD/PERFORMANCE/5/drmmap.json
@@ -0,0 +1,106 @@
+{
+  "type": [
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1
+  ],
+  "in": [
+    36,
+    37,
+    38,
+    39,
+    40,
+    41,
+    42,
+    43,
+    44,
+    45,
+    46,
+    47,
+    48,
+    49,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    59 
+  ],
+  "out": [
+    45,
+    46,
+    47,
+    48,
+    49,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    59,
+    60,
+    61,
+    62,
+    63,
+    64,
+    65,
+    66,
+    67,
+    68 
+  ],
+  "channel": [
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10
+  ]
+}
diff --git a/addon/SD/PERFORMANCE/6/drmmap.json b/addon/SD/PERFORMANCE/6/drmmap.json
new file mode 100644
index 0000000..46af412
--- /dev/null
+++ b/addon/SD/PERFORMANCE/6/drmmap.json
@@ -0,0 +1,106 @@
+{
+  "type": [
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1
+  ],
+  "in": [
+    36,
+    37,
+    38,
+    39,
+    40,
+    41,
+    42,
+    43,
+    44,
+    45,
+    46,
+    47,
+    48,
+    49,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    59 
+  ],
+  "out": [
+    45,
+    46,
+    47,
+    48,
+    49,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    59,
+    60,
+    61,
+    62,
+    63,
+    64,
+    65,
+    66,
+    67,
+    68 
+  ],
+  "channel": [
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10
+  ]
+}
diff --git a/addon/SD/PERFORMANCE/7/drmmap.json b/addon/SD/PERFORMANCE/7/drmmap.json
new file mode 100644
index 0000000..46af412
--- /dev/null
+++ b/addon/SD/PERFORMANCE/7/drmmap.json
@@ -0,0 +1,106 @@
+{
+  "type": [
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1
+  ],
+  "in": [
+    36,
+    37,
+    38,
+    39,
+    40,
+    41,
+    42,
+    43,
+    44,
+    45,
+    46,
+    47,
+    48,
+    49,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    59 
+  ],
+  "out": [
+    45,
+    46,
+    47,
+    48,
+    49,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    59,
+    60,
+    61,
+    62,
+    63,
+    64,
+    65,
+    66,
+    67,
+    68 
+  ],
+  "channel": [
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10
+  ]
+}
diff --git a/addon/SD/PERFORMANCE/8/drmmap.json b/addon/SD/PERFORMANCE/8/drmmap.json
new file mode 100644
index 0000000..46af412
--- /dev/null
+++ b/addon/SD/PERFORMANCE/8/drmmap.json
@@ -0,0 +1,106 @@
+{
+  "type": [
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1
+  ],
+  "in": [
+    36,
+    37,
+    38,
+    39,
+    40,
+    41,
+    42,
+    43,
+    44,
+    45,
+    46,
+    47,
+    48,
+    49,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    59 
+  ],
+  "out": [
+    45,
+    46,
+    47,
+    48,
+    49,
+    50,
+    51,
+    52,
+    53,
+    54,
+    55,
+    56,
+    57,
+    58,
+    59,
+    60,
+    61,
+    62,
+    63,
+    64,
+    65,
+    66,
+    67,
+    68 
+  ],
+  "channel": [
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10
+  ]
+}
diff --git a/config.h b/config.h
index a35a7f0..c057746 100644
--- a/config.h
+++ b/config.h
@@ -55,7 +55,7 @@
 // sed -i.orig 's/^#define USB_MIDI_SYSEX_MAX 290/#define USB_MIDI_SYSEX_MAX 4104/' /usr/local/arduino-teensy/hardware/teensy/avr/cores/teensy4/usb_midi.h
 //#define USB_MIDI_SYSEX_MAX 4104
 
-#define VERSION "1.2.0a"
+#define VERSION "1.2.1"
 
 //*************************************************************************************************
 //* DEVICE SETTINGS
@@ -119,7 +119,7 @@
 #endif
 // DEFAULT MIDI CHANNEL FOR DRUMSAMPLER
 #define DRUM_MIDI_CHANNEL 10
-#define NUM_CUSTOM_MIDI_MAPPINGS 20  //Number of Custom Key, CC and Button Mappings
+#define NUM_CUSTOM_MIDI_MAPPINGS 24  //Number of Custom Key, CC and Button Mappings
 
 // NUMBER OF SAMPLES IN DRUMSET
 #if defined(ARDUINO_TEENSY41)
diff --git a/dexed_sd.cpp b/dexed_sd.cpp
index 9830531..62f62f2 100644
--- a/dexed_sd.cpp
+++ b/dexed_sd.cpp
@@ -533,7 +533,7 @@ bool save_sd_drummappings_json(uint8_t number)
       json = SD.open(filename, FILE_WRITE);
       if (json)
       {
-        for (uint8_t i = 0; i < NUM_CUSTOM_MIDI_MAPPINGS - 1; i++)
+        for (uint8_t i = 0; i < NUM_CUSTOM_MIDI_MAPPINGS; i++)
         {
           data_json["type"][i] = custom_midi_map[i].type;
           data_json["in"][i] = custom_midi_map[i].in;