-
Notifications
You must be signed in to change notification settings - Fork 136
S4MK3: add support for Stem, rework hotcues and add beatjumps #703
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.
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
base: 2.6
Are you sure you want to change the base?
Conversation
@ywwg I would really appreciate a review if you can! :) |
source/hardware/controllers/native_instruments_traktor_kontrol_s4_mk3.rst
Outdated
Show resolved
Hide resolved
2. **Grid**: The track's detected beats will be move forward or backward on the waveform. | ||
3. **BPM**: The track's detected BPM will be increased or decreased. | ||
4. **Keyboard**: The keyboard's keys displayed on pads get moved up or down to display higher or lower keynotes. | ||
5. **Hotcue color**: When selecting a hotcue, the move encoder can be used to change the selected color. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While the hotcue button is pressed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, it's explained below..
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IMO it would be better to explain the modes first then refer to them in each component section.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you suggesting to swap the list and table
|
||
============================================================================================== =========================================== ================================================================================================================= ===================================================================================== ================================================================================================================================================================================================================ | ||
============================================================================================== =========================================== ================================================================================================================= ===================================================================================== ====================================================================================================================================================================================================================================== | ||
Setting Variable value Default Range Description |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My experience with this table:
- the content is very wide and I have to scroll horizontally to check the description for example
- I don't need the
Variable value
column. If I'd be interested, I'd look at the settings in the js file
-> this would reduce the table width - in the
Default
column we may remove the the prefix (LEDColors etc.) and just show the values
-> this would reduce the table width
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since 2.4 is EOL, I'm tempted to remove a lot actually, since with the SettingsAPI, you shouldn't have to edit the file, except if you are hacking around. Wdyt?
Wanted to take look but Netlify fails with
|
0a13166
to
4551cbc
Compare
Fixed @ronso0 - my branch was quite out of date it turns out |
I have rebased and reword that PR to exclude the screen bits (4c9c600), which I will add in a follow up PR against 2.7. Does that sound all good? |
source/hardware/controllers/native_instruments_traktor_kontrol_s4_mk3.rst
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
comment only
(can't find a way to just dismiss a change request) |
Mostly I just want a narrative howto for how to work with effects like you have for the motor and jogwheel section. |
source/hardware/controllers/native_instruments_traktor_kontrol_s4_mk3.rst
Outdated
Show resolved
Hide resolved
source/hardware/controllers/native_instruments_traktor_kontrol_s4_mk3.rst
Outdated
Show resolved
Hide resolved
source/hardware/controllers/native_instruments_traktor_kontrol_s4_mk3.rst
Outdated
Show resolved
Hide resolved
Still says this in the intro section, but I think this PR is for post screen support. |
68e94dc
to
93eee16
Compare
Good catch! This should indeed have been moved in the other manual PR. I have taken the freedom to squash the fixup already, so if everything is looking fine now, we can merge it as the mapping changes have been merged already! |
Are the changes other than the rst file relevant for this PR, or did they slip in by accident during rebase? The netlify preview is outdated and the HTML runner skipped -- because of these changes? |
Yeah, 93eee16 is not related to this PR directly. I can move it to another PR if you would prefer! |
93eee16
to
b4dfcbc
Compare
Spent sometimes looking into this - the HTML job is expected to be skipped, and by the look of it, the Netlify deploy is orchestrated remotely, likely with a webhook, but I don't have access to this repo's settings, or the Netlify project. @mixxxdj/admins can you have a look or grant me the permission to do so? |
Yup, that'd be better. Thanks for looking into the netlify issue! |
I should have time to do one last test today and I promise I will only look at the specific functionality being added :) |
b4dfcbc
to
8c95c0f
Compare
Sorry for the delay. I hope to get to this soon |
This mapping is out in 2.6beta and the docu doesn't match anymore. |
+--------------+-----------------------------------------------------------------------------+ | ||
| Keyboard | This mode is enabled while :hwlabel:`SHIFT` + :hwlabel:`STEM` is held down | | ||
+--------------+-----------------------------------------------------------------------------+ | ||
| Hotcue color | This mode is enabled while :hwlabel:`HOTCUES` is held down | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this functionality should be merged in, right? This is not working for me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(I am using 2.6)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Press both HOTCUE and a hotcue, then turn left encoder.
Doesn't work?
Hotcue color controls have been added in 2.4 or even earlier so this should work.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah, nothing happens. I'll triple-check that my S4 is using the right mapping.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm.. I can test the mapping (mixxxdj/mixxx#15216) tomorrow.
Btw it would be cool if we could use the last used hotcue, instead of having to press two buttons.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think just setting the selected pad value regardless of mode would at least fix the immediate discoverability issue and wouldn't introduce any side effects
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure that would work as it will have a side effect with the left encoder itself - if you go with this approach, when you would use it, it would change the color of the last triggered hotcue. Equally, it would require to trigger the hotcue which would impact the playback (currently you can edit the color why being live)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you could clear the selected hotcue button value when the hotcue selector button is released.
at the very least, let's clarify the docs to say that the user has to hold the hotcue button down for a period of time before pressing the hotcue pad.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to tie this edit mode to long press? it looks like short press doesn't do anything other than change the screen. Changing the page only triggers on short release.
Pick whatever solution you like, but for now, let's at least make the docs more clear so that others don't trip over the same issue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah I think we could use short press too tbh.
Do you have any rewording suggestions to make the current instructions clearer? I can try to update when I'm back otherwise.
I don't find info on how to focus an effect. |
Ah good catch! I'm going to be away from keyboard for the next few days, so feel free to push a change if you would want to unblock the 2.6 out of sync doc, otherwise I will have a look when I get back, somewhere in the first half of October |
+--------------+-----------------------------------------------------------------------------+ | ||
| Keyboard | This mode is enabled while :hwlabel:`SHIFT` + :hwlabel:`STEM` is held down | | ||
+--------------+-----------------------------------------------------------------------------+ | ||
| Hotcue color | This mode is enabled while :hwlabel:`HOTCUES` is held down | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| Hotcue color | This mode is enabled while :hwlabel:`HOTCUES` is held down | | |
| Hotcue color | This mode is enabled after holding :hwlabel:`HOTCUES` for a short period of time | |
2. **Grid**: The track's detected beats will be move forward or backward on the waveform. | ||
3. **BPM**: The track's detected BPM will be increased or decreased. | ||
4. **Keyboard**: The keyboard's keys displayed on pads get moved up or down to display higher or lower keynotes. | ||
5. **Hotcue color**: When holding both :hwlabel:`HOTCUES` and a hotcue, the move encoder can be used to change the selected color. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
5. **Hotcue color**: When holding both :hwlabel:`HOTCUES` and a hotcue, the move encoder can be used to change the selected color. | |
5. **Hotcue color**: When first holding :hwlabel:`HOTCUES`, then tapping a specific hotcue, the move encoder can be used to change the selected color. |
I have this commit 162b5e3 / https://github.com/acolombier/mixxx-manual/pull/1to simplify the fx section a bit, ie. remove redundancy. Btw these tables are a PITA to edit, wasn't there a more user-friendly way? |
I always use CSV Tables, ugly, but way easier to edit. |
Yeah, I just discovered that, too, but with csv there's no row-span/col-span. |
Related to
mixxxdj/mixxx#13653mixxxdj/mixxx#15216https://deploy-preview-703--mixxx-manual.netlify.app/hardware/controllers/native_instruments_traktor_kontrol_s4_mk3.html