Skip to content

Hercules P32 mapping and Controls JS library #1054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rryan merged 103 commits into from
Jan 20, 2017
Merged

Hercules P32 mapping and Controls JS library #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
04cc28d
Hercules P32 DJ: initial commit
Be-ing Mar 31, 2016
5417b84
Hercules P32: update forum link
Be-ing Mar 31, 2016
52163e4
Hercules P32: clarify wording of acknowledgement of Hercules
Be-ing Mar 31, 2016
2d14fa6
Hercules P32: make deck toggling work
Be-ing Apr 1, 2016
2a5757a
Hercules P32: use soft takeover for EQs and volume faders
Be-ing Apr 1, 2016
56c9be7
Hercules P32: fix volume slider scaling
Be-ing Apr 2, 2016
0ffb38e
Hercules P32: map hotcues
Be-ing Apr 3, 2016
2bf9d6f
Hercules P32: move all loop functionality to one encoder
Be-ing Apr 3, 2016
7783c6c
Hercules P32: swap positions of keylock and quantize buttons to match…
Be-ing Apr 3, 2016
5eb0654
Hercules P32: use shift + browse encoder for headphone mix and press …
Be-ing Apr 3, 2016
350bccc
Hercules P32: map record button and map shift+record to toggle betwee…
Be-ing Apr 3, 2016
a4901d2
Hercules P32: push browse encoder to maximize/minimize library
Be-ing Apr 3, 2016
ad20c5f
Hercules P32: add timers to set loop_halve, loop_double, and eject to…
Be-ing Apr 3, 2016
e7d2069
Hercules P32: make play button work while shift is pressed
Be-ing Apr 3, 2016
bc31465
Hercules P32: disable loops <= 1 beat when loop encoder is unpressed
Be-ing Apr 5, 2016
c7c0472
Merge remote-tracking branch 'upstream/master' into hercules_p32_mapping
Be-ing Apr 14, 2016
3219e80
Hercules P32: remove duplicate XML mapping of browse encoder
Be-ing Apr 15, 2016
62fd451
Hercules P32: do not use timer for returning loop_halve & loop_double…
Be-ing Apr 18, 2016
52b7d78
Merge remote-tracking branch 'upstream/master' into hercules_p32_mapping
Be-ing Apr 25, 2016
d138002
Hercules P32: make shift+play go to beginning of track & stop
Be-ing Apr 26, 2016
739f0cd
Hercules P32: don't pass parent layer object to Control JS objects
Be-ing Apr 27, 2016
e3ea4c1
Hercules P32: map effects racks
Be-ing Apr 27, 2016
5048b42
Hercules P32: remap filter encoder to beat jumping
Be-ing Apr 27, 2016
85bbf58
Hercules P32: make default loop and beat jump sizes user configurable…
Be-ing Apr 27, 2016
3a33094
Hercules P32: add loopEnabledDot option
Be-ing Apr 28, 2016
fd9ab66
Hercules P32: remove 'out' prefix from Control.out(dis)connect
Be-ing Apr 28, 2016
d6636bd
Hercules P32: rework Control child objects for knobs/faders to make t…
Be-ing Apr 28, 2016
e317296
Hercules P32: map EQs and volume faders with CC objects
Be-ing Apr 28, 2016
06d169f
Hercules P32: map effect parameter knobs with CC objects
Be-ing Apr 28, 2016
9f33b7e
Hercules P32: fix effect selection buttons (shift + ON/MACRO)
Be-ing Apr 28, 2016
20b16b5
Hercules P32: some code cleanup
Be-ing Apr 29, 2016
82e6d4d
Hercules P32: less that, more this
Be-ing Apr 29, 2016
9ccfd5f
Hercules P32: create new ToggleButtonAsymmetric, CueButton, PlayButto…
Be-ing Apr 29, 2016
4c91165
Hercules P32: add some convenience methods to Control
Be-ing Apr 30, 2016
1ce1429
Hercules P32: various improvements to Control
Be-ing Apr 30, 2016
c4a4a38
Hercules P32: add more Control derivatives
Be-ing Apr 30, 2016
f2da76a
Hercules P32: add LayerContainer & Deck classes and make use of them
Be-ing Apr 30, 2016
d952514
Hercules P32: code cleanup
Be-ing Apr 30, 2016
8fb7dbb
Hercules P32: fix typo
Be-ing Apr 30, 2016
07ba6da
Hercules P32: make Control.onlyOnPress an attribute
Be-ing Apr 30, 2016
1c1f5d3
Hercules P32: add documentation for Control library
Be-ing Apr 30, 2016
22a2cab
Hercules P32: make passing null to Control.inSetup more useful
Be-ing Apr 30, 2016
b7b6d14
Hercules P32: make JSHint happy
Be-ing Apr 30, 2016
83ee9ae
Hercules P32: add new files to Windows uninstaller
Be-ing Apr 30, 2016
a3d737e
Hercules P32: expand documentation for Control library
Be-ing Apr 30, 2016
a6b74e6
Hercules P32: check if an object is an array correctly
Be-ing Apr 30, 2016
e21d908
Hercules P32: make LayerContainer.forEachControl() work for arrays of…
Be-ing Apr 30, 2016
0fdf3dc
Hercules P32: map sampler pad layer
Be-ing May 1, 2016
7279d0b
Hercules P32: change behavior of sampler pads
Be-ing May 1, 2016
4dbfa1d
Hercules P32: map manual looping controls for 'Loop' pad layer
Be-ing May 4, 2016
a87fc0f
Hercules P32: assign samplers to crossfader
Be-ing May 6, 2016
9942c49
Merge remote-tracking branch 'upstream/master' into hercules_p32_mapping
Be-ing May 22, 2016
7a181ca
Merge remote-tracking branch 'upstream/master' into hercules_p32_mapping
Be-ing Jul 23, 2016
774b967
Merge remote-tracking branch 'upstream/master' into hercules_p32_mapping
Be-ing Jul 25, 2016
85143b4
switch beatjump to the shifted functionality and tempo to unshifted
Be-ing Sep 10, 2016
21b239a
Hercules P32: show which effect in chain is being controlled
Be-ing Sep 15, 2016
a4ef4c2
use cue+shift for aligning beatgrid instead of toggling keylock
Be-ing Nov 6, 2016
95fba27
account for P32 sending values other than 127 and 1 for encoders
Be-ing Nov 6, 2016
641ed13
P32: map slicer pad mode to effects controls
Be-ing Nov 6, 2016
469c549
P32: map shifted MIDI messages for effects buttons (Slicer mode)
Be-ing Nov 6, 2016
aa4207e
P32: remove redundant mapping for enabling effect units on headphones
Be-ing Nov 6, 2016
f4de5ec
P32: map shifted manual loop controls
Be-ing Nov 6, 2016
ad62bf8
P32: move shifted functionality of sync and cue buttons to Loop pad l…
Be-ing Nov 22, 2016
365cff4
P32: refactor to use options objects
Be-ing Nov 24, 2016
72093c4
switch to jQuery's extend to Lodash's assign and merge
Be-ing Nov 25, 2016
f0c5aec
implement support for shifting/unshifting in Control library
Be-ing Nov 25, 2016
f1b751a
P32: map slip button
Be-ing Nov 25, 2016
c8a2931
P32: JSHint fixes
Be-ing Nov 25, 2016
e37feb1
start documentation for JS library
Be-ing Nov 25, 2016
72c5fc7
move Button-specific functionality from generic Control to Button
Be-ing Nov 25, 2016
6b4f150
Add documentation for Button. Add support to Button for controllers t…
Be-ing Nov 25, 2016
1995d4d
expand Control library documentation
Be-ing Nov 25, 2016
f62cc27
continue refining Control library documentation
Be-ing Nov 25, 2016
0ab9128
more Control library documentation work
Be-ing Nov 25, 2016
aafd0ed
add documentation for every part of Control JS library
Be-ing Nov 25, 2016
a0e0a7b
small optimization of Button
Be-ing Nov 27, 2016
8db737c
get rid of overcomplicated Function.prototype.call() use and use more…
Be-ing Dec 1, 2016
8226c98
P32: make deck arrangement easier to configure
Be-ing Dec 6, 2016
86d0bc1
use engine.setParameter() now that soft takeover works with it
Be-ing Dec 6, 2016
02d8172
create new EffectUnit ControlContainer for effect units with metaknobs
Be-ing Dec 6, 2016
bbb470c
explain how to use EffectUnit ControlContainer with controllers desig…
Be-ing Dec 6, 2016
e0cf873
use new EffectUnit,focused CO for EffectUnit ControlContainer
Be-ing Dec 19, 2016
650c2ef
enable soft takeover for EffectUnit ControlContainer
Be-ing Dec 19, 2016
5c358e6
clarify documentation regarding "midi" attribute for Controls
Be-ing Dec 23, 2016
defed0c
enable use of set/getParameter for Controls
Be-ing Dec 23, 2016
413237b
implement new CO interface for effects in EffectUnit ControlContainer
Be-ing Dec 23, 2016
66322c1
enable soft takeover for meta knobs when using superknob
Be-ing Dec 23, 2016
b52e687
automatically handle soft takeover for CCs
Be-ing Dec 27, 2016
eef49b3
clarify EffectUnit ControlContainer documentation and rename enableEf…
Be-ing Jan 2, 2017
4617be6
add lodash.mixxx.js to Windows NSIS uninstaller
Be-ing Jan 2, 2017
26fe2e3
Merge remote-tracking branch 'upstream/master' into hercules_p32_mapp…
Be-ing Jan 2, 2017
a2212b0
Hercules P32: do not set deck enable switches for EffectUnits on startup
Be-ing Jan 3, 2017
6e7647f
Use meta_force_next_update to initialize state of effects
Be-ing Jan 3, 2017
73402bf
use show_parameters = 1 && focused_effect = 0 to control metaknobs wi…
Be-ing Jan 3, 2017
b12559b
Hercules P32: add deck enable switches for EffectUnits
Be-ing Jan 4, 2017
3ef1298
remove use of meta_force_next_update
Be-ing Jan 6, 2017
57ba9b3
refactor EffectUnit and cleanup other parts of Controls library
Be-ing Jan 6, 2017
bcdabf4
happy belated new year
Be-ing Jan 6, 2017
ff7febc
add example EffectUnit.dryWetKnob.inValueScale()
Be-ing Jan 6, 2017
f27597f
Controls JS cleanup, documentation revision, and add RingEncoder Control
Be-ing Jan 6, 2017
7662497
rename CC to Pot
Be-ing Jan 13, 2017
2e22cc5
Hercules P32: bump minimum Mixxx version to 2.1
Be-ing Jan 18, 2017
5776c3a
Hercules P32: add wiki link to XML
Be-ing Jan 20, 2017
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
5 changes: 5 additions & 0 deletions build/nsis/Mixxx.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,7 @@ Section "Uninstall"
Delete "$INSTDIR\controllers\Hercules DJ Control MP3.hid.xml"
Delete "$INSTDIR\controllers\Hercules DJ Control MP3.midi.xml"
Delete "$INSTDIR\controllers\Hercules DJ Control Steel.midi.xml"
Delete "$INSTDIR\controllers\Hercules P32 DJ.midi.xml"
Delete "$INSTDIR\controllers\Hercules-DJ-Console-4-Mx-scripts.js"
Delete "$INSTDIR\controllers\Hercules-DJ-Console-Mk1-hid-scripts.js"
Delete "$INSTDIR\controllers\Hercules-DJ-Console-Mk2-hid-scripts.js"
Expand All @@ -443,6 +444,7 @@ Section "Uninstall"
Delete "$INSTDIR\controllers\Hercules-DJ-Control-MP3-scripts.js"
Delete "$INSTDIR\controllers\Hercules-DJ-Control-Steel-scripts.js"
Delete "$INSTDIR\controllers\Hercules-mp3e2-compat.js"
Delete "$INSTDIR\controllers\Hercules-P32-scripts.js"
Delete "$INSTDIR\controllers\HID-Keyboard.js"
Delete "$INSTDIR\controllers\HID-Trackpad.js"
Delete "$INSTDIR\controllers\Ion Discover DJ.midi.xml"
Expand All @@ -456,6 +458,9 @@ Section "Uninstall"
Delete "$INSTDIR\controllers\Korg nanoPAD2.midi.xml"
Delete "$INSTDIR\controllers\Korg-nanoKONTROL-2-scripts.js"
Delete "$INSTDIR\controllers\Korg-nanoPAD2-scripts.js"
Delete "$INSTDIR\controllers\lodash.mixxx.js"
Delete "$INSTDIR\controllers\M-Audio-Xponent-scripts.js"
Delete "$INSTDIR\controllers\M-Audio_Xponent.midi.xml"
Delete "$INSTDIR\controllers\korg_nanokontrol2.mixco.output.js"
Delete "$INSTDIR\controllers\korg_nanokontrol2.mixco.output.midi.xml"
Delete "$INSTDIR\controllers\M-Audio_Xsession_pro.midi.xml"
Expand Down
Loading