Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions edrumulus.ino
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
// For older prototypes or custom implementations, simply change the GPIO numbers in the table below
// to match your hardware (note that the GPIO assignment of Prototype 2 is the same as Prototype 4).
// clang-format off
// analog pins setup: snare | kick | hi-hat | hi-hat-ctrl | crash | tom1 | ride | tom2 | tom3
static int analog_pins4[] = { 36, 33, 32, 25, 34, 39, 27, 12, 15 };
static int analog_pins_rimshot4[] = { 35, -1, 26, -1, 14, -1, 13, -1, -1 };
// analog pins setup: snare | kick | hi-hat | hi-hat-ctrl | crash | tom1 | ride | tom2 | tom3 | crash2
static int analog_pins4[] = { 36, 33, 32, 25, 34, 39, 27, 12, 15, 4 };
static int analog_pins_rimshot4[] = { 35, -1, 26, -1, 14, -1, 13, -1, -1, 0 };
// clang-format on

// if you want to use less number of pads, simply adjust number_pads4 value
// const int number_pads4 = sizeof ( analog_pins4 ) / sizeof ( int ); // example: use all inputs defined in analog_pins4
const int number_pads4 = 8; // example: do not use tom3 and shrink number of pads from 9 to 8
// const int number_pads4 = sizeof(analog_pins4) / sizeof(int); // example: use all inputs defined in analog_pins4
const int number_pads4 = 9; // example: do not use crash2 and shrink number of pads from 10 to 9
// const int number_pads4 = 1; // example: just one single pad

#include "edrumulus.h"
Expand Down Expand Up @@ -123,6 +123,7 @@ void preset_settings()
edrumulus.set_midi_notes(6, 51, 53 /*59*/); // ride (edge: 59, bell: 53)
edrumulus.set_midi_notes(7, 45, 47); // tom 2
edrumulus.set_midi_notes(8, 43, 58); // tom 3
edrumulus.set_midi_notes(9, 57, 52); // crash 2

// default drum kit setup
edrumulus.set_pad_type(0, Pad::PD8); // snare
Expand All @@ -134,6 +135,7 @@ void preset_settings()
edrumulus.set_pad_type(6, Pad::CY8); // ride
edrumulus.set_pad_type(7, Pad::TP80); // tom 2
edrumulus.set_pad_type(8, Pad::TP80); // tom 3
edrumulus.set_pad_type(9, Pad::CY6); // crash 2
}

void loop()
Expand Down
2 changes: 1 addition & 1 deletion tools/edrumulus_gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"KD120 Roland Mesh Kick Pad":16, "KD8 Roland Kick Pad":14, \
"KD7 Roland Kick Pad":6, "KT10 Roland Kick Pedal":20, "MPS-750X Millenium Kick Pad":23, \
"FD8 Roland Hi-Hat Pedal":3, "VH12CTRL Roland Hi-Hat Pedal":5, "LEHHS12CCTRL Lemon Hi-Hat Pedal":27}
pad_names = ["snare", "kick", "hi-hat", "ctrl", "crash", "tom1", "ride", "tom2", "tom3"]
pad_names = ["snare", "kick", "hi-hat", "ctrl", "crash", "tom1", "ride", "tom2", "tom3", "crash2"]
curve_types = ["LINEAR", "EXP1", "EXP2", "LOG1", "LOG2"]
cmd_names = [ "type", "thresh", "sens", "pos thres", "pos sens", "rim thres", "mask"]
cmd_val = [ 102, 103, 104, 105, 106, 107, 118]
Expand Down
19 changes: 19 additions & 0 deletions tools/settings/trigger_settings.txt
Original file line number Diff line number Diff line change
Expand Up @@ -169,3 +169,22 @@
8,122,15
8,120,0
8,110,4
9,102,8
9,103,8
9,104,6
9,105,9
9,106,14
9,107,12
9,118,6
9,109,0
9,111,1
9,119,0
9,114,0
9,112,57
9,113,52
9,116,127
9,117,127
9,121,25
9,122,15
9,120,0
9,110,4