Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

improve readabality #430 add standby notice #613

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

improve readabality #430 add standby notice #613

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fd4c6ad
Update korg_kaoss_dj.rst
raphaelquast Sep 18, 2021
6c73a60
correc looping behavior
raphaelquast Sep 19, 2021
8ad66c5
improve readabality #430 add standby notice
pi43r Feb 12, 2024
fecf926
removed unused functions
pi43r Feb 12, 2024
a8217b2
remove unused functions (merge)
pi43r Feb 12, 2024
24971c4
fix line breaks, add fx button, remove 9
pi43r Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 89 additions & 0 deletions source/hardware/controllers/korg_kaoss_dj.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Mapping
Korg Kaoss DJ (schematic view)


<<<<<<< Updated upstream
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's some residue from conflict resolution

+-----+------------------------------+-----------------------------------------------+--------------------------------------------+
| No. | Name | Function | Shifted Operation |
+=====+==============================+===============================================+============================================+
Expand Down Expand Up @@ -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