Skip to content

SCS3 mapping with support for four decks #809

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
Pegasus-RPG merged 37 commits into from
Dec 23, 2015
Merged

SCS3 mapping with support for four decks #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
8049282
Stanton SCS3 for Mixxx 1.12
sbalmer Dec 12, 2015
0808350
rework message sending
sbalmer Dec 13, 2015
f1e3413
attribution
sbalmer Dec 13, 2015
7573bfe
gain fader now controls pregain, holding EQ resets pregain
sbalmer Dec 13, 2015
6595fc4
streamline modesetting
sbalmer Dec 13, 2015
bd6a436
filter slider now relative
sbalmer Dec 13, 2015
724f425
cleaner modesets
sbalmer Dec 13, 2015
21e4953
mention mapping files in uninstaller
sbalmer Dec 13, 2015
5ab778f
mention mapping files in uninstaller
sbalmer Dec 13, 2015
65d79bb
remove obsolete var
sbalmer Dec 13, 2015
cdc5fe8
fix some documentation
sbalmer Dec 13, 2015
c05f9e1
update target version 2.0.0
sbalmer Dec 18, 2015
96c3985
remove obsolete notes
sbalmer Dec 18, 2015
207d610
extend Switch to allow for held-mode
sbalmer Dec 18, 2015
d17bb09
pregain and needledrop when holding deck-switch button
sbalmer Dec 18, 2015
2aa3060
light both deck lights whil holding the switch
sbalmer Dec 18, 2015
237ca64
option to remember EQ/FX mode per-deck
sbalmer Dec 18, 2015
997232f
delay activation of held-mode
sbalmer Dec 18, 2015
580d254
move var to inner scope
sbalmer Dec 18, 2015
4746d48
light FX red when an FX is selected
sbalmer Dec 18, 2015
036c270
reset effect params via FX. not EQ
sbalmer Dec 18, 2015
284192c
reformat for readability
sbalmer Dec 18, 2015
e76f19e
add slider fields
sbalmer Dec 18, 2015
30c90f5
utility functions
sbalmer Dec 18, 2015
21c2e26
allow switching effects from SCS3M too
sbalmer Dec 18, 2015
9954688
FX unit change through holding FX-select buttons
sbalmer Dec 18, 2015
085e581
silence jshint
sbalmer Dec 19, 2015
c53ad02
re-add missing Midi controls
sbalmer Dec 19, 2015
25286a9
remove unnecessary closure
sbalmer Dec 19, 2015
055289b
Merge branch 'relfilter' into SCS3
sbalmer Dec 19, 2015
b666ec8
make eqModePerDeck the preset behaviour
sbalmer Dec 20, 2015
d1b19c4
remove deckflash
sbalmer Dec 20, 2015
285dbce
wait 200ms before engaging hold
sbalmer Dec 20, 2015
d0260d7
turn off FX light
sbalmer Dec 20, 2015
0661b86
FX button switches to last used FX
sbalmer Dec 20, 2015
7ea220b
streamline control watching
sbalmer Dec 21, 2015
a3125e1
reset master controls only through holding EQ not FX
sbalmer Dec 21, 2015
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
4 changes: 4 additions & 0 deletions build/nsis/Mixxx.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,11 +493,15 @@ Section "Uninstall"
Delete "$INSTDIR\controllers\Stanton SCS.1d.midi.xml"
Delete "$INSTDIR\controllers\Stanton SCS.1m.midi.xml"
Delete "$INSTDIR\controllers\Stanton SCS.3d.midi.xml"
Delete "$INSTDIR\controllers\Stanton SCS.3d.4deck.midi.xml"
Delete "$INSTDIR\controllers\Stanton SCS.3m.midi.xml"
Delete "$INSTDIR\controllers\Stanton SCS.3m.4deck.midi.xml"
Delete "$INSTDIR\controllers\Stanton-SCS1d-scripts.js"
Delete "$INSTDIR\controllers\Stanton-SCS1m-scripts.js"
Delete "$INSTDIR\controllers\Stanton-SCS3d-scripts.js"
Delete "$INSTDIR\controllers\Stanton-SCS3d-4deck-scripts.js"
Delete "$INSTDIR\controllers\Stanton-SCS3m-scripts.js"
Delete "$INSTDIR\controllers\Stanton-SCS3m-4deck-scripts.js"
Delete "$INSTDIR\controllers\TrakProDJ iPad.midi.xml"
Delete "$INSTDIR\controllers\TrakProDJ-iPad-scripts.js"
Delete "$INSTDIR\controllers\Traktor Kontrol F1.hid.xml"
Expand Down
106 changes: 106 additions & 0 deletions res/controllers/Stanton SCS.3d.4deck.midi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<?xml version='1.0' encoding='utf-8'?>
<MixxxControllerPreset mixxxVersion="2.0.0+" schemaVersion="1">
<info>
<name>Stanton SCS.3d 4deck</name>
<author>sbalmer</author>
<description>
Mapping for the Stanton SCS3 system. This part maps the SCS.3d
controller.
</description>
</info>
<controller id="SCS.3d">
<scriptfiles>
<file functionprefix="SCS3D" filename="Stanton-SCS3d-4deck-scripts.js"/>
</scriptfiles>
<controls>
<!-- central slider -->
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x01</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x01</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0xB0</status><midino>0x01</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0xB0</status><midino>0x02</midino><options><script-binding/></options></control>

<!-- pitch slider -->
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x03</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x03</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0xB0</status><midino>0x03</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0xB0</status><midino>0x04</midino><options><script-binding/></options></control>

<!-- gain slider -->
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x07</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x07</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0xB0</status><midino>0x07</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0xB0</status><midino>0x08</midino><options><script-binding/></options></control>

<!-- left slider -->
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x0C</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x0C</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0xB0</status><midino>0x0C</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0xB0</status><midino>0x0D</midino><options><script-binding/></options></control>

<!-- right slider -->
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x0E</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x0E</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0xB0</status><midino>0x0E</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0xB0</status><midino>0x0F</midino><options><script-binding/></options></control>

<!-- mode buttons -->
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x20</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x20</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x22</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x22</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x24</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x24</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x26</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x26</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x28</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x28</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x2A</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x2A</midino><options><script-binding/></options></control>

<!-- B11 to B14 -->
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x2C</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x2C</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x2E</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x2E</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x30</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x30</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x32</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x32</midino><options><script-binding/></options></control>

<!-- buttons in the circle -->
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x48</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x48</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x4A</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x4A</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x4C</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x4C</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x4E</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x4E</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x4F</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x4F</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x51</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x51</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x53</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x53</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x55</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x55</midino><options><script-binding/></options></control>

<!-- circle slider -->
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x62</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x62</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0xB0</status><midino>0x62</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0xB0</status><midino>0x63</midino><options><script-binding/></options></control>

<!-- buttons bottom -->
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x6D</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x6D</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x6E</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x6E</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x6F</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x6F</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x80</status><midino>0x70</midino><options><script-binding/></options></control>
<control><key>SCS3D.receive</key><status>0x90</status><midino>0x70</midino><options><script-binding/></options></control>
</controls>
<outputs/>
</controller>
</MixxxControllerPreset>
Loading