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

Hercules Inpulse 300: add toneplay, slicer, and beatmatch functionalities #14073

Merged
merged 58 commits into from
Dec 29, 2024
Merged

Hercules Inpulse 300: add toneplay, slicer, and beatmatch functionalities #14073

merged 58 commits into from
Dec 29, 2024

Conversation

BoredGuy1
Copy link
Contributor

Note: This adds some last-minute edge case handling to #14051, which is a squashed version of #12503 (sorry for the messy commit history).

Original description (edited a bit to reflect recent changes):
I made some improvements to Mixxx's included Inpulse 300 mapping. I tried to stay close to the manufacturer mappings listed in this manual.

Full list of changes:

  • Added ability to stop samplers (shift + button)

  • Added toneplay

    • Pressing a pad jumps to the most recently used hotcue and changes the pitch
    • Shift + toneplay changes the pitch without jumping
    • Pads 1-4 increase the pitch by +0 to +3 semitones
    • Pads 5-8 decrease the pitch by -4 to -1 semitones
    • LED reflects total adjustment to current key

  • Added slicer/slicer loop:

    • Press slicer button to activate a slicer section, press again to deactivate it
    • Slicer length is dependent on loop length
    • Exiting slicer mode or pressing LOOP OUT also deactivates the slicer section
    • Creating a slicer section overrides active loops, and creating a 4-beat loop overrides active slicer sections
    • Only works on constant BPM (also true in native software DJUCED)
    • Slicer section does not move backwards when scratching (also true in native software DJUCED)

  • Added actual beatmatch guide functionality to the LEDs

    • This replaces the LEDs' old end-of-track warning functionality. Hopefully no one missed it :P

  • Changed the way scratching works

    • Wheels have inertia rather than instantly stopping when released (this allows backspins and other tricks)
    • Removed scratchPad in XML (not sure what it was doing there)

  • Fixed some syntax

    • Replaced connectControl with makeConnection to allow multiple connections (and also to comply with newer versions)
    • Replaced "hotcue_X_enabled" with "hotcue_X_status" in XML file to comply with newer version of Mixxx

Manual is being updated accordingly in another PR: PR#604.

BoredGuy1 added 30 commits January 3, 2024 16:30
@BoredGuy1
Edited authors
c474332
@BoredGuy1
Edited to-do
8defca2
@BoredGuy1
Fixed syntax
9825290
@BoredGuy1
Fixed syntax (again)
52b0b6a
@BoredGuy1
Fixed syntax (yet again)
090fb66
@BoredGuy1
More fixed syntax
25872c8
@BoredGuy1
More fixed syntax
348ce39
@BoredGuy1
Replaced let with var (for some reason let causes errors)
2409adf
@BoredGuy1
Finally fixed spelling (thanks pre-commit)
6cde971
@BoredGuy1
Added sampler stopping and toneplay
3ecb6f3
@BoredGuy1
Added JS to toneplay
dddcfec
@BoredGuy1
Changed scratching, fixed LED issue
62473fe
@BoredGuy1
Changed the way toneplay LED works
8512fbe
@BoredGuy1
Added slicer/slicer loop
1a6938c
@BoredGuy1
Added shift+toneplay controls
d53eeb7
@BoredGuy1
Fixed VU meters
159080e
@BoredGuy1
Added beatmatch guide
644f320
@BoredGuy1
Fixed scratching, rearranged shift+toneplay functions
24b02c8
@BoredGuy1
Rearranged shift+toneplay functions
39181e9
@BoredGuy1
Rearranged shift+toneplay functions
2fa4587
@BoredGuy1
Fixed slicer
6a4d9bd
@BoredGuy1
Fixed formatting for real thanks to ESLint
712d8d7
@BoredGuy1
Fixed formatting and ESLint (hopefully for the last time)
0711585
@BoredGuy1
Changed how toneplay + shift works
1c47ed7
@BoredGuy1
Changed XML to account for loop hotcues
52ececf
@BoredGuy1
Fixed XML version (which I broke 6 months ago)
ea64399
@BoredGuy1
Fixed scratching issue FINALLY (hopefully for real)
fa9ec9a
@BoredGuy1
Fixed scratching issue for real
934594c
@BoredGuy1
Replaced vuMeterUpdateMaster with vuMeterUpdateMain
2b7e034
@BoredGuy1
Changed pad mode values and changed slicerButtons to boolean
3e1b19f
@BoredGuy1
changed VU meter syntax
19eac9c
@BoredGuy1
changed hotcue_X_enabled to hotcue_X_status
03719ef
@BoredGuy1
Replaced stuff with script.deckFromGroup
01efd39
@BoredGuy1
Replaced separate slicer variables with dictionary declaration
28845a9
@BoredGuy1
Merge branch 'main' of https://github.com/BoredGuy1/mixxx
6ef2f3f
@BoredGuy1
Replaced some more numbers with booleans
50dedba
@BoredGuy1
Replaced Master with Main
0d67d18
@BoredGuy1
Fixed some slicer variables
b2a2637
@BoredGuy1
Fixed small channel mistake
bbb3e89
@BoredGuy1
replaced decks with groups
3f4d3ef
@BoredGuy1
reworked toneplay, updated comment about framerate
6e17182
@BoredGuy1
removed useless helper function
b9ea27b
@BoredGuy1
reworked slicer a bit
1f08832
@BoredGuy1
Packed Slicer into components
6c3cce7
@BoredGuy1
Increased beatmatch tolerances by a bit
b4dd4b7
@BoredGuy1
Fixed minor error on comment
4347516
@BoredGuy1
Reverted beatmatch code slightly
3fa91b5
@BoredGuy1
Tested code, fixed ESLint issues
081df3b
@BoredGuy1
Fixed even more ESLint issues
b7597a9
@BoredGuy1
3rd time's the charm
dde38dc
@BoredGuy1
Increased beatmatch tolerances by a bit
e96ab3a 
Fixed minor error on comment

Reverted beatmatch code slightly

Tested code, fixed ESLint issues

Fixed even more ESLint issues

3rd time's the charm
@BoredGuy1
Merge branch 'main' of https://github.com/BoredGuy1/mixxx
4ff3a1b
@BoredGuy1
Fixed some bugs with Toneplay and edge cases with Slicer
e038ad5
@BoredGuy1
Added missing functionality to Hercules Inpulse 300 script
77d0144
@BoredGuy1
Merge branch 'inpulse' of https://github.com/BoredGuy1/mixxx into inp…
866a70b 
…ulse
@BoredGuy1
Merge branch 'inpulse' of https://github.com/BoredGuy1/mixxx into inp…
b302951 
…ulse
@ywwg ywwg merged commit 6a239a2 into mixxxdj:inpulse Dec 29, 2024
1 check passed
@ronso0
Copy link
Member

ronso0 commented Dec 29, 2024

Usually we merge only after the manual has been updated, too.
@ywwg cn you please take care? mixxxdj/manual#604
Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ywwg ywwg ywwg 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
@BoredGuy1 @ronso0 @ywwg