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.

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

Pioneer DDJ-FLX4: Added controller mapping documentation #534

Merged
merged 7 commits into from
Sep 4, 2023

Conversation

Robert904
Copy link
Contributor

@Robert904 Robert904 commented Feb 3, 2023

Documentation for the proposed mapping for Pioneer controller DDJ-FLX4.

Preview:
https://deploy-preview-534--mixxx-manual.netlify.app/hardware/controllers/pioneer_ddj_flx4

PR for the mapping is mixxxdj/mixxx#11245

@Robert904
Copy link
Contributor Author

Not sure what should be done... The errors reported by the link checker are for files not modified by this PR...

@JoergAtGithub
Copy link
Member

Not sure what should be done... The errors reported by the link checker are for files not modified by this PR...

The link issues are fixed in the 2.3 branch now. To get these fixes, call:

git fetch upstream
git merge upstream/2.3

Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

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

Manual looks good otherwise

@Robert904
Copy link
Contributor Author

Just pushed a new version with a new mapping for the FX buttons, inline with the modification done in the DDJ-400 mapping

@Robert904 Robert904 changed the base branch from 2.3 to 2.4 September 1, 2023 17:04
@Robert904
Copy link
Contributor Author

Retargetted at 2.4

@ronso0
Copy link
Member

ronso0 commented Sep 1, 2023

Looks like rebase went wrong, this Merge branch 'ddj_flx4' into 2.4, too.
Please rebase interactively onto 2.4 and remove all unrelated commits.

@Robert904
Copy link
Contributor Author

I actually avoided using rebase to avoid problems (I had to look for retarget procedure in internet;..), so I forced content of 2.4 into my branch and reapplied my commits... (sorry if it is uselessly complex and if my commit message was not good...)

The resulting branch compared to the 2.4 is indeed only my 7 added files !

Is it not good like that ? (I was busy doing the same for the mapping itself...)

@ronso0
Copy link
Member

ronso0 commented Sep 1, 2023

Well, here it's 23 commits: 8 about the FLX4 plus merge commits and unrelated stuff.

I don't see any actual inline code review that might get detached during rebase, so just go ahead and rebase I'd say 🤷‍♂️

@Robert904
Copy link
Contributor Author

Robert904 commented Sep 2, 2023

OK... tried again, I hope I did not make a mess!

@Robert904
Copy link
Contributor Author

And removed the brands/logos as requested

@Robert904
Copy link
Contributor Author

broken checks are not linked to this PR...

@ronso0
Copy link
Member

ronso0 commented Sep 2, 2023

Okay, great. It's just 5 commits now (compared to 8 I saw before), did you double-check the chapter includes everything you added earlier?
https://deploy-preview-534--mixxx-manual.netlify.app/hardware/controllers/pioneer_ddj_flx4

@Robert904
Copy link
Contributor Author

Robert904 commented Sep 2, 2023

I just realized the page numbers pointing to the manufacturer's manual were not valid anymore, I updated them.
Other than that, looks good to me !

Now just waiting for the mapping itself to be merged :-)
#11245

@Holzhaus
Copy link
Member

Holzhaus commented Sep 2, 2023

Now just waiting for the mapping itself to be merged :-)

Don't worry, we usually wait until both the mapping itself and the corresponding documentation in the manual are ready and then merge both at the same time 😄

@Swiftb0y Swiftb0y merged commit 40c0c31 into mixxxdj:2.4 Sep 4, 2023
8 of 9 checks passed
Copy link
Member

@ronso0 ronso0 left a comment

Choose a reason for hiding this comment

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

Some small requests

Comment on lines +126 to +137
Pad Modes
^^^^^^^^^

The pad mode buttons change between different modes in which the performance pads operate. The main
pad modes described below are similar to those found in rekordbox.

.. note:: The secondary pad modes described in the manufacturer's manual
(:hwlabel:`KEYBOARD` :hwlabel:`PAD FX1` :hwlabel:`PAD FX2` and
:hwlabel:`KEYSHIFT`) are not currently implemented by this
mapping.

Hot Cue Mode
Copy link
Member

Choose a reason for hiding this comment

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

Could you look into using different heading levels here (and probably throughout the entire page)?
Currently Pad Modes and each mode heading are the same level.
Maybe numbering works, too.

No. Control Function
======== ================================================== ==========================================
1 :hwlabel:`LOAD` buttons Load track selected in library into deck.
2 Rotary Selector Press to toggle focus between the library sidebar and associated panels. Turn to move focus up or down.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
2 Rotary Selector Press to toggle focus between the library sidebar and associated panels. Turn to move focus up or down.
2 Rotary Selector Press to move focus between the library sidebar, search bar and tracks view (Shift+press to move focus backwards). Turn to move selection up or down.

@ronso0
Copy link
Member

ronso0 commented Sep 4, 2023

Looks like I was too slow with my review...

@Robert904 Do you mind taking a look at my suggestions nonetheless and maybe implement them in a follow-up PR?

@Swiftb0y
Copy link
Member

Swiftb0y commented Sep 4, 2023

Sorry merging prematurely... 🫣

@ronso0
Copy link
Member

ronso0 commented Sep 4, 2023

@Swiftb0y don't worry, I started this review yesterday and didn't manage to finalize it until now. maybe should have posted it chunk by chunk.
Also, my findings are no big deal, just polishing.

@Robert904 Robert904 deleted the ddj_flx4 branch September 5, 2023 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants