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

feat(controllers): add controller settings for the Numark Scratch #13404

Merged
merged 1 commit into from
Jul 11, 2024

Conversation

NotYourAverageAl
Copy link
Contributor

add controller settings for the Numark Scratch , inspired by the s4mk3

image

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. I don't have much experience with the settings though. Do you spot anything wrong @acolombier?

Copy link
Contributor

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

Glad to see this feature being used. Just added some very minor comments, otherwise LGTM

res/controllers/Numark-Scratch-scripts.js Outdated Show resolved Hide resolved
res/controllers/Numark-Scratch.midi.xml Outdated Show resolved Hide resolved
@NotYourAverageAl NotYourAverageAl marked this pull request as ready for review June 26, 2024 07:30
@NotYourAverageAl
Copy link
Contributor Author

NotYourAverageAl commented Jun 29, 2024

@acolombier this is ready.

@Swiftb0y can someone please merge the 2.4 manual into 2.5, so I can update the controller manual.

Copy link
Contributor

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

Unfortunately, the beatloop value half and double cannot be used without some special handling, since beatlooproll_half_activate and beatlooproll_double_activate don't exist (and wouldn't make sense)

The handling should be fairly easy to add here

@Swiftb0y
Copy link
Member

@Swiftb0y can someone please merge the 2.4 manual into 2.5, so I can update the controller manual.

Done ;)

@NotYourAverageAl
Copy link
Contributor Author

@acolombier I reverted my last commit. Thinking about this more the mixer has only 4 pads instead of 8 and using up 2 pads might not be ideal.

Let's merge as is and ill investigate more if it's worth it when I'm back from holidays.

@NotYourAverageAl
Copy link
Contributor Author

Oops clicked the dreaded comment and close by mistake.

@Swiftb0y Swiftb0y requested a review from acolombier July 1, 2024 21:09
@Swiftb0y
Copy link
Member

Swiftb0y commented Jul 1, 2024

Great. Can you do me a favor and rebase out the reverted commit so it doesn't unnecessarily end up in the commit history?

@NotYourAverageAl NotYourAverageAl force-pushed the NumarkScratchSettings branch 6 times, most recently from 341bc38 to 6d5cd6a Compare July 11, 2024 07:59
@NotYourAverageAl
Copy link
Contributor Author

@Swiftb0y done and squashed. Manual PR is 681

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.

Thank you. LGTM.

@Swiftb0y Swiftb0y merged commit bfb129f into mixxxdj:2.5 Jul 11, 2024
13 checks passed
@NotYourAverageAl NotYourAverageAl deleted the NumarkScratchSettings branch July 13, 2024 01:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants