update Hercules P32 mapping by Be-ing · Pull Request #1200 · mixxxdj/mixxx

Be-ing · 2017-02-27T23:19:28Z

plus miscellaneous bug fixes and code cleanup

depends on

introduced in PR mixxxdj#1187

…ing_for_2.1

…oggling a deck

…ing_for_2.1

Now that these are handled by Mixxx.

To match new skin layout

following the redesign of Deere, effect unit assignment buttons are associated with decks

now that Components supports shift + effectFocusButton to toggle EffectUnits

Now that they do not adjust beatloop_size out of sync with the actual loop size

I got confused many times because the encoders are labelled symmetrically but nothing else on the controller is. So make the entire deck asymmetrical.

and remove reloop CO which was removed from PR mixxxdj#1187

…ing_for_2.1

beatloop_toggle no longer deactivates loops

now that loop_move_forward/backward have been removed

…ing_for_2.1

daschuer · 2017-05-25T23:47:42Z

Who is able to review this?

Be-ing · 2017-05-26T00:16:58Z

Wiki page has been updated.

now that shift + sync toggles quantize

…ing_for_2.1

Be-ing · 2017-06-01T20:35:11Z

Ready for merge? It would be nice if Hercules could test all the new features with a master build.

radusuciu · 2017-06-27T07:58:55Z

-    this.alignBeats.send(P32.padColors.blue);
+
+    this.enableEffectUnitButtons = new components.ComponentContainer(); //fii
+    this.enableEffectUnitButtons[1] = new components.EffectAssignmentButton({


Perhaps create these in a loop?

A loop would require some math for calculating the second byte of the MIDI messages, which I think is a bit overcomplicated when there are only 4 iterations. Sometimes it's easier to just copy & paste.

Alternative to math:

this.enableEffectUnitButtons = _.map([0x40, 0x41, 0x3c, 0x3d], function(midi, index) { return new components.EffectAssignmentButton({ midi: [0x90 + channel, midi], effectUnit: index + 1, group: this.currentDeck, on: P32.padColors.blue, off: P32.padColors.red, }); });

No need to use Lodash for this, standard Array.prototype.map works.

radusuciu · 2017-06-27T08:01:53Z

+            }, true);
+        } else { // right turn
+            engine.setValue(this.currentDeck, 'beatjump_1_forward', 1);
+            engine.beginTimer(200, function () {


Why is this timer necessary here?

So the button on screen lights up. Thanks for the reminder about this. I'll factor this out into a common function for common-controller-scripts.js.

But why delayed by 200ms? I trust the the code is necessary actually and I think I've had to do it as well - at least setting something to 1 and then back to 0 immediately without delay.

Would definitely be nice to have factored out, thanks!

The delay is so the skin button lights up briefly. If it is set to 1 then immediately back to 0 there is no response on screen. For this particular case, there are no skin buttons that light up with beatjump_1_forward, so it doesn't really make a difference. But for buttons like eject it does make a difference.

radusuciu · 2017-06-28T01:18:57Z

-                engine.setValue(this.currentDeck, 'eject', 0);
-            }, true);
-        }
+        engine.setValue(this.currentDeck, 'eject', value / 127);


No longer triggerControl?

No, I realized that wasn't appropriate here because there is a button up event... although, thinking about it again, this implementation requires that the Load button is released before the Shift button, which is the problem I solved for Components Buttons in #1271. I think I'll refactor this to use Components.

radusuciu · 2017-06-28T01:22:57Z

                        engine.setValue(this.group, 'play', 0);
                    } else {
                        engine.setValue(this.group, 'eject', 1);
+                        engine.beginTimer(225, function () {


Can use new triggerControl here?

…ing_for_2.1

also rearrange the code from top to bottom in order of how the controller is arranged

By default, the mapping is mirrored like the encoders' labels

The LED displays on the controller can show a maximum of 64.

Be-ing · 2017-07-28T17:02:52Z

Ready for merge?

Be-ing · 2017-09-09T17:54:50Z

Ping. Ready for merge? The mapping in master has been broken for some time now with API changes to the Components library.

Be-ing · 2017-09-17T17:59:11Z

Is there any reason this has not been merged?

daschuer · 2017-09-17T20:34:47Z

Should I just merge this now, so we can wait for feedback in the beta phase?

Be-ing · 2017-09-17T21:42:51Z

Yes. Evidently no one is going to give feedback until this is merged.

daschuer · 2017-09-17T21:46:15Z

Ok, thank you for the work.

Be-ing added 9 commits February 27, 2017 17:09

Hercules P32: fix rate_temp_up button

dd7dfc1

Hercules P32: fix deck toggling

bececdf

Hercules P32: use new beatloop_size and beatjump_size COs

b7c9369

introduced in PR mixxxdj#1187

Hercules P32: code cleanup

fd9815d

Merge remote-tracking branch 'upstream/master' into hercules_p32_mapp…

ec87dfe

…ing_for_2.1

Hercules P32: don't toggle slip mode when releasing slip button for t…

c9d98d8

…oggling a deck

Merge remote-tracking branch 'upstream/master' into hercules_p32_mapp…

1c464db

…ing_for_2.1

Hercules P32: remove defaultLoopSize & defaultBeatJumpSize options

4fa13fa

Now that these are handled by Mixxx.

Hercules P32: rearrange samplers

e97232f

To match new skin layout

Be-ing changed the title ~~update Hercules P32 mapping for beatloop_size and beatjump_size~~ update Hercules P32 mapping Mar 12, 2017

Be-ing added 19 commits March 13, 2017 18:22

Components: support alternate color for looping SamplerButton

06f4d03

Hercules P32: make looping sampler pads purple

ddcd4a9

Hercules P32: rearrange effect unit assignment buttons

589bfcc

following the redesign of Deere, effect unit assignment buttons are associated with decks

Hercules P32: use new Components EffectUnit API

b4291ca

Hercules P32: remove option to toggle effect units with decks

59e5bd0

now that Components supports shift + effectFocusButton to toggle EffectUnits

Hercules P32: revert to using loop_halve and loop_double

3580360

Now that they do not adjust beatloop_size out of sync with the actual loop size

Hercules P32: swap encoder mappings for right side

254d1ac

I got confused many times because the encoders are labelled symmetrically but nothing else on the controller is. So make the entire deck asymmetrical.

Hercules P32: rework loop pad mode and pressing loop encoder

c510462

Hercules P32: use new reloop CO for shift + loop encoder press

6e94057

Hercules P32: fix display of beatjump_size on controller

d631d2a

Hercules P32: replace loopauto_toggle with beatloop_toggle

900dfc1

Hercules P32: use new beatloop_halve/double COs

71b206c

and remove reloop CO which was removed from PR mixxxdj#1187

Hercules P32: use standard Components SyncButton functionality

707484d

Hercules P32: fix assignment of effect units to headphones

8a7cd71

Hercules P32: once again revert to loop_halve/double

07b173d

Merge remote-tracking branch 'upstream/master' into hercules_p32_mapp…

644ae69

…ing_for_2.1

Hercules P32: use reloop_toggle on loop encoder press when looping

ab2055f

beatloop_toggle no longer deactivates loops

Hercules P32: use renamed beatloop_activate ControlObject

3436353

Hercules P32: use beatjump_1_forward/backward

7890d90

now that loop_move_forward/backward have been removed

Be-ing mentioned this pull request May 25, 2017

new loop and beatjump controls #1187

Merged

3 tasks

Merge remote-tracking branch 'upstream/master' into hercules_p32_mapp…

aaa0fb2

…ing_for_2.1

Hercules P32: refactor for new Components button types

59b6416

Be-ing mentioned this pull request May 29, 2017

Components: refactor Button input handling #1271

Merged

Be-ing added 2 commits May 30, 2017 13:46

Hercules P32: remove dedicated quantize button

b248c78

now that shift + sync toggles quantize

Merge remote-tracking branch 'upstream/master' into hercules_p32_mapp…

7823b41

…ing_for_2.1

radusuciu reviewed Jun 27, 2017

View reviewed changes

Be-ing added 3 commits June 27, 2017 20:00

add script.triggerControl to common-controller-scripts.js

e7e0577

Hercules P32: use new script.triggerControl function

c86c0e2

Hercules P32: code cleanup

04f7a5d

radusuciu reviewed Jun 28, 2017

View reviewed changes

Be-ing added 5 commits July 3, 2017 17:27

Merge remote-tracking branch 'upstream/master' into hercules_p32_mapp…

0370b2d

…ing_for_2.1

Hercules P32: refactor to use Components for everything

be461e6

also rearrange the code from top to bottom in order of how the controller is arranged

Components minor code cleanup

53465fb

Hercules P32: make asymmetrical mapping of encoders optional

dae70b8

By default, the mapping is mirrored like the encoders' labels

Hercules P32: clamp loop & beatjump size to 64 by default

8ebe756

The LED displays on the controller can show a maximum of 64.

Be-ing force-pushed the hercules_p32_mapping_for_2.1 branch from ceb2ab3 to 8ebe756 Compare July 4, 2017 00:18

daschuer merged commit 96bfb41 into mixxxdj:master Sep 17, 2017

Be-ing deleted the hercules_p32_mapping_for_2.1 branch September 26, 2017 16:27

Be-ing restored the hercules_p32_mapping_for_2.1 branch September 26, 2017 16:27

Uh oh!

Conversation

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

Uh oh!

Uh oh!

daschuer commented May 25, 2017

Uh oh!

Be-ing commented May 26, 2017

Uh oh!

Be-ing commented Jun 1, 2017

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!

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 commented Jul 28, 2017

Uh oh!

Be-ing commented Sep 9, 2017

Uh oh!

Be-ing commented Sep 17, 2017

Uh oh!

daschuer commented Sep 17, 2017

Uh oh!

Be-ing commented Sep 17, 2017

Uh oh!

daschuer commented Sep 17, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Be-ing commented Feb 27, 2017 •

edited

Loading