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

Manual Numark Mixtrack Platinum FX #623

Draft
wants to merge 128 commits into
base: 2.5
Choose a base branch
from
Draft

Manual Numark Mixtrack Platinum FX #623

wants to merge 128 commits into from

Conversation

evoixmr
Copy link

@evoixmr evoixmr commented Feb 26, 2024

@ronso0 ronso0 marked this pull request as draft February 27, 2024 09:04
@evoixmr evoixmr changed the title Manual for mapping of Numark Mixtrack Platinum FX Manual Numark Mixtrack Platinum FX Mar 6, 2024
@evoixmr evoixmr marked this pull request as ready for review March 6, 2024 20:05
@ronso0
Copy link
Member

ronso0 commented Mar 7, 2024

Just a quick note regrading the images:
it would be preferred to create rather small SVG overviews instead of adding ~1 MB PNG images to the repo. You can create black/white SVGs by tracing the origial raster image (as you did in an earlier commit I think).
Or adopt an existing SVG, e.g. from the Platinum https://manual.mixxx.org/2.4/en/hardware/controllers/numark_mixtrack_platinum

@evoixmr
Copy link
Author

evoixmr commented Mar 7, 2024

@ronso0 I updated all photos and scripts to use svg. I also deleted the png files.

.. Credit to PopHippy for creating the original PDF file.
Numark Mixtrack Platinum FX

Copy link
Member

Choose a reason for hiding this comment

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

This blank line before the dash line indicating a header makes the page generator pick Overview as page title.
Please remove.
image

Copy link
Author

Choose a reason for hiding this comment

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

Updated header.

:alt: Numark Mixtrack Playinum FX (schematic view)
:figclass: pretty-figures

---------------
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
---------------
---------------

Please remove these lines. They prevent proper header rendering. Also some table rows are broken due to blank lines.
I suggest you check the preview and tweak until it looks as desired.
https://deploy-preview-623--mixxx-manual.netlify.app/hardware/controllers/numark_mixtrack_platinum_fx

Copy link
Author

Choose a reason for hiding this comment

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

I removed the lines.

Copy link
Member

Choose a reason for hiding this comment

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

The appearance is still broken, just check the preview.
FYI you may also build the html locally with make html and double-check before pushing.

Copy link
Author

Choose a reason for hiding this comment

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

I just updated the appearance. Can you recheck and make suggestion on which areas need to be improve?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, it's loking good now. It were just the blank lines that enforced header formatting on each following line.

@ronso0
Copy link
Member

ronso0 commented Jan 24, 2025

Sure we can aim for that : )

This manual still states that the FX buttons select certain preset which is not implemented in mixxxdj/mixxx#12872 (which has stalled), other than that this PR looks good I think.
Once mixxxdj/mixxx#12872 gets LGTM, too, I'll take a final look here (got other stuff on the table atm, sorry).

@evoixmr
Copy link
Author

evoixmr commented Jan 24, 2025

@ronso0 I updated effect section of the manual and added:
"Press one of these buttons to select the user assigned software effect."
"FX Buttons will need tp be assigned on the mixxx Effects option on the main interface."

FX Buttons will need to be assigned with the mixxx `Effects <https://manual.mixxx.org/2.5/en/chapters/effects#effects>`__ selectors in the graphical interface.
@evoixmr
Copy link
Author

evoixmr commented Jan 25, 2025

@ronso0 updated.

update references to `engine.scratch..` functions
@Swiftb0y
Copy link
Member

please rebase on 2.5 to fix the CI. 2.4 CI is abandoned and broken.

@evoixmr evoixmr changed the base branch from 2.4 to 2.5 January 30, 2025 17:06
@evoixmr
Copy link
Author

evoixmr commented Jan 30, 2025

Uodated base to 2.5

@Swiftb0y
Copy link
Member

you'll also have to either rebase on upstream/2.5 or merge the upstream/2.5 branch to fix the CI.

@evoixmr
Copy link
Author

evoixmr commented Jan 31, 2025

@Swiftb0y I tried to push the upstream yo 2.5, my pc is having ssh authentication issue,. Is this doable on the browser?

@Swiftb0y
Copy link
Member

I'm afraid not properly, you'll have to fix your ssh setup...

@evoixmr
Copy link
Author

evoixmr commented Feb 1, 2025

@Swiftb0y I fixed the ssh issue. The rebase to 2.5 was not successful, too much conflict. Any advice?

@ronso0
Copy link
Member

ronso0 commented Feb 1, 2025

@evoixmr it seems you merged mixxx/2.5
Did you use git rebase or merge?
The rebase command would be git rebase -i mixxx/2.5
Make sure to fetch mixxx before that.

Oh, do you use the command line at all?

@evoixmr
Copy link
Author

evoixmr commented Feb 1, 2025

@ronso0 @Swiftb0y Rebased to 2.5

@Swiftb0y
Copy link
Member

Swiftb0y commented Feb 2, 2025

Thank you. Preview looks good on first look, but I don't have time for a proper review right now. What about you @ronso0?

@ChrisTallon
Copy link

@evoixmr Do you want me to try to push that effects paragraph I wrote into evoixmr/manual:2.5 ?

ChrisTallon@06ff501

@ronso0
Copy link
Member

ronso0 commented Feb 7, 2025

FYI I'm about to fix the rebase, there are 4k+ files changed here.

@ronso0
Copy link
Member

ronso0 commented Feb 7, 2025

Hmm I can't push as ususal when doing fixups in other's PRs.
We don't want to just close this PR and start anew, so one way forward would be for @evoixmr :

  • rename you branch locally git checkout 2.4 then git branch -m 2.4_bak
    (and next time don't work on top of a Mixxx branch please)
  • create a new branch git checkout -b 2.4 mixxx/2.5 --> replace 'mixxx' with the name of your Mixxx remote, might be 'upstream' or something
  • add my repo as remote
    git remote add ronso0 [email protected]:ronso0/manual.git
  • fetch git remote fetch ronso0 (now your git knows about all my branches and commits)
  • cherry-pick the rebased commit git cherry-pick 7534d1029c3453d28d91dc3e3e6c2f32bfb706a2
  • force-push to your repo, implicitly updating this PR

@ronso0
Copy link
Member

ronso0 commented Feb 7, 2025

that rebased commit is also here #724

@ronso0 ronso0 marked this pull request as draft February 7, 2025 16:49
@ronso0
Copy link
Member

ronso0 commented Feb 7, 2025

Made this a draft to prevent accidental merge.

LGTM btw 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants