Skip to content
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.

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

Traktor s3 2.3 #3031

Merged
merged 103 commits into from
Feb 16, 2021
Merged
Show file tree
Hide file tree
Changes from 98 commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
ba6304a
Traktor S3: Initial commit
ywwg Jul 24, 2020
df87b97
Traktor S3: move from channel-specific to deck aliases
ywwg Jul 26, 2020
297537a
HidController: loop until no more messages are available on poll
Be-ing Jul 27, 2020
1ac6500
HidController: do not copy incoming data before processing it
Be-ing Jul 27, 2020
5c49335
Merge branch '2.3' into traktor-s3-2.3
ywwg Jul 31, 2020
6fcecb5
Traktor S3: Fix most connections for deck switching
ywwg Jul 31, 2020
7563f01
Traktor S3: Bind more of the library buttons
ywwg Aug 1, 2020
873eb53
Traktor S3: Master Vus, start implementing color lights
ywwg Aug 2, 2020
7d7dbf7
Traktor S3: Lights behaving better, still a ways to go
ywwg Aug 2, 2020
28f2a24
Merge remote-tracking branch 'upstream/2.3' into hid_polling
Be-ing Aug 2, 2020
dccade5
HidController: filter redundant messages
Be-ing Aug 2, 2020
ec872e5
Traktor S3: Try to get deck switching working
ywwg Aug 2, 2020
1b0d65a
ControllerManager: make kPollInterval a static member
Be-ing Aug 2, 2020
73e6460
HidController: stop polling when exceeding poll interval
Be-ing Aug 2, 2020
759a0c2
HidController: clang-format #includes
Be-ing Aug 2, 2020
f5f6501
Traktor S3: good progress on lights
ywwg Aug 3, 2020
adbcd3f
Traktor S3: more lights
ywwg Aug 4, 2020
7b1d774
Merge branch 'clone-deck-crash' into traktor-s3-2.3
ywwg Aug 4, 2020
76404cc
Traktor S3: Fix color lights, add more
ywwg Aug 4, 2020
907068e
Traktor S3: configurable dim/bright color values
ywwg Aug 4, 2020
bce2fe8
Traktor S3: pad buttons
ywwg Aug 5, 2020
6bd797b
Traktor S3: light up the reverse light
ywwg Aug 5, 2020
ac58bc2
Traktor S3: Most functions working decently
ywwg Aug 6, 2020
520e942
Traktor S3: hotcue colors!
ywwg Aug 6, 2020
0a2d951
TraktorS3: fx buttons
ywwg Aug 9, 2020
232516a
Merge branch '2.3' into traktor-s3-2.3
ywwg Aug 9, 2020
29bb6e7
Traktor S3: clean up lint problems
ywwg Aug 9, 2020
f496ede
Traktor S3: fix jog wheels
ywwg Aug 9, 2020
d19b312
TraktorS3: revert mistake diffs
ywwg Aug 9, 2020
e610604
Traktor S3: pitch slider relative mode
ywwg Aug 9, 2020
888d513
Traktor S3: animate segments around wheels
ywwg Aug 9, 2020
69f35e1
Traktor S3: Major refactor to be more objecty
ywwg Aug 10, 2020
a5def7e
Traktor S3: refactor continues, outputs starting to work again
ywwg Aug 10, 2020
483dabd
Traktor S3: finish refactor!
ywwg Aug 11, 2020
2b76faa
Traktor S3: Fix some bugs. Pretty stable again
ywwg Aug 11, 2020
d009e3a
Traktor S3: better timers
ywwg Aug 11, 2020
f1d3b12
Traktor S3: more rearranging (untested)
ywwg Aug 17, 2020
e2deeb5
Merge branch '2.3' into traktor-s3-2.3
ywwg Aug 17, 2020
2f518b8
Traktor S3: Make sure lights light up if triggered from gui, not just…
ywwg Aug 18, 2020
f8ad615
Traktor S3: Fix hotcues
ywwg Aug 18, 2020
7fe78b2
Traktor S3: revert colormapper changes
ywwg Aug 19, 2020
4696655
Traktor S3: Make debugmode a var
ywwg Aug 19, 2020
3de6d0b
Traktor S3: enable soft takeover for quickeffect
ywwg Aug 19, 2020
f578866
Update res/controllers/Traktor-Kontrol-S3-hid-scripts.js
ywwg Aug 19, 2020
d575a54
Update res/controllers/Traktor-Kontrol-S3-hid-scripts.js
ywwg Aug 19, 2020
946cdf6
Traktor S3: notes
ywwg Aug 19, 2020
4a9a2da
Update res/controllers/Traktor-Kontrol-S3-hid-scripts.js
ywwg Aug 19, 2020
8b849f4
Traktor S3: make user configs global
ywwg Aug 20, 2020
bb2394f
Traktor S3: make button brightnesses global too
ywwg Aug 20, 2020
2b8c817
Traktor S3: Implement channel 4 input mode
ywwg Aug 20, 2020
05d6a99
Traktor S3: remove redundant connections
ywwg Aug 21, 2020
0d70fe8
Traktor S3: FX for input channel
ywwg Aug 21, 2020
55e32a1
Traktor S3: fix keylock light and input fx
ywwg Aug 21, 2020
d89004d
Traktor S3: toggle whole chain
ywwg Aug 23, 2020
ce52010
Traktor S3: batch light updates for less HID spamming
ywwg Aug 24, 2020
3110dfc
Merge remote-tracking branch 'be/hid_polling' into traktor-s3-2.3
ywwg Aug 24, 2020
958cb70
Traktor S3: Start rewriting fx mapping
ywwg Aug 27, 2020
c9844c9
Traktor S3: write a controller unit test!
ywwg Aug 31, 2020
451a722
Merge branch '2.3' into traktor-s3-2.3
ywwg Aug 31, 2020
daaf969
Traktor S3: refactor testing, js testing works now
ywwg Aug 31, 2020
d31a797
Traktor S3: wip -- more effects reworking
ywwg Aug 31, 2020
3f23819
Traktor S3: add a test for enable/disable effect units per channel
ywwg Sep 1, 2020
d0fc61d
TraktorS3: more effects mapping and testing
ywwg Sep 1, 2020
c730525
Traktor S3: remove commented cruft
ywwg Sep 1, 2020
9a2a924
Traktor S3: start testing lights
ywwg Sep 2, 2020
c7e34f3
Traktor S3: more tests
ywwg Sep 2, 2020
b507664
Traktor S3: tests pass!
ywwg Sep 3, 2020
938c1ab
Traktor S3: Effects mapping mostly done
ywwg Sep 3, 2020
d9fa36c
Traktor S3: debug cleanup
ywwg Sep 3, 2020
a7ab2b3
revert unintentional changes
ywwg Sep 3, 2020
a0eeb51
another unintentional commit
ywwg Sep 3, 2020
4d01caf
Merge branch '2.3' into traktor-s3-2.3
ywwg Sep 23, 2020
81a0638
Traktor S3: Sync with master version
ywwg Sep 23, 2020
8eff1eb
Traktor S3: revert test for 2.3
ywwg Sep 23, 2020
dd3bcaf
Traktor S3: revert formatting changes
ywwg Sep 23, 2020
5693f25
Merge branch '2.3' into traktor-s3-2.3
ywwg Sep 26, 2020
3cef610
Traktor S3: make sure to bind callbacks
ywwg Oct 2, 2020
cd820b3
Traktor S3: Hook up jog button
ywwg Oct 3, 2020
bd438fa
Merge branch 'hid-poll-fix' into traktor-s3-2.3
ywwg Oct 12, 2020
1b7a5ec
Traktor S3: Much better jog/scratch wheel behavior
ywwg Oct 12, 2020
1d429e6
Merge branch '2.3' into traktor-s3-2.3
ywwg Oct 12, 2020
c2e2786
Merge branch '2.3' into traktor-s3-2.3
ywwg Nov 13, 2020
e712bc7
Traktor S3: Fix relative slider mode out of bounds issues
ywwg Nov 17, 2020
53514f7
Traktor S3: Update wiki link
ywwg Nov 17, 2020
e72479b
Merge branch '2.3' into traktor-s3-2.3
ywwg Nov 18, 2020
7d289f2
Update res/controllers/Traktor Kontrol S3.hid.xml
ywwg Dec 7, 2020
8f5636b
Update res/controllers/Traktor-Kontrol-S3-hid-scripts.js
ywwg Dec 7, 2020
1bc6bbd
Traktor S3: address notes
ywwg Dec 7, 2020
03383f3
Merge branch 'traktor-s3-2.3' of github.com:ywwg/mixxx into traktor-s…
ywwg Dec 7, 2020
e7f22e9
Merge remote-tracking branch 'mixxx/2.3' into traktor-s3-2.3
ywwg Dec 12, 2020
d44ec2c
Update res/controllers/Traktor-Kontrol-S3-hid-scripts.js
ywwg Dec 12, 2020
85e219e
Traktor S3: address notes
ywwg Dec 12, 2020
fc41283
Merge remote-tracking branch 'origin/traktor-s3-2.3' into traktor-s3-2.3
ywwg Dec 12, 2020
e3603d6
Apply suggestions from code review
ywwg Dec 12, 2020
4929483
Merge remote-tracking branch 'origin/traktor-s3-2.3' into traktor-s3-2.3
ywwg Dec 12, 2020
754d406
Merge branch '2.3' into traktor-s3-2.3
ywwg Jan 30, 2021
52a8565
Traktor S3: Create options for different sampler playback modes
ywwg Jan 31, 2021
4d84f71
Traktor S3: Make JOG button work like it does for other controllers
ywwg Jan 31, 2021
01f9281
Traktor S3: simplify shutdown
ywwg Feb 6, 2021
9c0adea
Traktor S3: Small updates:
ywwg Feb 6, 2021
40b6799
Traktor S3: remap "view" to maximize_library, and playlist button to …
ywwg Feb 7, 2021
4b90253
Merge branch '2.3' into traktor-s3-2.3
ywwg Feb 15, 2021
31e896f
Traktor S3: Fix so jog button toggles wheel touch mode
ywwg Feb 15, 2021
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
6 changes: 5 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
"globals": {
"console": "writable",
"svg": "writable",
"print": "readonly"
"print": "readonly",
"HIDController": "writable",
"HIDDebug": "writable",
"HIDPacket": "writable",
"controller": "writable"
}
}
19 changes: 19 additions & 0 deletions res/controllers/Traktor Kontrol S3.hid.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<MixxxControllerPreset mixxxVersion="2.3.0" schemaVersion="1">
<info>
<name>Traktor Kontrol S3</name>
<author>Owen Williams</author>
<description>HID Mapping for Traktor Kontrol S3</description>
<wiki>https://github.com/mixxxdj/mixxx/wiki/Native-Instruments-Traktor-Kontrol-S3</wiki>
ywwg marked this conversation as resolved.
Show resolved Hide resolved
<forums>https://mixxx.discourse.group/t/native-instruments-traktor-s3-mapping/18502/4</forums>
<devices>
<product protocol="hid" vendor_id="0x17cc" product_id="0x1900" usage_page="0xff01" usage="0x1" interface_number="0x3" />
</devices>
</info>
<controller id="Traktor">
<scriptfiles>
<file filename="common-hid-packet-parser.js" functionprefix="" />
<file filename="Traktor-Kontrol-S3-hid-scripts.js" functionprefix="TraktorS3" />
</scriptfiles>
</controller>
</MixxxControllerPreset>
Loading