merge forward prototype thijstriemstra

edrumulus.ino

@@ -26,7 +26,7 @@ static int analog_pins_rimshot4[] = { 35,    -1,     26,       -1,         14,
 
 // 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 = 6;
 //const int number_pads4 = 1; // example: just one single pad
 
 
@@ -104,16 +104,19 @@ void setup()
 void preset_settings()
 {
   // default MIDI note assignments
-  edrumulus.set_midi_notes      ( 0, 38, 40 ); // snare
-  edrumulus.set_midi_notes      ( 1, 36, 36 ); // kick
-  edrumulus.set_midi_notes      ( hihat_pad_idx, 22 /*42*/, 22 );
-  edrumulus.set_midi_notes_open ( hihat_pad_idx, 26 /*46*/, 26 );
-  edrumulus.set_midi_notes      ( hihatctrl_pad_idx, 44, 44 ); // Hi-Hat pedal hit
-  edrumulus.set_midi_notes      ( 4, 49, 55 ); // crash
-  edrumulus.set_midi_notes      ( 5, 48, 50 ); // tom 1
-  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       ( 0, 38, 40 ); // snare
+  edrumulus.set_midi_notes       ( 1, 36, 36 ); // kick
+  // not sure what difference between set_midi_notes and set_midi_notes_open is.
+  // only set_midi_notes_open seems to work?
+  //edrumulus.set_midi_notes       ( hihat_pad_idx, 22, 26 );
+  edrumulus.set_midi_notes_open  ( hihat_pad_idx, 28, 32 );
+  edrumulus.set_midi_notes       ( hihatctrl_pad_idx, 44, 44 ); // Hi-Hat pedal hit
+  edrumulus.set_midi_ctrl_ch     ( hihatctrl_pad_idx, 4 ); // Hi-Hat control
+  edrumulus.set_midi_notes       ( 4, 49, 49 ); // tom 1
+  edrumulus.set_midi_notes       ( 5, 48, 48 ); // tom 2
+  edrumulus.set_midi_notes       ( 6, 51, 53 ); // x
+  edrumulus.set_midi_notes       ( 7, 45, 47 ); // x
+  //edrumulus.set_midi_notes     ( 8, 43, 58 ); // x
 
   // default drum kit setup
   edrumulus.set_pad_type ( 0, Edrumulus::PD8 );  // snare
@@ -125,6 +128,49 @@ void preset_settings()
   edrumulus.set_pad_type ( 6, Edrumulus::CY8 );  // ride
   edrumulus.set_pad_type ( 7, Edrumulus::TP80 ); // tom 2
   edrumulus.set_pad_type ( 8, Edrumulus::TP80 ); // tom 3
+
+  // thijstriemstra prototype setup configuration...
+
+  // SNARE (Drum-tec Diabolo 12 inch)
+  edrumulus.set_pad_type             ( 0, Edrumulus::DIABOLO12 );
+  // disable for now
+  //edrumulus.set_pos_sense_is_used    ( 0, false );
+  // disable rim for now, see
+  // https://github.com/corrados/edrumulus/discussions/30#discussioncomment-1908586
+  //edrumulus.set_rim_shot_is_used     ( 0, false );
+  //edrumulus.set_rim_shot_treshold  ( 0, 25 );
+  //edrumulus.set_velocity_threshold   ( 0, 9 );
+  //edrumulus.set_pos_sense_is_used  ( 0, true );
+  //edrumulus.set_pos_threshold      ( 0, 4 );
+  //edrumulus.set_pos_sensitivity    ( 0, 17 );
+
+  // KICK (Roland KD-120BK)
+  // see https://github.com/corrados/edrumulus/discussions/29
+  edrumulus.set_pad_type             ( 1, Edrumulus::KD120 );
+  // less dynamic on kick (similar to other drum modules)
+  //edrumulus.set_curve                ( 1, Edrumulus::LOG2 );
+  //edrumulus.set_velocity_threshold   ( 1, 12 );               // default is 8
+  //edrumulus.set_velocity_sensitivity ( 1, 16 );              // default is 9
+
+  // HI-HAT (using rim switch, Roland CY-5)
+  edrumulus.set_pad_type             ( hihat_pad_idx, Edrumulus::CY5 );
+  //edrumulus.set_rim_shot_is_used     ( hihat_pad_idx, true );
+  //edrumulus.set_rim_shot_treshold    ( hihat_pad_idx, 31 );
+  //edrumulus.set_velocity_threshold   ( hihat_pad_idx, 17 );
+  //edrumulus.set_velocity_sensitivity ( hihat_pad_idx, 21 );
+
+  // HI-HAT CTRL (FD-8)
+  edrumulus.set_pad_type             ( hihatctrl_pad_idx, Edrumulus::FD8 );
+
+  // TOM1 (Roland PD-5)
+  edrumulus.set_pad_type             ( 4, Edrumulus::PD5 );
+  //edrumulus.set_velocity_threshold   ( 4, 15 );
+  //edrumulus.set_velocity_sensitivity ( 4, 12 );
+
+  // TOM2 (Roland PD-5)
+  edrumulus.set_pad_type             ( 5, Edrumulus::PD5 );
+  //edrumulus.set_velocity_threshold   ( 5, 15 );
+  //edrumulus.set_velocity_sensitivity ( 5, 12 );
 }