From fd4c6ade61e7dbeda69dcbac3e8c5bd7207ab876 Mon Sep 17 00:00:00 2001 From: Raphael Quast Date: Sat, 18 Sep 2021 22:01:31 +0200 Subject: [PATCH 1/2] Update korg_kaoss_dj.rst add new assignments for https://github.com/mixxxdj/mixxx/pull/4301 --- source/hardware/controllers/korg_kaoss_dj.rst | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/source/hardware/controllers/korg_kaoss_dj.rst b/source/hardware/controllers/korg_kaoss_dj.rst index fbcf9e267a..24f89334d9 100644 --- a/source/hardware/controllers/korg_kaoss_dj.rst +++ b/source/hardware/controllers/korg_kaoss_dj.rst @@ -32,7 +32,7 @@ Mapping +------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ | 3 | Master knob | Adjust the master volume level | | +------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 4 | Browse knob | Selects a song from the library | Moves between levels (TODO) | +| 4 | Browse knob | Selects a song from the library | Moves between levels | +------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ | 5 | Display | Indicates the effect number or parameter | Indicates the key or scale | +------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ @@ -42,15 +42,15 @@ Mapping +------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ | 7 | Program/Value Knob | Selects an effect | Selects a key, selects a scale | +------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 8 | Tap Button | Sets the tempo | Key setting mode | -| | | Long-press this button to access the auto BPM | | -| | | function | | +| 8 | Tap Button | tap to open a folder in the file-browser | use left / right shift to set the tempo | +| | | (double-tap to close an open folder) | of left / right track | +| | | | | +------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ | 9 | Hold Button | Enables/disables the touchpad’s hold function | Scale setting mode | +------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 10 | Touchpad (controller mode) | Controls the effects of the DJ software. The | Adjusts the Beats Multiplier (TODO) | -| | | vertical axis controls the mix (dry/wet) knob | | -| | | and the horizontal axis controls the super | | +| 10 | Touchpad (controller mode) | Controls the effects of the DJ software. The | Controls Quick-Effect super knobs | +| | | vertical axis controls the mix (dry/wet) knob | the horizontal-axis controls deck 1 | +| | | and the horizontal axis controls the super | the vertical-axis controls deck 2 | | | | knob. | | +------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ | | Touchpad (Kaoss Effect mode) | Controls the KAOSS effect | Adjusts the depth of the KAOSS Effect | @@ -84,7 +84,8 @@ Mapping +------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ | 15 | Gain knob | Adjusts the gain | | +------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 16 | Load button | Loads the song into the selected deck | | +| 16 | Load button | Loads the song into the selected deck | A : close selected folder in the file-browser | +| | | | B : open selected folder in the file-browser | +------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ | 17 | Fx button | Left - FX1 rack mix knob can be manipulated | | | | | when enabled | | From 6c73a60be95019550c16be7cfc4f2bfb507f2767 Mon Sep 17 00:00:00 2001 From: Raphael Quast Date: Sun, 19 Sep 2021 21:33:08 +0200 Subject: [PATCH 2/2] correc looping behavior --- source/hardware/controllers/korg_kaoss_dj.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/source/hardware/controllers/korg_kaoss_dj.rst b/source/hardware/controllers/korg_kaoss_dj.rst index 24f89334d9..1695ec99f2 100644 --- a/source/hardware/controllers/korg_kaoss_dj.rst +++ b/source/hardware/controllers/korg_kaoss_dj.rst @@ -62,21 +62,21 @@ Mapping +------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ | 12 | Touch Slider mode button | Switches between the three touch slider mode | | +------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 13 | Touch Slider (Normal mode) | Left Side - Nudges (pitch -) | Moves to the specified position in the song | +| 13 | Touch Slider (Normal mode) | Left - Nudges (pitch -) | Moves to the specified position in the song | | | | Center - Enables the touch wheel's Scratch | (slider) | | | | mode | | -| | | Right Side - Nudges (pitch +) | | +| | | Right - Nudges (pitch +) | | +------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| | Touch Slider (Hot Cue mode) | Left Side - Sets Hot Cue 1, and moves to Hot | Deletes Hot Cue 1 | -| | | Cue 1 | Deletes Hot Cue 2 | -| | | Center - Sets Hot Cue 2, and moves to Hot Cue | Deletes Hot Cue 3 | +| | Touch Slider (Hot Cue mode) | Left - Sets Hot Cue 1, and moves to Hot | Left - Deletes Hot Cue 1 | +| | | Cue 1 | Center - Deletes Hot Cue 2 | +| | | Center - Sets Hot Cue 2, and moves to Hot Cue | Right - Deletes Hot Cue 3 | | | | 2 | | -| | | Right Side - Sets Hot Cue 3, and moves to Hot | | +| | | Right - Sets Hot Cue 3, and moves to Hot | | | | | Cue 3 | | +------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| | Touch Slider (Loop mode) | Left Side - Auto Loop × 1/2 | Sets the Loop In point | -| | | Center - Loop on/off | Auto Loop × 1 | -| | | Right Side - Auto Loop × 2 | Sets the Loop Out point | +| | Touch Slider (Loop mode) | Left - Auto Loop × 1/2 | Left - Sets the Loop In point | +| | | Center - New beatloop at playback position | Center - Re-loop | +| | | Right - Auto Loop × 2 | Right - Sets the Loop Out point | +------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ | 14 | EQ | Boosts or Cuts the Hi EQ | | | | | Boosts or Cuts the Mid EQ | |