Skip to content

Commit 5e447e8

Browse files
acolombieracolombier
committed
Merge branch 'feat/s4-mk4-improvements' into feat/s4-mk3-screen-support-with-shared-data
2 parents d64f03b + 6cc7b35 commit 5e447e8

File tree

3 files changed

+1066
-238
lines changed

3 files changed

+1066
-238
lines changed

‎eslint.config.cjs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ module.exports = tseslint.config(
4848
// Mixxx custom
4949
"ColorMapper": "readonly",
5050
"components": "readonly",
51+
"controller": "readonly",
5152
"engine": "readonly",
5253
"midi": "readonly",
5354
// common-controller-scripts globals

‎res/controllers/Traktor Kontrol S4 MK3.hid.xml‎

Lines changed: 183 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,188 @@
424424
</row>
425425
</group>
426426

427+
<group label="Beatjump Size">
428+
<row orientation="vertical">
429+
<option
430+
variable="beatJumpSize1"
431+
type="enum"
432+
label="First Pad">
433+
<value label="Use current beatjump size" default="true">beatjump</value>
434+
<value label="1/32">0.03125</value>
435+
<value label="1/16">0.0625</value>
436+
<value label="1/8">0.125</value>
437+
<value label="1/4">0.25</value>
438+
<value label="1/2">0.5</value>
439+
<value label="1">1</value>
440+
<value label="2">2</value>
441+
<value label="4">4</value>
442+
<value label="8">8</value>
443+
<value label="16">16</value>
444+
<value label="32">32</value>
445+
<value label="64">64</value>
446+
<value label="128">128</value>
447+
<value label="Halve beatjump size">half</value>
448+
<value label="Double beatjump size">double</value>
449+
<description>The top left or pad button.</description>
450+
</option>
451+
<option
452+
variable="beatJumpSize2"
453+
type="enum"
454+
label="Second Pad">
455+
<value label="Use current beatjump size">beatjump</value>
456+
<value label="1/32">0.03125</value>
457+
<value label="1/16">0.0625</value>
458+
<value label="1/8">0.125</value>
459+
<value label="1/4">0.25</value>
460+
<value label="1/2">0.5</value>
461+
<value label="1">1</value>
462+
<value label="2">2</value>
463+
<value label="4" default="true">4</value>
464+
<value label="8">8</value>
465+
<value label="16">16</value>
466+
<value label="32">32</value>
467+
<value label="64">64</value>
468+
<value label="128">128</value>
469+
<value label="Halve beatjump size">half</value>
470+
<value label="Double beatjump size">double</value>
471+
<description>The top left second pad button.</description>
472+
</option>
473+
<option
474+
variable="beatJumpSize3"
475+
type="enum"
476+
label="Third Pad">
477+
<value label="Use current beatjump size">beatjump</value>
478+
<value label="1/32">0.03125</value>
479+
<value label="1/16">0.0625</value>
480+
<value label="1/8">0.125</value>
481+
<value label="1/4" default="true">0.25</value>
482+
<value label="1/2">0.5</value>
483+
<value label="1">1</value>
484+
<value label="2">2</value>
485+
<value label="4">4</value>
486+
<value label="8" default="true">8</value>
487+
<value label="16">16</value>
488+
<value label="32">32</value>
489+
<value label="64">64</value>
490+
<value label="128">128</value>
491+
<value label="Halve beatjump size">half</value>
492+
<value label="Double beatjump size">double</value>
493+
<description>The top right second pad button.</description>
494+
</option>
495+
<option
496+
variable="beatJumpSize4"
497+
type="enum"
498+
label="Fourth Pad">
499+
<value label="Use current beatjump size">beatjump</value>
500+
<value label="1/32">0.03125</value>
501+
<value label="1/16">0.0625</value>
502+
<value label="1/8">0.125</value>
503+
<value label="1/4">0.25</value>
504+
<value label="1/2" default="true">0.5</value>
505+
<value label="1">1</value>
506+
<value label="2">2</value>
507+
<value label="4">4</value>
508+
<value label="8">8</value>
509+
<value label="16" default="true">16</value>
510+
<value label="32">32</value>
511+
<value label="64">64</value>
512+
<value label="128">128</value>
513+
<value label="Halve beatjump size">half</value>
514+
<value label="Double beatjump size">double</value>
515+
<description>The top right pad button.</description>
516+
</option>
517+
</row>
518+
<row orientation="vertical">
519+
<option
520+
variable="beatJumpSize5"
521+
type="enum"
522+
label="Fifth Pad">
523+
<value label="Use current beatjump size">beatjump</value>
524+
<value label="1/32">0.03125</value>
525+
<value label="1/16">0.0625</value>
526+
<value label="1/8">0.125</value>
527+
<value label="1/4">0.25</value>
528+
<value label="1/2">0.5</value>
529+
<value label="1">1</value>
530+
<value label="2">2</value>
531+
<value label="4">4</value>
532+
<value label="8">8</value>
533+
<value label="16">16</value>
534+
<value label="32" default="true">32</value>
535+
<value label="64">64</value>
536+
<value label="128">128</value>
537+
<value label="Halve beatjump size">half</value>
538+
<value label="Double beatjump size">double</value>
539+
<description>The bottom left pad button.</description>
540+
</option>
541+
<option
542+
variable="beatJumpSize6"
543+
type="enum"
544+
label="Sixth Pad">
545+
<value label="Use current beatjump size">beatjump</value>
546+
<value label="1/32">0.03125</value>
547+
<value label="1/16">0.0625</value>
548+
<value label="1/8">0.125</value>
549+
<value label="1/4">0.25</value>
550+
<value label="1/2">0.5</value>
551+
<value label="1">1</value>
552+
<value label="2" default="true">2</value>
553+
<value label="4">4</value>
554+
<value label="8">8</value>
555+
<value label="16">16</value>
556+
<value label="32">32</value>
557+
<value label="64" default="true">64</value>
558+
<value label="128">128</value>
559+
<value label="Halve beatjump size">half</value>
560+
<value label="Double beatjump size">double</value>
561+
<description>The bottom left second pad button.</description>
562+
</option>
563+
<option
564+
variable="beatJumpSize7"
565+
type="enum"
566+
label="Seventh Pad">
567+
<value label="Use current beatjump size">half</value>
568+
<value label="1/32">0.03125</value>
569+
<value label="1/16">0.0625</value>
570+
<value label="1/8">0.125</value>
571+
<value label="1/4">0.25</value>
572+
<value label="1/2">0.5</value>
573+
<value label="1">1</value>
574+
<value label="2">2</value>
575+
<value label="4" >4</value>
576+
<value label="8">8</value>
577+
<value label="16">16</value>
578+
<value label="32">32</value>
579+
<value label="64">64</value>
580+
<value label="128">128</value>
581+
<value label="Halve beatjump size" default="true">half</value>
582+
<value label="Double beatjump size">double</value>
583+
<description>The bottom right second pad button.</description>
584+
</option>
585+
<option
586+
variable="beatJumpSize8"
587+
type="enum"
588+
label="Eighth Pad">
589+
<value label="Use current beatjump size">beatjump</value>
590+
<value label="1/32">0.03125</value>
591+
<value label="1/16">0.0625</value>
592+
<value label="1/8">0.125</value>
593+
<value label="1/4">0.25</value>
594+
<value label="1/2">0.5</value>
595+
<value label="1">1</value>
596+
<value label="2">2</value>
597+
<value label="4">4</value>
598+
<value label="8">8</value>
599+
<value label="16">16</value>
600+
<value label="32">32</value>
601+
<value label="64">64</value>
602+
<value label="128">128</value>
603+
<value label="Halve beatjump size">half</value>
604+
<value label="Double beatjump size" default="true">double</value>
605+
<description>The bottom right pad button.</description>
606+
</option>
607+
</row>
608+
</group>
427609
<group label="Library">
428610
<row orientation="vertical">
429611
<option
@@ -691,7 +873,7 @@
691873
</row>
692874
</group>
693875
</settings>
694-
<controller id="Traktor">
876+
<controller id="Traktor" namespace="S4MK3">
695877
<scriptfiles>
696878
<file filename="Traktor-Kontrol-S4-MK3.js" functionprefix="TraktorS4MK3"/>
697879
</scriptfiles>

0 commit comments

Comments
 (0)