From fd4c6ade61e7dbeda69dcbac3e8c5bd7207ab876 Mon Sep 17 00:00:00 2001 From: Raphael Quast Date: Sat, 18 Sep 2021 22:01:31 +0200 Subject: [PATCH 1/6] 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/6] 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 | | From 8ad66c578215a5bf96013d4f279e5818bf93f5a0 Mon Sep 17 00:00:00 2001 From: ms Date: Mon, 12 Feb 2024 19:30:30 +0900 Subject: [PATCH 3/6] improve readabality #430 add standby notice --- source/hardware/controllers/korg_kaoss_dj.rst | 181 +++++++++--------- 1 file changed, 89 insertions(+), 92 deletions(-) diff --git a/source/hardware/controllers/korg_kaoss_dj.rst b/source/hardware/controllers/korg_kaoss_dj.rst index 1695ec99f2..6ed20d8c2f 100644 --- a/source/hardware/controllers/korg_kaoss_dj.rst +++ b/source/hardware/controllers/korg_kaoss_dj.rst @@ -3,6 +3,10 @@ Korg Kaoss DJ controller 2-deck controller with touch controlled jogwheels, built-in 4-channel soundcard and a Korg Kaoss Pad as built-in effect section (can be switched off for using software effects). +| Controller needs to be set as output device in order to wake up from standby (Stb). +| Main: Channel 1-2 +| Headphone: Channel 3-4 + - `Manufacturer’s product page `__ - `Forum thread `__ - `Pull request on Github `__ @@ -22,95 +26,88 @@ Mapping Korg Kaoss DJ (schematic view) -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| No. | Name | Function | Shifted Operation | -+================================================+================================================+================================================+================================================+ -| 1 | Headphone knob | Adjusts the headphone level | | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 2 | Balance knob | Adjusts the balance between the master level | | -| | | and the headphone monitor level | | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 3 | Master knob | Adjust the master volume level | | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 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 | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 6 | Touchpad Mode Button | Switches the touchpad between the Controller, | | -| | | KAOSS Effect, and Sampler modes (long press | | -| | | for blue LED) | | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 7 | Program/Value Knob | Selects an effect | Selects a key, selects a scale | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 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 | 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 | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| | Touchpad (sampler mode) | Controls the sampler function of the DJ | | -| | | software | | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 11 | Crossfader | Adjusts the balance between Decks A and B | | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 12 | Touch Slider mode button | Switches between the three touch slider mode | | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 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 - Nudges (pitch +) | | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| | 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 - Sets Hot Cue 3, and moves to Hot | | -| | | Cue 3 | | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| | 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 | | -| | | Boosts or Cuts the Lo EQ | | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 15 | Gain knob | Adjusts the gain | | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 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 | | -| | | Right - FX2 rack mix knob can be manipulated | | -| | | when enabled | | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 18 | Headphone cue button | Turns the headphone monitor on/off | Switches the function of the level meter | -| | | | between Deck A/B and the Master level | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 19 | Touch wheel | Scratches (in scratch mode) or adjusts the | Search function (in scratch mode) or moves | -| | | pitch | beatgrid | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 20 | Pitch fader | Adjusts the pitch | | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 21 | Level meter | Indicates the input level to deck A/B or the | | -| | | master level | | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 22 | Shift button | Holding this button provides access to the | | -| | | controllers SHIFT functions | | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 23 | Play / pause button | Starts/pauses the song | Key Lock On/Off | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 24 | Sync button | Synchronizes the tempo of Deck A and Deck B | Cancels tempo synchronization | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 25 | Cue button | Sets the cue point or moves to the cue point | Returns to the beginning of the song. | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ -| 26 | Level fader | Adjusts the level of deck A/B | | -+------------------------------------------------+------------------------------------------------+------------------------------------------------+------------------------------------------------+ ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| No. | Name | Function | Shifted Operation | ++=====+==============================+===============================================+============================================+ +| 1 | Headphone knob | Adjusts headphone level | | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 2 | Balance knob | Adjusts balance between master level | | +| | | and headphone monitor level | | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 3 | Master knob | Adjusts master volume level | | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 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 | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 6 | Touchpad Mode Button | Switches the touchpad between the Controller, | | +| | | KAOSS Effect, and Sampler modes (long press | | +| | | for blue LED) | | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 7 | Program/Value Knob | Selects an effect | Selects a key, selects a scale | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 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 Mixxx. | Controls Quick-Effect super knobs. | +| | | Vertical axis: mix (dry/wet) knob / | Horizontal axis: deck 1 / | +| | | Horizontal axis: super knob | Vertical axis: deck 2 | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| | Touchpad (Kaoss Effect mode) | Controls KAOSS effect | Adjusts depth of KAOSS Effect | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| | Touchpad (sampler mode) | Controls sampler function of Mixxx | | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 11 | Crossfader | Adjusts balance between Decks A/B | | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 12 | Touch Slider mode button | Switches between the three touch slider modes | | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 13 | Touch Slider (Normal mode) | Left: Nudge (-) / | Moves to specified position in the song | +| | | Center: Enable scratch mode / | (slider) | +| | | Right: Nudge (+) | | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| | Touch Slider (Hot Cue mode) | Sets or moves to Hot Cue. | Delete Hot Cue. | +| | | Left: 1 / | Left: 1 / | +| | | Center: 2 / | Center: 2 / | +| | | Right: 3 | Right: 3 | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| | Touch Slider (Loop mode) | Left: Halfs Loop / | Left: Sets Loop In point / | +| | | Center: New beatloop at playback position / | Center: Re-loop / | +| | | Right: Doubles Loop | Right: Sets Loop Out point | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 14 | EQ | Boosts or Cuts Hi/Mid/Lo EQ | | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 15 | Gain knob | Adjusts gain | | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 16 | Load button | Loads song into selected deck A/B | A: close selected folder in file-browser / | +| | | | B: open selected folder in file-browser | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 17 | Fx button | Left: FX1 rack mix knob can be manipulated | | +| | | when enabled / | | +| | | Right: FX2 rack mix knob can be manipulated | | +| | | when enabled | | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 18 | Headphone cue button | Turns headphone monitor on/off | Switches the function of the level meter | +| | | | between Deck A/B and the Master level | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 19 | Touch wheel | Scratches (in scratch mode) or adjusts the | Search function (in scratch mode) or moves | +| | | pitch | beatgrid | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 20 | Pitch fader | Adjusts pitch | | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 21 | Level meter | Indicates the input level to deck A/B or the | | +| | | master level | | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 22 | Shift button | Holding this button provides access to the | | +| | | controllers SHIFT functions | | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 23 | Play / pause button | Starts/pauses the song | Key Lock On/Off | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 24 | Sync button | Synchronizes tempo of Deck A and Deck B | Cancels tempo synchronization | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 25 | Cue button | Sets cue point or moves to the cue point | Returns to the beginning of the song | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +| 26 | Level fader | Adjusts level of deck A/B | | ++-----+------------------------------+-----------------------------------------------+--------------------------------------------+ From fecf926a33a95e4468fb5ae3ec20a01af2ffcd56 Mon Sep 17 00:00:00 2001 From: ms Date: Mon, 12 Feb 2024 21:38:03 +0900 Subject: [PATCH 4/6] removed unused functions --- source/hardware/controllers/korg_kaoss_dj.rst | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/source/hardware/controllers/korg_kaoss_dj.rst b/source/hardware/controllers/korg_kaoss_dj.rst index 6ed20d8c2f..2551e1b187 100644 --- a/source/hardware/controllers/korg_kaoss_dj.rst +++ b/source/hardware/controllers/korg_kaoss_dj.rst @@ -26,6 +26,7 @@ Mapping Korg Kaoss DJ (schematic view) +<<<<<<< Updated upstream +-----+------------------------------+-----------------------------------------------+--------------------------------------------+ | No. | Name | Function | Shifted Operation | +=====+==============================+===============================================+============================================+ @@ -111,3 +112,91 @@ Mapping +-----+------------------------------+-----------------------------------------------+--------------------------------------------+ | 26 | Level fader | Adjusts level of deck A/B | | +-----+------------------------------+-----------------------------------------------+--------------------------------------------+ +======= ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| No. | Name | Function | Shifted Operation | ++=====+========================================+===============================================+======================================================+ +| 1 | Headphone knob | Adjusts headphone level | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 2 | Balance knob | Adjusts balance between master level | | +| | | and headphone monitor level | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 3 | Master knob | Adjusts master volume level | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 4 | Browse knob | Selects a song from the library | Moves between levels | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 5 | Display | Not used yet | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 6 | Touchpad Mode Button | Switches the touchpad between the Controller, | | +| | | KAOSS Effect, and Sampler modes (long press | | +| | | for blue LED) | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 7 | Program/Value Knob (controller mode) | Selects an effect (not implemented yet) | Selects a key, selects a scale (not implemented yet) | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| | Program/Value Knob (Kaoss Effect mode) | Selects an effect | Jumps to next effect category | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 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 Mixxx. | Controls Quick-Effect super knobs. | +| | | Vertical axis: mix (dry/wet) knob / | Horizontal axis: deck 1 / | +| | | Horizontal axis: super knob | Vertical axis: deck 2 | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| | Touchpad (Kaoss Effect mode) | Controls KAOSS effect | Adjusts depth of KAOSS Effect | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| | Touchpad (sampler mode) | Controls sampler function of Mixxx | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 11 | Crossfader | Adjusts balance between Decks A/B | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 12 | Touch Slider mode button | Switches between the three touch slider modes | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 13 | Touch Slider (Normal mode) | Left: Nudge (-) / | Moves to specified position in the song | +| | | Center: Enable scratch mode / | (slider) | +| | | Right: Nudge (+) | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| | Touch Slider (Hot Cue mode) | Sets or moves to Hot Cue. | Delete Hot Cue. | +| | | Left: 1 / | Left: 1 / | +| | | Center: 2 / | Center: 2 / | +| | | Right: 3 | Right: 3 | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| | Touch Slider (Loop mode) | Left: Halfs Loop / | Left: Sets Loop In point / | +| | | Center: New beatloop at playback position / | Center: Re-loop / | +| | | Right: Doubles Loop | Right: Sets Loop Out point | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 14 | EQ | Boosts or Cuts Hi/Mid/Lo EQ | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 15 | Gain knob | Adjusts gain | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 16 | Load button | Loads song into selected deck A/B | A: close selected folder in file-browser / | +| | | | B: open selected folder in file-browser | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 17 | Fx button | Left: FX1 rack mix knob can be manipulated | | +| | | when enabled / | | +| | | Right: FX2 rack mix knob can be manipulated | | +| | | when enabled | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 18 | Headphone cue button | Turns headphone monitor on/off | Switches the function of the level meter | +| | | | between Deck A/B and the Master level | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 19 | Touch wheel | Scratches (in scratch mode) or adjusts the | Search function (in scratch mode) or moves | +| | | pitch | beatgrid | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 20 | Pitch fader | Adjusts pitch | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 21 | Level meter | Indicates the input level to deck A/B or the | | +| | | master level | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 22 | Shift button | Holding this button provides access to the | | +| | | controllers SHIFT functions | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 23 | Play / pause button | Starts/pauses the song | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 24 | Sync button | Synchronizes tempo of Deck A and Deck B | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 25 | Cue button | Sets cue point or moves to the cue point | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +| 26 | Level fader | Adjusts level of deck A/B | | ++-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ +>>>>>>> Stashed changes From a8217b225f68f7fc6e8599f906b7b8e603f38995 Mon Sep 17 00:00:00 2001 From: ms Date: Mon, 12 Feb 2024 22:57:06 +0900 Subject: [PATCH 5/6] remove unused functions (merge) --- source/hardware/controllers/korg_kaoss_dj.rst | 88 ------------------- 1 file changed, 88 deletions(-) diff --git a/source/hardware/controllers/korg_kaoss_dj.rst b/source/hardware/controllers/korg_kaoss_dj.rst index 2551e1b187..5e83185cc4 100644 --- a/source/hardware/controllers/korg_kaoss_dj.rst +++ b/source/hardware/controllers/korg_kaoss_dj.rst @@ -26,93 +26,6 @@ Mapping Korg Kaoss DJ (schematic view) -<<<<<<< Updated upstream -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| No. | Name | Function | Shifted Operation | -+=====+==============================+===============================================+============================================+ -| 1 | Headphone knob | Adjusts headphone level | | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 2 | Balance knob | Adjusts balance between master level | | -| | | and headphone monitor level | | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 3 | Master knob | Adjusts master volume level | | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 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 | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 6 | Touchpad Mode Button | Switches the touchpad between the Controller, | | -| | | KAOSS Effect, and Sampler modes (long press | | -| | | for blue LED) | | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 7 | Program/Value Knob | Selects an effect | Selects a key, selects a scale | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 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 Mixxx. | Controls Quick-Effect super knobs. | -| | | Vertical axis: mix (dry/wet) knob / | Horizontal axis: deck 1 / | -| | | Horizontal axis: super knob | Vertical axis: deck 2 | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| | Touchpad (Kaoss Effect mode) | Controls KAOSS effect | Adjusts depth of KAOSS Effect | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| | Touchpad (sampler mode) | Controls sampler function of Mixxx | | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 11 | Crossfader | Adjusts balance between Decks A/B | | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 12 | Touch Slider mode button | Switches between the three touch slider modes | | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 13 | Touch Slider (Normal mode) | Left: Nudge (-) / | Moves to specified position in the song | -| | | Center: Enable scratch mode / | (slider) | -| | | Right: Nudge (+) | | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| | Touch Slider (Hot Cue mode) | Sets or moves to Hot Cue. | Delete Hot Cue. | -| | | Left: 1 / | Left: 1 / | -| | | Center: 2 / | Center: 2 / | -| | | Right: 3 | Right: 3 | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| | Touch Slider (Loop mode) | Left: Halfs Loop / | Left: Sets Loop In point / | -| | | Center: New beatloop at playback position / | Center: Re-loop / | -| | | Right: Doubles Loop | Right: Sets Loop Out point | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 14 | EQ | Boosts or Cuts Hi/Mid/Lo EQ | | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 15 | Gain knob | Adjusts gain | | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 16 | Load button | Loads song into selected deck A/B | A: close selected folder in file-browser / | -| | | | B: open selected folder in file-browser | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 17 | Fx button | Left: FX1 rack mix knob can be manipulated | | -| | | when enabled / | | -| | | Right: FX2 rack mix knob can be manipulated | | -| | | when enabled | | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 18 | Headphone cue button | Turns headphone monitor on/off | Switches the function of the level meter | -| | | | between Deck A/B and the Master level | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 19 | Touch wheel | Scratches (in scratch mode) or adjusts the | Search function (in scratch mode) or moves | -| | | pitch | beatgrid | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 20 | Pitch fader | Adjusts pitch | | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 21 | Level meter | Indicates the input level to deck A/B or the | | -| | | master level | | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 22 | Shift button | Holding this button provides access to the | | -| | | controllers SHIFT functions | | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 23 | Play / pause button | Starts/pauses the song | Key Lock On/Off | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 24 | Sync button | Synchronizes tempo of Deck A and Deck B | Cancels tempo synchronization | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 25 | Cue button | Sets cue point or moves to the cue point | Returns to the beginning of the song | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -| 26 | Level fader | Adjusts level of deck A/B | | -+-----+------------------------------+-----------------------------------------------+--------------------------------------------+ -======= +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ | No. | Name | Function | Shifted Operation | +=====+========================================+===============================================+======================================================+ @@ -199,4 +112,3 @@ Mapping +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ | 26 | Level fader | Adjusts level of deck A/B | | +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ ->>>>>>> Stashed changes From 24971c444b106c6c3003334ef412503f2190decb Mon Sep 17 00:00:00 2001 From: ms Date: Thu, 15 Feb 2024 02:14:52 +0900 Subject: [PATCH 6/6] fix line breaks, add fx button, remove 9 --- source/hardware/controllers/korg_kaoss_dj.rst | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/source/hardware/controllers/korg_kaoss_dj.rst b/source/hardware/controllers/korg_kaoss_dj.rst index 5e83185cc4..5e652dd9a2 100644 --- a/source/hardware/controllers/korg_kaoss_dj.rst +++ b/source/hardware/controllers/korg_kaoss_dj.rst @@ -44,18 +44,19 @@ Mapping | | | KAOSS Effect, and Sampler modes (long press | | | | | for blue LED) | | +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ -| 7 | Program/Value Knob (controller mode) | Selects an effect (not implemented yet) | Selects a key, selects a scale (not implemented yet) | +| 7 | Program/Value Knob (controller mode) | Cycles QuickEffectRack 1 & 2 | | Left shift: cycles effect chains of EffectUnit 1 | +| | | | | Left shift: cycles effect chains of EffectUnit 1 | +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ | | Program/Value Knob (Kaoss Effect mode) | Selects an effect | Jumps to next effect category | +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ -| 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 | +| 8 | Tap Button | tap to open a folder in the file-browser | | Left shift: tap tempo deck 1 | +| | | (double-tap to close an open folder) | | Right shift: tap tempo deck 2 | +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ -| 9 | Hold Button | Enables/disables the touchpad’s hold function | Scale setting mode | +| 9 | Hold Button | Not used yet | | +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ -| 10 | Touchpad (controller mode) | Controls the effects of Mixxx. | Controls Quick-Effect super knobs. | -| | | Vertical axis: mix (dry/wet) knob / | Horizontal axis: deck 1 / | -| | | Horizontal axis: super knob | Vertical axis: deck 2 | +| 10 | Touchpad (controller mode) | | Controls the effects of Mixxx. | | Controls Quick-Effect super knobs. | +| | | | Vertical axis: mix (dry/wet) knob | | Horizontal axis: deck 1 | +| | | | Horizontal axis: super knob | | Vertical axis: deck 2 | +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ | | Touchpad (Kaoss Effect mode) | Controls KAOSS effect | Adjusts depth of KAOSS Effect | +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ @@ -65,30 +66,28 @@ Mapping +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ | 12 | Touch Slider mode button | Switches between the three touch slider modes | | +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ -| 13 | Touch Slider (Normal mode) | Left: Nudge (-) / | Moves to specified position in the song | -| | | Center: Enable scratch mode / | (slider) | -| | | Right: Nudge (+) | | +| 13 | Touch Slider (Normal mode) | | Left: Nudge (-) | | Moves to specified position in the song | +| | | | Center: Enable scratch mode | | (slider) | +| | | | Right: Nudge (+) | | | +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ -| | Touch Slider (Hot Cue mode) | Sets or moves to Hot Cue. | Delete Hot Cue. | -| | | Left: 1 / | Left: 1 / | -| | | Center: 2 / | Center: 2 / | -| | | Right: 3 | Right: 3 | +| | | Touch Slider | | Sets or moves to Hot Cue. | | Delete Hot Cue. | +| | | (Hot Cue mode) | | Left: 1 | | Left: 1 | +| | | | Center: 2 | | Center: 2 | +| | | | Right: 3 | | Right: 3 | +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ -| | Touch Slider (Loop mode) | Left: Halfs Loop / | Left: Sets Loop In point / | -| | | Center: New beatloop at playback position / | Center: Re-loop / | -| | | Right: Doubles Loop | Right: Sets Loop Out point | +| | | Touch Slider | | Left: Halfs Loop | | Left: Sets Loop In point | +| | | (Loop mode) | | Center: New beatloop at playback position | | Center: Re-loop | +| | | | Right: Doubles Loop | | Right: Sets Loop Out point | +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ | 14 | EQ | Boosts or Cuts Hi/Mid/Lo EQ | | +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ | 15 | Gain knob | Adjusts gain | | +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ -| 16 | Load button | Loads song into selected deck A/B | A: close selected folder in file-browser / | -| | | | B: open selected folder in file-browser | +| 16 | Load button | Loads song into selected deck A/B | | A: close selected folder in file-browser | +| | | | | B: open selected folder in file-browser | +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ -| 17 | Fx button | Left: FX1 rack mix knob can be manipulated | | -| | | when enabled / | | -| | | Right: FX2 rack mix knob can be manipulated | | -| | | when enabled | | +| 17 | Fx button | | Left: enable/disable FX1 | | +| | | | Right: enable/disable FX2 | | +-----+----------------------------------------+-----------------------------------------------+------------------------------------------------------+ | 18 | Headphone cue button | Turns headphone monitor on/off | Switches the function of the level meter | | | | | between Deck A/B and the Master level |