[WiP] Traktor S4 MK2 controller updates by fayaaz · Pull Request #1562 · mixxxdj/mixxx

fayaaz · 2018-03-25T19:33:26Z

Pull request for updates to S4 MK2. WiP.

ywwg

There are a few things going on in this PR which makes it harder to know which parts relate to which other parts. If possible I'd prefer to split out the part that displays the loop size because I'd like to make sure that's written in a way that is easier to understand and reuse in the future.

ywwg · 2018-03-25T21:47:57Z

+  for (k = 0; k < 0x7F; k+=0x05) {
+      packets[0] = 0x82;
+      for (j = 0; j < sizesArray[beats].length; j++) {
+        var hid_msg = start_signal +  sizesArray[beats][j]


hid_msg is only used on the next line so it's ok to inline there

ywwg · 2018-03-25T21:48:30Z

+  }
+  start_signal = LoopSizeIndicators[group]
+
+  var sizesArray = {


I don't suppose it's possible to mark this const somehow?

QtScript 4.8 doesn't support such modern JavaScript keywords.

ywwg · 2018-03-25T21:49:42Z

+        var hid_msg = start_signal +  sizesArray[beats][j]
+        packets[hid_msg] = k;
+    }
+  controller.send(packets, packets.length, 0);


indent this line please

ywwg · 2018-03-25T21:50:20Z

+    4:  [9,10,11,13],
+    2:  [9,11,12,14,15],
+  }
+  var packets = Object();


I think it would be safer to declare this object inside the loop so there's no risk of stale data getting reused

IMO using the Object() constructor is odd. I'd prefer an empty object literal {} instead. But this is a really minor point. If you disagree you can leave it as is.

ywwg · 2018-03-25T21:52:48Z

