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

Mapping files for Hercules DJControl MIX #11279

Merged
merged 9 commits into from
Jan 3, 2024

Conversation

DJPhatso
Copy link
Contributor

@DJPhatso DJPhatso commented Feb 15, 2023

Based on Hercules DJControl Starlight mapping released with Mixxx v2.3.0:
-Remapped LOOP and SAMPLER section according to DJControl MIX layout;
-Added Master Volume and Headphone Volume;
-Removed superfluous LED configuration (not present on DJControl MIX).

@JoergAtGithub
Copy link
Member

The Pre-Commit check fails. You can fix this by using pre-commit.patch artifact from the CI build:
git apply pre-commit.patch
or you install pre-commit locally on your system: https://github.com/mixxxdj/mixxx/wiki/Using-Git#set-up-automatic-code-checking

@DJPhatso
Copy link
Contributor Author

You can fix this by using pre-commit.patch artifact from the CI build: git apply pre-commit.patch

Not quite sure how to go about doing that.
Tried installing pre-commit locally, but it looks to be difficult with the workplace restrictions.

@JoergAtGithub
Copy link
Member

Than download this file:
grafik
and execute
git apply pre-commit.patch

@DJPhatso
Copy link
Contributor Author

Done.

@JoergAtGithub
Copy link
Member

Please try again, this wasn't successful

@DJPhatso
Copy link
Contributor Author

I re-applied the patch. Now trying to resync to commit again, but that doesn't seem to work.

@JoergAtGithub
Copy link
Member

@DJPhatso
Copy link
Contributor Author

DJPhatso commented Feb 24, 2023

As mentioned before, I tried these steps, but I'm doing this on my work computer, and the admin restrictions are not allowing me to install everything properly. Planning on eventually starting anew on another personal pc, but this is not possible currently.

Is there any work around ? This seems complicated just to submit a mapping.

@JoergAtGithub
Copy link
Member

You don't need to install anything except git. Than download the pre-commit.patch from the failing GitHub build and call git apply pre-commit.patch

@DJPhatso
Copy link
Contributor Author

DJPhatso commented Mar 6, 2023

If that would have worked, we wouldn't be here...

I'm in the process of installing and configuring everything as best as I can on a Linux system, and use that only for submission, but that in itself is something I could do without ATM.

@Swiftb0y
Copy link
Member

Hey there @DJPhatso. Have you seen my PR DJPhatso#7 that fixes the pre-commit issues? If you merge that, we can start looking a more closer look at this PR. what do you think?

@DJPhatso
Copy link
Contributor Author

DJPhatso commented Aug 8, 2023

Just checking if this is in-line to be included in the next release or if there is anything left to do.

@JoergAtGithub
Copy link
Member

We need also the documentation page for the manual, see: https://github.com/mixxxdj/mixxx/wiki/Contributing-Mappings#user-content-documenting-the-mapping

DJPhatso added a commit to DJPhatso/manual-MIXXX that referenced this pull request Aug 14, 2023
Mapping descriptions related to the submitted mapping :

mixxxdj/mixxx#11279
@JoergAtGithub JoergAtGithub changed the base branch from main to 2.4 December 28, 2023 18:56
DJPhatso and others added 4 commits December 28, 2023 20:01
Based on Hercules DJControl Starlight mapping released with Mixxx v2.3.0:
-Remapped LOOP and SAMPLER section according to DJControl MIX layout;
-Added Master Volume and Headphone Volume; 
-Removed superfluous LED configuration (not present on DJControl MIX).
@JoergAtGithub JoergAtGithub added the changelog This PR should be included in the changelog label Dec 28, 2023
Copy link
Member

@JoergAtGithub JoergAtGithub left a comment

Choose a reason for hiding this comment

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

Overall it's looking good, but I listed some minor findings, which should be corrected before merging this.

res/controllers/Hercules-DJControl-MIX-scripts.js Outdated Show resolved Hide resolved
res/controllers/Hercules-DJControl-MIX-scripts.js Outdated Show resolved Hide resolved
res/controllers/Hercules-DJControl-MIX-scripts.js Outdated Show resolved Hide resolved
res/controllers/Hercules-DJControl-MIX-scripts.js Outdated Show resolved Hide resolved
res/controllers/Hercules DJControl MIX.midi.xml Outdated Show resolved Hide resolved
res/controllers/Hercules DJControl MIX.midi.xml Outdated Show resolved Hide resolved
res/controllers/Hercules DJControl MIX.midi.xml Outdated Show resolved Hide resolved
res/controllers/Hercules-DJControl-MIX-scripts.js Outdated Show resolved Hide resolved
res/controllers/Hercules DJControl MIX.midi.xml Outdated Show resolved Hide resolved
Made all suggested changes to script.
Made suggested changes to xml file
@JoergAtGithub
Copy link
Member

LGTM! Thank you!

@JoergAtGithub JoergAtGithub merged commit ade9ef4 into mixxxdj:2.4 Jan 3, 2024
13 checks passed
@daschuer
Copy link
Member

Hi @DJPhatso, thank you for your contribution.
It looks like we have missed to ask for your permission to distribute your code before merge. Can you catch that up, sign https://docs.google.com/a/mixxx.org/spreadsheet/viewform?formkey=dEpYN2NkVEFnWWQzbkFfM0ZYYUZ5X2c6MQ and comment here when done? I will then put you the Mixxx 2.4 contributor list in the about box. May I use your real name?

@DJPhatso
Copy link
Contributor Author

DJPhatso commented Jan 18, 2024

Filled the form, and yes, you can use my name.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog This PR should be included in the changelog controller mappings
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants