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

feat(controllers): add new controller mapping for Numark NS6II #11075

Merged
merged 14 commits into from
Dec 31, 2024
Merged

feat(controllers): add new controller mapping for Numark NS6II #11075

merged 14 commits into from
Dec 31, 2024

Conversation

Swiftb0y
Copy link
Member

@Swiftb0y Swiftb0y commented Nov 17, 2022 •
edited
Loading

Manual still TODO
manual PR

@Swiftb0y Swiftb0y force-pushed the numark-ns6ii branch 3 times, most recently from 1f3330e to 6f16bba Compare November 17, 2022 22:51
@Swiftb0y
Copy link
Member Author

tests are failing because of the EffectUnits. I guess I'll have to redo them when I find the time. Works locally so far.

@github-actions
Copy link

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

@github-actions github-actions bot added the stale Stale issues that haven't been updated for a long time. label Feb 16, 2023
@github-actions github-actions bot removed the stale Stale issues that haven't been updated for a long time. label Jun 6, 2023
@Swiftb0y Swiftb0y force-pushed the numark-ns6ii branch 2 times, most recently from 7872f2b to fccd316 Compare June 22, 2023 22:46
@Swiftb0y Swiftb0y mentioned this pull request Jul 11, 2023
Open
@github-actions
Copy link

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

@github-actions github-actions bot added the stale Stale issues that haven't been updated for a long time. label Sep 22, 2023
@Swiftb0y
Copy link
Member Author

Ah yes, good old stale. I have had and used this controller for about 5 years now, one day I'll get around to polishing the mapping enough for merge.

Still, a surface-level review in the meantime would be appreciated.

@github-actions github-actions bot removed the stale Stale issues that haven't been updated for a long time. label Sep 23, 2023
@github-actions GitHub Actions
Copy link

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

@github-actions github-actions bot added the stale Stale issues that haven't been updated for a long time. label Dec 22, 2023
@daschuer daschuer changed the base branch from 2.3 to 2.4 June 9, 2024 15:29
acolombier
acolombier reviewed Jun 11, 2024
View reviewed changes
Copy link
Member

@acolombier acolombier left a comment

Choose a reason for hiding this comment

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

Hard to review without the device to test. but it is looking good overall. Also I'm sure that if you've been using it this long, you probably had a chance to polish most of the small bug lying around :)

Some comment cruft here and there that might be worth removing or documenting if useful for alternate behaviours (note that if the latter, you might want to consider the controller settings).
Did you have a chance to prepare the manual for that?

@Swiftb0y
Copy link
Member Author

I'll try to give this another look and ping you when I think its ready. Thanks for the review.

@Swiftb0y
Copy link
Member Author

@acolombier please re-review ;)
I'm mostly satisfied with the mapping (there are a couple TODO's but I'm really not in the mood to implement those).
I'll focus on the manual page next.

@Swiftb0y Swiftb0y removed the stale Stale issues that haven't been updated for a long time. label Jul 17, 2024
@Swiftb0y Swiftb0y mentioned this pull request Aug 3, 2024
Merged
JoergAtGithub
JoergAtGithub reviewed Aug 4, 2024
View reviewed changes
res/controllers/midi-controller-api.d.ts
@@ -1,4 +1,6 @@

type MidiInputHandler = (channel: number, control: number, value:number, status:number, group:string) => void;

Copy link
Member

Choose a reason for hiding this comment

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

I can't spot the place, where this type is defined in our API. Is this a mapping specific type, that doesn't belong to the API?

Copy link
Member Author

Choose a reason for hiding this comment

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

Its the type our input handlers are expected to be https://github.com/mixxxdj/mixxx/wiki/midi%20scripting#midi-input-handling-functions

@Swiftb0y Swiftb0y added this to the 2.4.2 milestone Aug 16, 2024
@Swiftb0y
Copy link
Member Author

friendly ping... ;)

acolombier
acolombier reviewed Sep 2, 2024
View reviewed changes
res/controllers/Numark-NS6II-scripts.js Outdated
Comment on lines 709 to 716
// grey could be an alternative as well as a backlight color.
off: NS6II.USE_BUTTON_BACKLIGHT ? NS6II.PAD_COLORS.RED.DIMMER : NS6II.PAD_COLORS.OFF,
Copy link
Member

Choose a reason for hiding this comment

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

Could it be worth adding a dynamic setting for that?

Copy link
Member Author

Choose a reason for hiding this comment

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

yes, I'll add that as a follow up, but I wanted to keep this branch targetted at 2.4

res/controllers/Numark-NS6II-scripts.js Show resolved Hide resolved
res/controllers/Numark-NS6II-scripts.js Show resolved Hide resolved
res/controllers/Numark-NS6II-scripts.js Show resolved Hide resolved
@daschuer daschuer marked this pull request as draft September 15, 2024 19:36
@Swiftb0y
Copy link
Member Author

How do we want to proceed? 2.4 is EOL, I can rebase on 2.5 and add appropriate controller settings. Anything else to do to get this merged some time? The hardware I have is slowly dying so I won't be able to work on this for very long. It would be a shame if I went trough the entire controller without the mapping ever making it in.

@daschuer
Copy link
Member

You can just change the release branch via "edit" above. Alternative is to merge it to the 2.4 branch and than merge 2.4 to 2.5.

@Swiftb0y
Copy link
Member Author

right, but there is little point when nobody is bothering to review or press merge.

@Swiftb0y Swiftb0y changed the base branch from 2.4 to 2.5 December 19, 2024 12:45
@Swiftb0y
Copy link
Member Author

added the 2.5 controller settings feature. Would you be so kind and do another review round @acolombier? Thank you.

@ronso0 ronso0 added this to the 2.5.1 milestone Dec 30, 2024
acolombier
acolombier approved these changes Dec 31, 2024
View reviewed changes
Copy link
Member

@acolombier acolombier left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks for you work here. I'll let @ronso0 hit merge once the manual PR is being merged too :)

@Swiftb0y
Copy link
Member Author

Did a final rebase just in case. Should be good to go.

@ronso0
Copy link
Member

ronso0 commented Dec 31, 2024

Alright, thanks!
waiting for CI...

@Swiftb0y
Copy link
Member Author

Passed. lets go.

@ronso0 ronso0 merged commit 9da251b into mixxxdj:2.5 Dec 31, 2024
13 checks passed
@Swiftb0y
Copy link
Member Author

Thank you both @acolombier and @ronso0 for pulling through and finally getting this merged. I'm very relieved to be able to focus on the Reloop Ready mapping next #4513 and afterwards on my Traktor S8.

@Swiftb0y Swiftb0y deleted the numark-ns6ii branch December 31, 2024 16:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JoergAtGithub JoergAtGithub JoergAtGithub left review comments

@acolombier acolombier acolombier approved these changes

Assignees
No one assigned
Labels
code quality controller mappings
Projects
None yet
Milestone
2.5.1
Development

Successfully merging this pull request may close these issues.
5 participants
@Swiftb0y @acolombier @daschuer @ronso0 @JoergAtGithub