+  start_signal = LoopSizeIndicators[group]
+
+  var sizesArray = {
+    64: [1,2,4,5,6,7,9,10,11,13],


Are these arrays for lighting specific segments of the LED display? I'd prefer a general function that can display arbitrary integers for easier reading/testing and possible future reuse.

ywwg · 2018-03-25T21:54:10Z

sweet! Can you take pictures or a short video of the new features in action? I don't have an S4 (I borrowed one to make the mapping) so I can't test it myself.

Be-ing

Thanks for working on this! Could you rebase this on the 2.1 branch?

Be-ing · 2018-03-25T22:51:22Z

+    TraktorS4MK2.controller.shift_pressed['deck1'] ||
+    TraktorS4MK2.controller.shift_pressed['deck2']
+  ) {
+    if(delta > 0){


style nitpick: put space after if:
if (delta > 0) {

Be-ing · 2018-03-25T22:51:38Z

+  ) {
+    if(delta > 0){
+        engine.setValue(group, 'beats_translate_later', true);
+    } else if (delta < 0){


} else if (delta < 0) {

Be-ing · 2018-03-25T22:51:54Z

+        engine.setValue(group, 'beats_translate_earlier', true);
+    }
+  }
+  else {


combine with line above: } else {

Be-ing · 2018-03-25T22:55:20Z

      engine.setValue(field.group, "loop_halve", 0);
    }
  }
+  // TraktorS4MK2.sendLoopSizeMessage(group, engine.getValue(field.group, "beatloop_size"));


Connect changes in beatloop_size to an output callback function instead of sending the update to the controller when input is received. The former makes sure that the controller stays in sync even if the user changes beatloop_size by clicking on screen.

Be-ing · 2018-03-25T22:58:55Z

+  engine.setValue("[Master]", "maximize_library", !library_maximized);
+}
+
+TraktorS4MK2.FXButtonHandler = function(field){


In the future this should work the same as the Components EffectUnit, but that will be quite a bit of work and I don't know if you can do that in the next few days for 2.1. For now, just getting the enable buttons and metaknobs working would be good. Are you still having trouble with the metaknobs?

Be-ing · 2018-03-27T01:49:29Z

+    } else if (value === 0.125){
+      TraktorS4MK2.sendLoopSizeMessage(deck, '-', 8, false, false);
+    } else {
+      TraktorS4MK2.sendLoopSizeMessage(deck, '-', 'n', false, false);


It's great that you got this working! One of my main motivations for adding beatloop_size in #1187 was to support controllers like this, so I'm really glad this can be in the same Mixxx release.

If you use the dot instead of - to indicate a fraction, you could use both digits of the display for fractional sizes. This is how it is done on the Hercules P32. The code could also be more robust by showing the reciprocal of the loop size (1 / value) instead of checking for specific fractions. How does Traktor show fractional loop sizes?

I'm not sure about Traktor, I haven't actually used it except for with the S2 (for a limited period of time) which doesn't have a loop counter.

Noted - although not sure how to make the code more robust with the fractions.

Try checking if 1/value is an integer. If it is, show that on the LEDs with a dot.

fayaaz · 2018-03-27T02:12:44Z

Summary of changes:

Loop Counter now works
Shift + Gain moves the beatgrid
Reset button resets the key
FX Buttons 1, 2 and 3 turn on and off the FX (toggle)
Holding shift with the FX button cycles through Effects on the Effect unit
FX meta knobs work
Snap button gives a fullscreen library
Shift + Browse lets you move through the left hand pane in the library
Loop Recorder record button repurposed for recording mix
Shift + nudging the wheel while the deck is not playing allows fast search through loaded track

Be-ing · 2018-03-27T02:24:44Z

+    }
+  // deal with larger Loops
+  } else if (value.toString().length > 2){
+    TraktorS4MK2.sendLoopSizeMessage(deck, value.toString().split("")[0], value.toString().split("")[1], true, true);


Maybe light up both dots in this case?

That is what is happening here

Oh, I see. Sorry, I didn't look at the code close enough before.

Be-ing · 2018-03-28T03:51:29Z

You may want to map the new reloop_andstop Control to shift + loop in or shift + loop out.

Be-ing · 2018-03-30T00:47:17Z

@fayaaz I have rebased this branch on 2.1 and merged it with the 2.1 branch. If you have time to continue working on this before the 2.1 release, please open a new pull request targeting that branch. Otherwise, you can open a new PR targeted at the master branch after the 2.1 release.

Be-ing · 2018-03-30T00:48:28Z

Could you update the wiki page for this controller?

Add beatgrid move and record functions

055b328

fayaaz changed the title ~~Traktor S4 MK2 controller updates~~ [WiP] Traktor S4 MK2 controller updates Mar 25, 2018

ywwg requested changes Mar 25, 2018

View reviewed changes

FX buttons now turn FX on and off

36f66ee

Be-ing changed the base branch from master to 2.1 March 25, 2018 22:47

Be-ing changed the base branch from 2.1 to master March 25, 2018 22:47

Be-ing suggested changes Mar 25, 2018

View reviewed changes

Update fx meta and add shift jogwheel functions

7947e89

Be-ing added this to the 2.1.0 milestone Mar 26, 2018

Be-ing added the controller mappings label Mar 26, 2018

fayaaz added 2 commits March 27, 2018 02:13

Working beatloop counters

d6de239

Style changes

d005fe7

Be-ing reviewed Mar 27, 2018

View reviewed changes

fayaaz added 2 commits March 27, 2018 02:59

Change reset to reset key

37a78c2

Add comments about the display

57e90d2

Be-ing reviewed Mar 27, 2018

View reviewed changes

Be-ing closed this Mar 30, 2018

Uh oh!

Conversation

fayaaz commented Mar 25, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ywwg left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ywwg commented Mar 25, 2018

Uh oh!

Be-ing left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Be-ing Mar 27, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fayaaz Mar 27, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fayaaz commented Mar 27, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Be-ing commented Mar 28, 2018

Uh oh!

Be-ing commented Mar 30, 2018

Uh oh!

Be-ing commented Mar 30, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

fayaaz commented Mar 25, 2018 •

edited

Loading

Be-ing Mar 27, 2018 •

edited

Loading

fayaaz Mar 27, 2018 •

edited

Loading

fayaaz commented Mar 27, 2018 •

edited

Loading