diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..a6f1d86
Binary files /dev/null and b/.DS_Store differ
diff --git a/arduino/XDJ200SX.ino b/arduino/XDJ200SX.ino
index da4e759..d6896e8 100644
--- a/arduino/XDJ200SX.ino
+++ b/arduino/XDJ200SX.ino
@@ -114,7 +114,6 @@ Bounce loopin_boto = Bounce (loopin_pin, 50);
Bounce loopout_boto = Bounce (loopout_pin, 50);
Bounce reloop_boto = Bounce (reloop_pin, 50);
-//Bounce time_boto = Bounce (time_pin, 50);
// --- Execute Function if receiving a MIDI Message ---
@@ -277,10 +276,20 @@ jet_boto.update();
zip_boto.update();
wah_boto.update();
hold_boto.update();
-//time_boto.update();
mastertempo_boto.update();
load_boto.update();
+// --- update new buttons for the xdj200sx ---
+
+foldersearch_back_boto.update();
+foldersearch_forward_boto.update();
+loopin_boto.update();
+loopout_boto.update();
+reloop_boto.update();
+beatloop_boto.update();
+autocue_boto.update();
+
+
//Play
if(play_boto.fallingEdge()){
@@ -369,13 +378,13 @@ if(hold_boto.fallingEdge()){
if(hold_boto.risingEdge()){
usbMIDI.sendNoteOff(71, 0, channel);
}
- //time
-//if(time_boto.fallingEdge()){
-// usbMIDI.sendNoteOn(72, 127, channel);
-// }
-// if(time_boto.risingEdge()){
-// usbMIDI.sendNoteOff(72, 0, channel);
-// }
+ //autocue
+if(autocue_boto.fallingEdge()){
+ usbMIDI.sendNoteOn(72, 127, channel);
+ }
+ if(autocue_boto.risingEdge()){
+ usbMIDI.sendNoteOff(72, 0, channel);
+ }
//load
if(load_boto.fallingEdge()){
usbMIDI.sendNoteOn(73, 127, channel);
@@ -385,6 +394,60 @@ if(load_boto.fallingEdge()){
}
+
+ // ---- addiitonal buttons for the xdj200sx -----
+
+ // Folder Search left
+ if(foldersearch_back_boto.fallingEdge()){
+ usbMIDI.sendNoteOn(74, 127, channel); //0x4A
+ }
+ if(foldersearch_back_boto.risingEdge()){
+ usbMIDI.sendNoteOff(74, 0, channel); //0x4A
+ }
+ }
+ // Folder Search right
+ if(foldersearch_forward_boto.fallingEdge()){
+ usbMIDI.sendNoteOn(75, 127, channel); //0x4B
+ }
+ if(foldersearch_forward_boto.risingEdge()){
+ usbMIDI.sendNoteOff(75, 0, channel); //0x4B
+ }
+ // Loop IN
+ if(loopin_boto.fallingEdge()){
+ usbMIDI.sendNoteOn(76, 127, channel); //0x4C
+ }
+
+ if(loopin_boto.risingEdge()){
+ usbMIDI.sendNoteOff(76, 0, channel); //0x4C
+ }
+ // Loop OUT
+ if(loopout_boto.fallingEdge()){
+ usbMIDI.sendNoteOn(77, 127, channel); //0x4D
+ }
+ if(loopout_boto.risingEdge()){
+ usbMIDI.sendNoteOff(77, 0, channel); //0x4D
+ }
+ // Reloop
+ if(reloop_boto.fallingEdge()){
+ usbMIDI.sendNoteOn(78, 127, channel); //0x4E
+ }
+ if(reloop_boto.risingEdge()){
+ usbMIDI.sendNoteOff(78, 0, channel); //0x4E
+ }
+ // Beatloop
+ if(beatloop_boto.fallingEdge()){
+ usbMIDI.sendNoteOn(79, 127, channel); //0x4F
+ }
+ if(beatloop_boto.risingEdge()){
+ usbMIDI.sendNoteOff(79, 0, channel); //0x4F
+ }
+
+ // ---- end of new additions to xdj200sx -----
+
+
+
+
+
//Jog: cridem la funció JogNudge
JogNudge();
diff --git a/mixxx/MIDI/XDJ200SX.midi.xml b/mixxx/MIDI/XDJ200SX.midi.xml
index c7cd585..1032e75 100644
--- a/mixxx/MIDI/XDJ200SX.midi.xml
+++ b/mixxx/MIDI/XDJ200SX.midi.xml
@@ -74,8 +74,8 @@
[Channel1]
- loop_halve
- LOOP HALF
+ beatjump_X_forward
+ BEAT JUMP BCK 16 BEATS
0x90
0x40
@@ -84,8 +84,8 @@
[Channel1]
- loop_double
- LOOP DOUBLE
+ beatjump_16_forward
+ BEAT JUMP FWD 16 BEATS
0x90
0x41
@@ -243,6 +243,79 @@
+
+
+
+
+
+ [Channel1]
+ loop_halve
+ LOOP HALF
+ 0x90
+ 0x4A
+
+
+
+
+
+
+ [Channel1]
+ loop_double
+ LOOP DOUBLE
+ 0x90
+ 0x4B
+
+
+
+
+
+
+ [Channel1]
+ loop_in
+ LOOP IN
+ 0x90
+ 0x4C
+
+
+
+
+
+
+ [Channel1]
+ loop_out
+ LOOP OUT
+ 0x90
+ 0x4D
+
+
+
+
+
+
+ [Channel1]
+ reloop_exit
+ RELOOP
+ 0x90
+ 0x4E
+
+
+
+
+
+
+ [Channel1]
+ beatloop_4_toggle
+ 4 BEAT LOOP
+ 0x90
+ 0x4F
+
+
+
+
+
+
+
+