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

Open
wants to merge 1 commit into
base: 2.5
Choose a base branch
from
Open

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.

@evoixmr evoixmr requested a review from ronso0 March 8, 2024 15:36
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.

Another rather shallow review focused on appearance.
I see you spent a lot of time on this, though the appearance is suboptimal (e.g. headers, controls table)

@ronso0
Copy link
Member

ronso0 commented Mar 10, 2024

Re the schematic overview:
correct me if I'm wrong: the Platinum FX is identical to the Pro FX except it has jog wheel displays.
So we can use the Pro FX overview and just change some numbers.

I'll prepare a PR.

@ronso0
Copy link
Member

ronso0 commented Mar 10, 2024

Here you go evoixmr#7

I have no idea what's causing the rstcheck to fail 🤷

@evoixmr
Copy link
Author

evoixmr commented Mar 11, 2024

I just corrected the rstcheck errors.

@evoixmr
Copy link
Author

evoixmr commented Mar 11, 2024

How do I correct this error? Is there anything I can do here?

Sphinx / Link Check (pull_request) Failing after 2m
/home/runner/work/manual/manual/source/chapters/appendix/changelog.rst:549: WARNING: broken link: file:line ()

@ronso0
Copy link
Member

ronso0 commented Mar 12, 2024

Don't care about that, links may time out occassionally, and you didn't touch that file 🤷
(the link in question is mixxxdj/mixxx#12253 and it works for me, formatting also looks okay)

@evoixmr
Copy link
Author

evoixmr commented Mar 12, 2024

I just added Shift+Cue Gain - Global Sample Volume Adjust..

@ronso0
Copy link
Member

ronso0 commented Oct 21, 2024

Thanks for the reminder @evoixmr
It looks like work/review on mixxxdj/mixxx#12872 has stalled, but this PR is mostly ready?
What do you think about effect toggles

Press one of these buttons to select a software effect.
• HPF (High pass filter)
• LPF (Low pass filter)
• Flanger
• Echo
• Reverb
• Phaser

IIUC work on this mapping started while 2.3 was the stable version, and 2.4 now allows to load specific effect presets (ie. items at specific position in the preset list, not by effect uuid or something).
Does it make sense to address this now?

@evoixmr
Copy link
Author

evoixmr commented Oct 30, 2024

Thanks for the reminder @evoixmr It looks like work/review on mixxxdj/mixxx#12872 has stalled, but this PR is mostly ready? What do you think about effect toggles

Press one of these buttons to select a software effect.
• HPF (High pass filter)
• LPF (Low pass filter)
• Flanger
• Echo
• Reverb
• Phaser

IIUC work on this mapping started while 2.3 was the stable version, and 2.4 now allows to load specific effect presets (ie. items at specific position in the preset list, not by effect uuid or something). Does it make sense to address this now?

Yes, the PR is ready. As far as he effects preset, is there a documentation that I can use to add preset?

@ronso0
Copy link
Member

ronso0 commented Oct 30, 2024

All effect / effect chain preset controls are documented here
https://manual.mixxx.org/2.4/en/chapters/appendix/mixxx_controls.html#controls

Loading specific Quick Effect presets can be done with [QuickEffectRack1_[ChannelI]],loaded_chain_preset.
This control expects an integer argument 0 .. [num_chain_presets - 1], so the user has to arrange the Quick Effect presets in Preferences -> Effects to match the button labels (or any desired custom mapping).

@ChrisTallon
Copy link

@ronso0
Hi, I'm having a go at setting preset effects from the init function of this controllers mapping. In JS, is there a way of finding the index number of a specific effect by its string title?

So far, I am assigning effects to the FX units to match the controller if the effects unit slots are empty, at initialisation time of the mapping. I have this working, but upgrading to 2.5 changed the list of available effects and so my hard coded assignments are off.

Thanks.

@ronso0
Copy link
Member

ronso0 commented Jan 10, 2025

In JS, is there a way of finding the index number of a specific effect by its string title?

Nope, and actually hard-coding effects wouldn't be ideal anyways.
Mappings for similar controllers simply use the quick effects preset list which users can customize in the preferences, for example the Traktor Kontrol S2 Mk3 and S4 Mk3.

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

@evoixmr
Copy link
Author

evoixmr commented Feb 8, 2025

@ronso0 done

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 8, 2025

Hmm no, apparently not. We still see
image
Should now be 1 Commit, 3 Files changed

What does this print?
git log -1 --oneline
Should be this, just that *** shows your remote state
7534d1029 *** add mapping for Numark Mixtrack Platinum FX

@evoixmr
Copy link
Author

evoixmr commented Feb 8, 2025

@ronso0 4eab7259 (HEAD -> 2.4, origin/HEAD, origin/2.4) add mapping for Numark Mixtrack Platinum FX

Can you check now?

@ronso0
Copy link
Member

ronso0 commented Feb 8, 2025

Ah, now you've pushed!
LGTM, except that we should add a white background to the outline SVG so that it can be read on dark backgrounds, too.
Please replace it with this one
numark_mixtrack_platinum_fx
Than git add, git commit --amend and force-push again please.

@evoixmr
Copy link
Author

evoixmr commented Feb 8, 2025

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

ChrisTallon@06ff501

@ChrisTallon not yet, Itrying to resolve the rebase issues.

@ronso0
Copy link
Member

ronso0 commented Feb 8, 2025

Pleeeeease use the command line and squash all into one commit.
git fetch to get all commits you did in the web UI
git reset d4eab7259cdd5f260bf3fa5643d659856ab381c1
you should the changes with git status, should be the SVG only
git add --all
git commit --amend
and force-push.

@evoixmr
Copy link
Author

evoixmr commented Feb 8, 2025

@ronso0 Sorry about that., updated on the command line.

@ronso0
Copy link
Member

ronso0 commented Feb 8, 2025

Great, LGTM!
Thanks for your patience!

Next time: pick a descriptive branch name like numark-fix-typos or something, this will save us some hazzle.
Thank you!

@ronso0 ronso0 marked this pull request as ready for review February 8, 2025 16:39
@ronso0
Copy link
Member

ronso0 commented Feb 8, 2025

(just letting CI run once more to be sure)

@evoixmr
Copy link
Author

evoixmr commented Feb 8, 2025

@ronso0 I tried the descriptive branch name. I could not push it from fixing_svg_error to 2.4. It was asking me to do a PR, the PR I open did not see the changes I made.

@ronso0
Copy link
Member

ronso0 commented Feb 8, 2025

Don't chage the branch name while there already is a PR with that branch! It'll just create unnecessary trouble.
That's why I wrote "next time".
And you can't change the base branch while a PR is open. You can only change the target branch

I could not push it from fixing_svg_error to 2.4

You could do that with git push [remote] localBranch:remoteBranch. But that's pointless here (see above).
Simply pick a descriptive branch name for your next feature / bugfix.

@ronso0
Copy link
Member

ronso0 commented Feb 8, 2025

Oh, apparently pre-commit is not happy with the optimized SVG.
But we can use the patch file provided by CI (see above: 1 failing check, click it, click on Summary at the top left, scrol to bottom, see patch file)

Next git exercise 😉

  • download the pre-commit patch, copy the location (/path/to/patch.file)
  • apply the patch with git apply /path/to/patch.file
  • git add --all
  • git commit --amend
  • force-push

@ronso0
Copy link
Member

ronso0 commented Feb 8, 2025

(I presume you don't have pre-commit installed, otherwise you'd have noticed when commiting the SVG I sent)

@evoixmr
Copy link
Author

evoixmr commented Feb 8, 2025

Oh, apparently pre-commit is not happy with the optimized SVG. But we can use the patch file provided by CI (see above: 1 failing check, click it, click on Summary at the top left, scrol to bottom, see patch file)

Next git exercise 😉

  • download the pre-commit patch, copy the location (/path/to/patch.file)
  • apply the patch with git apply /path/to/patch.file
  • git add --all
  • git commit --amend
  • force-push

@ronso0 Done

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.

4 participants