From c32a2875a9459b19f30338b8b646decbea06a164 Mon Sep 17 00:00:00 2001 From: Olivier Mauras Date: Mon, 3 Jul 2023 21:58:18 +0200 Subject: [PATCH 1/2] Traktor Kontrol S2MK3: Add documentation for PR#11702 --- ...ive_instruments_traktor_kontrol_s2_mk3.rst | 212 +++++++++--------- 1 file changed, 107 insertions(+), 105 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_s2_mk3.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_s2_mk3.rst index 7d02d7c2ff..28cebba101 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_s2_mk3.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_s2_mk3.rst @@ -32,108 +32,110 @@ Mixxx mapping Native Instruments Traktor Kontrol S2 MK3 (schematic view) -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| Element | Primary function | Secondary function (+ SHIFT) | -+==================+=============================================================================================================================+=====================================================+ -| (1) REV Button | Reverse play while held | Reverse play + slip mode while held | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (2) FLX Button | Enable and disable slip mode | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (3) Browse knob | Scroll vertically in library | Scroll horizontally in library | -| (turn) | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (3) Browse knob | Load selected track into deck | Eject current track | -| (press) | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (4) Preparation | Add selected track to AutoDJ queue (bottom) | Add selected track to AutoDJ queue (top) | -| button | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (5) List view | Toggles maximizing the library | | -| button | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (6) Sync button | Syncs the BPM and phase (depending on quantize). Press longer to activate sync lock on that deck. | Syncs the phase to that of the other track | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (7) Keylock | Enable keylock for the deck | | -| button | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (8) Loop knob | Halve or double loop size | | -| (turn) | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (8) Loop knob | Set a loop of the defined number of beats and enables the loop | Toggles the current loop on or off | -| (press) | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (9) Samples | Active sampler mode (for the number buttons) | | -| button | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (10) Hotcues | Activate hotcue mode (for the number buttons) | | -| button | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (11) Move knob | Beatjump backwards/forwards | Halve or double beatjump size | -| (turn) | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (11) Move knob | Activates a rolling loop of the defined number of beats. Once disabled, playback will resume where the track would have | Activate current loop, jump to its loop in point, | -| (press) | been if it had not entered the loop | and stop playback | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (12) Jog wheels | Control scratching when touched from the top *(Missing: temporarily bend the pitch when touched from the side)* | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (13) Grid button | Adjust beatgrid so closest beat is aligned with the current play position | Adjust beatgrid to match another playing deck | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (14) Shift | Activates secondary functions when pressed | | -| button | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (15) CUE button | CUE default | If the CUE point is set, jump to it and stops | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (16) Play button | Toggles playing | Seeks a player to the start and then stops it | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (17) Number | Function depends on current mode | | -| buttons | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| Hotcue mode | If hotcue is set, seeks the player to hotcue position. Otherwise set hotcue at current position | Clear the hotcue | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| Samples mode | If track is loaded into corresponding slot, go to CUE point and play | If track is playing, CUE default behaviour. | -| | | Otherwise eject track | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (18) Tempo fader | Speed control | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (19) Quantize | Toggles quantization for both decks | | -| button | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (20) Gain knob | *Unmapped* (adjusts the hardware gain) | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (21) Microphone | Toggles microphone talkover, long press for permanent activation | | -| button | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (22) Pre-Gain | Adjusts the pre-fader gain of the deck | | -| knob | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (23) HI knob | High frequency filter | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (24) MID knob | Middle frequency filter | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (25) LOW knob | Low frequency filter | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (26) Effect | Quick effect superknob for the corresponding deck | | -| Superknob | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (27) Sample knob | Adjusts the pregain for all the sample decks combined | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (28) Headphone | Adjusts the cue/main mix in the headphone output | | -| mix knob | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (29) Headphone | Adjusts the headphone output gain | | -| gain knob | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (30) Effect | Enable or disable effect units for both decks | | -| buttons | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (31) Headphone | Toggles headphone cueing | | -| buttons | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (32) Volume | Adjusts the channel volume fader for the corresponding deck | | -| fader | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (33) VuMeter | Show the current instantaneous deck volume | | -| LEDs | | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| (34) Crossfader | Adjusts the crossfader between both decks | | -+------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| Element | Primary function | Secondary function (+ SHIFT) | ++====================+=============================================================================================================================+=====================================================+ +| **1**. REV Button | Reverse play while held | Reverse play + slip mode while held | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **2**. FLX Button | Enable and disable slip mode | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **3**. Browse knob | Scroll vertically in library | Scroll horizontally in library | +| **turn** | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **3**. Browse knob | Load selected track into deck | Eject current track | +| **press** | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **4**. Preparation | Add selected track to AutoDJ queue (bottom) | Add selected track to AutoDJ queue (top) | +| button | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **5**. List view | Toggles maximizing the library | | +| button | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **6**. Sync button | Syncs the BPM and phase (depending on quantize). Press longer to activate sync lock on that deck. | Syncs the phase to that of the other track | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **7**. Keylock | Enable keylock for the deck | | +| button | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **8**. Loop knob | Halve or double loop size | | +| **turn** | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **8**. Loop knob | Set a loop of the defined number of beats and enables the loop | Toggles the current loop on or off | +| **press** | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **9**. Samples | Active sampler mode (for the number buttons) | | +| button | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **10**. Hotcues | Activate hotcue mode (for the number buttons) | | +| button | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **11**. Move knob | Beatjump backwards/forwards | Halve or double beatjump size | +| **turn** | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **11**. Move knob | Activates a rolling loop of the defined number of beats. Once disabled, playback will resume where the track would have | Activate current loop, jump to its loop in point, | +| **press** | been if it had not entered the loop | and stop playback | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **12**. Jog wheels | Control scratching when touched from the top *(Missing: temporarily bend the pitch when touched from the side)* | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **13**. Grid button| Adjust beatgrid so closest beat is aligned with the current play position | Adjust beatgrid to match another playing deck | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **14**. Shift | Activates secondary functions when pressed | | +| button | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **15**. CUE button | CUE default | If the CUE point is set, jump to it and stops | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **16**. Play button| Toggles playing | Seeks a player to the start and then stops it | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **17**. Number | Function depends on current mode | | +| buttons | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| Hotcue mode | If hotcue is set, seeks the player to hotcue position. Otherwise set hotcue at current position | Clear the hotcue | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| Samples mode | If track is loaded into corresponding slot, go to CUE point and play | If track is playing, CUE default behaviour. | +| | | Otherwise eject track | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **18**. Tempo fader| Speed control | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **19**. Quantize | Toggles quantization for both decks | | +| button | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **20**. Gain knob | *Unmapped* (adjusts the hardware gain) | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **21**. Microphone | Toggles microphone talkover, long press for permanent activation | | +| button | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **22**. Pre-Gain | Adjusts the pre-fader gain of the deck | | +| knob | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **23**. HI knob | High frequency filter | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **24**. MID knob | Middle frequency filter | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **25**. LOW knob | Low frequency filter | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **26**. Effect knob| Quick effect knob for the corresponding deck | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **27**. Sample knob| Adjusts the pregain for all the sample decks combined | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **28**. Headphone | Adjusts the cue/main mix in the headphone output | | +| mix knob | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **29**. Headphone | Adjusts the headphone output gain | | +| gain knob | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **30**. Effect | | Load preset from the Quick Effect presets list on both decks. 8 first presets from the list can be selected. | Load preset on selected deck | +| buttons | | Press the button once to get the first preset, press twice for the second preset. | | +| | | Press once (Press twice): | | +| | | 1 (5) 2 (6) | | +| | | 3 (7) 4 (8) | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **31**. Headphone | Toggles headphone cueing | | +| buttons | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **32**. Volume | Adjusts the channel volume fader for the corresponding deck | | +| fader | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **33**. VuMeter | Show the current instantaneous deck volume | | +| LEDs | | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ +| **34**. Crossfader | Adjusts the crossfader between both decks | | ++--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ From 808acd89298a26713cc79c0d29767ec68e2e3eef Mon Sep 17 00:00:00 2001 From: ronso0 Date: Mon, 8 Jan 2024 15:33:44 +0100 Subject: [PATCH 2/2] Traktor Kontrol S2MK3: mention sampler track load --- .../controllers/native_instruments_traktor_kontrol_s2_mk3.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/hardware/controllers/native_instruments_traktor_kontrol_s2_mk3.rst b/source/hardware/controllers/native_instruments_traktor_kontrol_s2_mk3.rst index 28cebba101..55e4651027 100644 --- a/source/hardware/controllers/native_instruments_traktor_kontrol_s2_mk3.rst +++ b/source/hardware/controllers/native_instruments_traktor_kontrol_s2_mk3.rst @@ -90,8 +90,8 @@ Mixxx mapping +--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ | Hotcue mode | If hotcue is set, seeks the player to hotcue position. Otherwise set hotcue at current position | Clear the hotcue | +--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ -| Samples mode | If track is loaded into corresponding slot, go to CUE point and play | If track is playing, CUE default behaviour. | -| | | Otherwise eject track | +| Samples mode | | Load selected track into corresponding slot. | If track is playing, CUE default behaviour. | +| | | If track is loaded into corresponding slot, go to CUE point and play | Otherwise eject track | +--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+ | **18**. Tempo fader| Speed control | | +--------------------+-----------------------------------------------------------------------------------------------------------------------------+-----------------------------------------------------+