Update Numark-Mixtrack-3-scripts.js

[amakea]

Updates and bug fixes with gracious help by @Swiftb0y

[Swiftb0y]

Welcome and thanks for improving this! Please sign the Mixxx Contributor Agreement and comment here when you have done so. It gives us permission to distribute your contribution under the GPL v2 or later license and the Apple Mac App Store. It is also helpful for us to have contact information for contributors in case we may need it in the future.

Since this is a bugfix, can you rebase this on the 2.4 branch as well? Thank you.

[amakea]

Is their a (fairly simple) way to rebase on the website? Or would it be easier to just do another fork and submit another pull request?

[Swiftb0y]

not that I know of. I'll take care of it. ;)

[github-actions]

This PR is marked as stale because it has been open 90 days with no activity.

[amakea]

Noticed some new activity regarding this controller. I signed the contributor agreement. Are you able to rebase it @Swiftb0y do I need to give you special permission?

[endcredits33]

Thanks @amakea and @Swiftb0y for these changes, working much better now.

I propose another change regarding the PFL LED behaviour and the smartPFL variable. Currently, loading a track changes the PFL LED status on the controller, which interferes with normal usage of PFL. For example, even if PFL is off on a deck, loading a track into it will make the PFL LED light up and vice versa, creating confusion.

I've proposed a fix in #14165. What's the best way of addressing this and merging with this PR?

[amakea]

Would be happy to see your changes included @endcredits33 . I'm a beginner with github as well. Apparently the PR needs to be rebased to a different version which I don't know how to do. Perhaps @ronso0 can assist with this?

[ronso0]

@endcredits33 you just need to create a branch based on this PR (branch: https://github.com/amakea/mixxx/tree/main, btw 'main' is not a good name, try to name branches to describe the feature / bug they adress).
Then commit your fix on top.
Push to your repo.
Share the commit hash.

For @amakea being able to git cherry-pick your commit locally, they need to add your fork to their local git remotes, then fetch it git fetch <remote name>.

[amakea]

I changed the name of the branch and the pull request was closed and now I'm confused. I'm happy to just relinquish whatever "rights" I have to these code changes and hand them over to @Swiftb0y or @ronso0 because it would probably make things a lot simpler.

[ronso0]

I changed the name of the branch

Umm, just renamed it and the PR was closed instantly? You aren't working on the command line but with the Github web UI?
I didn't know that renaming the default branch of repo/fork (main in case of Mixxx) is even allowed. (ahh, you made mixtrack3 the default branch..)
I suggest learning to work with the git command line. A starter tutorial is on the wiki here and there are tons of tutorials on the web. Mixxx contributing page has instructions on how to get started.

For now, I suggest you create a new branch main from mixxxdj/mixxx/main and make that your default again.

Then open a PR from the mixtrack3 branch. Since no review happened here this is not a big loss.
Then @endcredits33 adds your repo to their remotes, creates a branch on top of your mixtrack3 branch and applies the fixup.
You can invite other Github users to your repo to collaborate. @endcredits33 can then push his branch to your repo.
And Mixxx maintainers can edit as well if you set the respective option (default on)

[amakea]

I think I did what you asked, and also invited endcredits33. Please let me know if I missed anything.
https://github.com/amakea/mixxx

[ronso0]

Okay, but the PR is against your own repo. To include it im Mixxx it must be opened against the Mixxx repo. You can still collaborate on that branch.

[amakea]

ok. here it is

[endcredits33]

@amakea, I created a branch in your fork with proposed changes for the PFL LED. Description below:

Change PFL LED behaviour so that shift+Load (fader start) does not switch on LED to avoid confusing behaviour. Works properly with the smartPFL variable. The only thing I can't figure it out is that with these changes, the PFL button acts as a radio button - you can only choose to have PFL enabled on one deck but not both. Not necessarily an issue but not consistent with other mappings.

[amakea]

I need help with this. I authenticated with an access token and did git clone https://github.com/amakea/mixxx.git
which did something. Now I'm stuck on what to do next.

[ronso0]

why did you clone your own Mixxx fork?

[amakea]

i thought it was the correct thing to do. I explained to you this was very unfamiliar to me. Can you please walk me through the commands to type? My branch for the PR is here, the branch with @endcredits33 changes are here and the hash for their changes is 65dfd235500013db16576f3b363e32a3ae409680.

[ronso0]

Sure, I understood that. But I also linked the Contributing page earlier which has links to a few important basic & easy tutorials for new contributors, most important: Using Git
Btw good you started with the git command line 👍

If you want to check a branch of a project or another contributor, you need to add that repo to your remotes.
That's what you did with the Mixxx repo (hopefully, following the git tutorial), it's the second step after cloning it:
git remote add upstream https://github.com/mixxxdj/mixxx.git gives you a remote named upstream
Thing is, your local git is not aware of all git commits out there. So if you want to checkout and work on top of a branch of someone else, or cherry-pick a commit from there, you need to add that users repo (their Mixxx fork in our case).
Adding @endcredits33 as remote can therefore be done with this command:
with http: git remote add endcredits33 https://github.com/endcredits33/mixxx.git
with ssh: git remote add endcredits33 [email protected]:endcredits33/mixxx.git
Et voila, you can now pull all branch info from that repo:
git remote fetch endcredits33 the command output will show all branches from that repo.

Now, you want to revive this branch under a new name and merge @endcredits33's fixes.
git branch -c main mixtrack-pfl-led-fixes copies main to ..
git checkout mixtrack-pfl-led-fixes
Your git knows about @endcredits33 commits by now, so you can cherry-pick their fixup:
git cherry-pick 65dfd235500013db16576f3b363e32a3ae409680 (hash from https://github.com/amakea/mixxx/commits/endcredits33-patch-1/)
which should work without comflicts. In case there are any, fix them, and stage themgit add -a or git add -p, (ideally test them with the controller) then finish the cherry-pick git cherry-pick --continue.
Done.
Push to your repo and open a new PR

I hope that gets you started!
Good luck!

---

Btw, while typing all these commands I notice how much I am used to git shorthands and how much they accelerat daily tasks, e.g. gco for git checkout. These shortcuts are supplied by the git plugin of OhmyZsh for zsh (Z shell, easy to install on Linux, default on macOS since Catalina?, tricky to get on Windows).

[amakea]

I get fatal: bad object 65dfd235500013db16576f3b363e32a3ae409680 when trying to cherry pick.

$ git remote
endcredits33
origin
upstream

$ git branch
  main
* mixtrack-pfl-led-fixes

Is any of this information useful? Do I need to do a git remote add for my own fork as well?