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.

Sign up for GitHub

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

Jump to bottom

Numark DJ2Go2: support HotCue clear with Pad #10841

Merged
merged 1 commit into from
Aug 31, 2022
Merged

Numark DJ2Go2: support HotCue clear with Pad #10841

merged 1 commit into from
Aug 31, 2022

Conversation

doteya
Copy link
Contributor

@doteya doteya commented Aug 30, 2022

push "Pad" in "CUES" mode, activate hotcue, and
push "Pad" holding "PAD MODE" in "CUES" mode, clear hotcue.

@ronso0 ronso0 changed the title Support HotCue clear with Pad. Numark DJ2Go: support HotCue clear with Pad Aug 30, 2022
doteya
doteya commented Aug 30, 2022
View reviewed changes
res/controllers/Numark_DJ2GO2_Touch.midi.xml
@@ -221,6 +221,78 @@
<script-binding/>
</options>
</control>
<control>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

DJ2GO2/DJ2GO2 Touch does not support "shift" button, but send another control (control + 8) when push "Pad" holding "PAD MODE" in "CUES" mode.
Other DJ software assigns it to clear hotcue.
In other modes, holding "PAD MODE" is ignored. DJ2GO2/DJ2GO2 Touch sends same control holding "PAD MODE" or not.

doteya
doteya commented Aug 30, 2022
View reviewed changes
res/controllers/Numark_DJ2GO2_Touch_scripts.js Outdated
@@ -104,7 +104,14 @@ DJ2GO2Touch.Deck = function(deckNumbers, midiChannel) {
this.hotcueButtons[i] = new components.HotcueButton({
group: "[Channel" + script.deckFromGroup(this.currentDeck) + "]",
midi: [0x94 + midiChannel, 0x00 + i],
number: i
number: i,
input: function(channel, control, value, status, _group) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

If the received control is smaller than or equal to 8, send _activate to hotcue.
If the received control is greater than 8, send _clear to hotcue.

@ronso0
Copy link
Member

ronso0 commented Aug 30, 2022

Thank you for this contribution!
For your work to be included in Mixxx we need you to sign the contributor agreement:
Since this is your first contribution we need you to sign the contributor agreement and thereby allows Mixxx to include your changes.
Please give a headsup if you did so.

Updates/fixes to controller mappings that do not rely on new features should go to the current stable branch, which is 2.3 atm.
Please change the base branch here, rebase your branch locally and force-push.

In order to make CI happy (without too many fixup commits), please also set up pre-commit locally, see https://github.com/mixxxdj/mixxx/wiki/Using-git#set-up-automatic-code-checking

Swiftb0y
Swiftb0y requested changes Aug 30, 2022
View reviewed changes
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.

Thanks for your contribution. Can you also take care of updating the manual with this new feature?

res/controllers/Numark_DJ2GO2_Touch_scripts.js Show resolved Hide resolved
@doteya doteya changed the title Numark DJ2Go: support HotCue clear with Pad Numark DJ2Go2: support HotCue clear with Pad Aug 30, 2022
@doteya doteya changed the base branch from main to 2.3 August 30, 2022 19:05
@doteya doteya force-pushed the dj2go2_touch_hotcue_clear branch from 328093b to bee6686 Compare August 30, 2022 19:23
@doteya
Copy link
Contributor Author

doteya commented Aug 30, 2022

Thank you for comments.

ronso0,

I sent my sign.
But I don't know the name is my account name or my real name.
I sent the sign of my real name and my account name with same mail address.

I have branced form 2.3, cherry-pick my commit and push force to my local repositry.

And DJ2Go is not compatible with DJ2Go2/DJ2Go2 Touch.
So I changed commit title DJ2Go to DJ2Go2.
DJ2Go2 and DJ2Go2 Touch are compatible.
Difference of them is "without Touch" or "with Touch" only.

Swiftb0y,

Thank you.

I will try to update manual.

I add comment.

@Swiftb0y
Copy link
Member

Thanks. If you take care of the manual, I'll can take care of the failing pre-commit hook before merging.

@ronso0
Copy link
Member

ronso0 commented Aug 30, 2022

But I don't know the name is my account name or my real name.
I sent the sign of my real name and my account name with same mail address.

Well, depends on with which name/nick you want to be mentioned in the contributor list in the About dialog and on the website?
I'd simply delete the other one.

@doteya
Copy link
Contributor Author

doteya commented Aug 30, 2022

But I don't know the name is my account name or my real name.
I sent the sign of my real name and my account name with same mail address.

Well, depends on with which name/nick you want to be mentioned in the contributor list in the About dialog and on the website? I'd simply delete the other one.

I want to use my account name 'doteya'.
Thank you.

@doteya
Copy link
Contributor Author

doteya commented Aug 30, 2022

Thanks. If you take care of the manual, I'll can take care of the failing pre-commit hook before merging.

I make PR for the manual.
mixxxdj/manual#506

And I have fixed pre-commit code style issue.
I'm always using windows environment. I'm sorry late to setup the pre-commit chek environment.

@Swiftb0y
Copy link
Member

No Problem.
You seem to be proficient with git. Can you squash all the changes into a single commit and force push?

@doteya
Support HotCue clear with Pad.
f4d49f7 
push "Pad" in "CUES" mode, activate hotcue, and
push "Pad" holding "PAD MODE" in "CUES" mode, clear hotcue.
@doteya doteya force-pushed the dj2go2_touch_hotcue_clear branch from b917562 to f4d49f7 Compare August 30, 2022 21:57
@doteya
Copy link
Contributor Author

doteya commented Aug 30, 2022

No Problem. You seem to be proficient with git. Can you squash all the changes into a single commit and force push?

I squash all commits in a single commit and push it.

@ronso0
Copy link
Member

ronso0 commented Aug 30, 2022

I want to use my account name 'doteya'.

Done. Thank you!

@Swiftb0y Swiftb0y mentioned this pull request Aug 31, 2022
Closed
2 tasks
Swiftb0y
Swiftb0y approved these changes Aug 31, 2022
View reviewed changes
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.

LGTM. thank you very much.

@Swiftb0y Swiftb0y merged commit 58530ad into mixxxdj:2.3 Aug 31, 2022
@doteya doteya mentioned this pull request Mar 27, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Swiftb0y Swiftb0y Swiftb0y approved these changes

Assignees
No one assigned
Labels
controller mappings
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@doteya @ronso0 @Swiftb0y