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

Pioneer DDJ-400: Address outstanding issues #3479

Merged
merged 88 commits into from
Jan 31, 2021
Merged

Commits on Dec 24, 2019

  1. add DDJ-400 contoller

    nschloe committed Dec 24, 2019
    Configuration menu
    Copy the full SHA
    6f4ac89 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2020

  1. Configuration menu
    Copy the full SHA
    a053a56 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2020

  1. Configuration menu
    Copy the full SHA
    80d4c1a View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2020

  1. ddj400: camel case

    nschloe committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    8e61cb4 View commit details
    Browse the repository at this point in the history
  2. ddj400: remove dead code

    nschloe committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    126da0c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    04914cd View commit details
    Browse the repository at this point in the history
  4. ddj400: fix indentation

    nschloe committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    405945c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2197bb2 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2021

  1. Configuration menu
    Copy the full SHA
    1c2d3f3 View commit details
    Browse the repository at this point in the history
  2. Pioneer DDJ-400: Auto-fix eslint issues

    Holzhaus authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    7bae0f8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9c98add View commit details
    Browse the repository at this point in the history
  4. Merge pull request mixxxdj#1 from Holzhaus/pioneer-ddj-400-2

    Pioneer DDJ-400: Merge 2.2 branch and fix some eslint issues
    nschloe authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    b7b20db View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    38b4403 View commit details
    Browse the repository at this point in the history
  6. fix startup warning

    nschloe authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    0ff8237 View commit details
    Browse the repository at this point in the history
  7. pioneer ddj-400: remove sample flickers

    nschloe authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    c969a29 View commit details
    Browse the repository at this point in the history
  8. Set highspeedScale to 20, to allow quick search through track using S…

    …HIFT+JOGWHEEL
    
    Map SHIFT+PLAY to reverseroll - Reverse playback in Slip Mode while held (Censor)
    dj3730 authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    6758d9d View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    a61bd39 View commit details
    Browse the repository at this point in the history
  10. Updates to comments

    dj3730 authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    9fc5987 View commit details
    Browse the repository at this point in the history
  11. fixes small bug spotted by @dj3730

    nschloe authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    b23190c View commit details
    Browse the repository at this point in the history
  12. correction to highspeedScale factor

    dj3730 authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    e6001ad View commit details
    Browse the repository at this point in the history
  13. ddj-400: better commenting

    nschloe authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    a44b7c6 View commit details
    Browse the repository at this point in the history
  14. fixes a problem with samplerPlayOutputCallbackFunction, for some reas…

    …on, using script.samplerRegEx here results in an error under Linux
    dj3730 authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    798694b View commit details
    Browse the repository at this point in the history
  15. DDJ-400: script control of rate sliders to correct behavior

    when mapped directly in the xml, the on-screen slider behavior is inverted from the physical slider behavior
    i.e. moving the physical slider UP results in the on-screen slider moving DOWN
    the functions PioneerDDJ400.tempoSliderMSB and PioneerDDJ400.tempoSliderLSB were adapted from the Pioneer-DDJ-SB2-script.js mapping file
    dj3730 authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    218ec25 View commit details
    Browse the repository at this point in the history
  16. Implements changes to effect unit handling as requested by @Be-ing

        * Level/Depth knob: metaknob of focused effect; if no effect is focused, controls the mix knob for effect unit 1
        * Beat `<`: focus effect 1
        * Beat `>`: focus effect 2
        * FX select button: focus effect 3
        * On/Off button: enable/disable focused effect
        * 1/2/Master switch: assign effect unit 1 to deck 1/2/master as labeled
    Unfocus by pressing the button for the focused effect again (so if effect 1 is focused, press Beat `<` to unfocus and make the knob control the mix knob of the unit).
    Removed hard-coding of handing of Effect Unit 1 and Effect Unit 2 to apply to Decks 1 and 2 respectively - now only Effect Unit 1 is controlled, and its application to decks depends on the 1/2/Master switch
    Added focus indicators to Effect Unit 1 - removed focus indicators from Effect Unit 3
    Also added controller polling to Init function
    dj3730 authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    9f81d2d View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    22d65ab View commit details
    Browse the repository at this point in the history
  18. Added support for Track Loaded animations when track is loaded to a d…

    …eck (and also at startup)
    dj3730 authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    a676bca View commit details
    Browse the repository at this point in the history
  19. DDJ-400: Extends Sampler support to 16 samplers. Blinks sampler pads …

    …when a sample is playing (even if Shift is currently pressed). Ensure that sampler pad LED remains lit when sample ends or is stopped, even when Shift is currently pressed.
    dj3730 authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    047e37f View commit details
    Browse the repository at this point in the history
  20. Merge pull request mixxxdj#3 from dj3730/ddj400

    Implements changes to effect unit handling as requested by @Be-ing
    nschloe authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    663607f View commit details
    Browse the repository at this point in the history
  21. small formatting fixes

    dj3730 authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    82420c9 View commit details
    Browse the repository at this point in the history
  22. Merge pull request mixxxdj#4 from dj3730/ddj400

    Ddj400
    nschloe authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    25b4581 View commit details
    Browse the repository at this point in the history
  23. Implement changes requested by Be-ing: Remove extraneous comments and…

    … whitespace. Replace engine.connectControl with engine.makeConnection. Removed lines which overrode user preferences for rateRange. Removed unnecessary setting of show_focus to 0. Replaced use of "const" with "var".
    dj3730 authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    33c4c38 View commit details
    Browse the repository at this point in the history
  24. formatting fixes

    dj3730 authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    cbd4609 View commit details
    Browse the repository at this point in the history
  25. Merge pull request mixxxdj#5 from dj3730/ddj400

    Set highspeedScale to 20, to allow quick search through track using S…
    nschloe authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    1fb1b1b View commit details
    Browse the repository at this point in the history
  26. Merge pull request mixxxdj#6 from dj3730/ddj400

    Ddj400
    nschloe authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    a5b5d85 View commit details
    Browse the repository at this point in the history
  27. trailing whitespace

    nschloe authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    0e6b884 View commit details
    Browse the repository at this point in the history
  28. some style fixes

    nschloe authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    55d1d7b View commit details
    Browse the repository at this point in the history
  29. more style

    nschloe authored and jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    de9364f View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    3834bff View commit details
    Browse the repository at this point in the history
  31. Replicates rekordbox's beatjump shift mode

    Pressing shift + pad 8 increases the jump on all other buttons by a factor of 16
    (up to a maximum of 128 beats backwards & forwards on buttons 7 & 8 respectively).
    
    Pressing shift + pad 7 decreases the jump on all other buttons by a factor of 16
    (down to a minimum of 1/16 beats backwards & forwards on buttons 1 & 2 respectively).
    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    23f1b5f View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    d1376a3 View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    87af195 View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    a770be6 View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    981e875 View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    039cbf7 View commit details
    Browse the repository at this point in the history
  37. Implements loop button light states

    In the same way as rekordbox, the lights are turned on at startup.
    
    They blink if a loop is active. And the light corresponding to loop in
    or out adjust blinks in isolation during loop adjust mode.
    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    38a011f View commit details
    Browse the repository at this point in the history
  38. Configuration menu
    Copy the full SHA
    aab85f5 View commit details
    Browse the repository at this point in the history
  39. Configuration menu
    Copy the full SHA
    fa5061d View commit details
    Browse the repository at this point in the history
  40. Configuration menu
    Copy the full SHA
    a6efb47 View commit details
    Browse the repository at this point in the history
  41. Configuration menu
    Copy the full SHA
    49b4735 View commit details
    Browse the repository at this point in the history
  42. Adds phrase jump forward & back

    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    7b26034 View commit details
    Browse the repository at this point in the history
  43. Refactors sampler code

    - Uses function expressions assigned to the PioneerDDJ object over function declarations
    - Improves the sampler load/eject play/cue_gotoandstop logic
    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    78d95f7 View commit details
    Browse the repository at this point in the history
  44. Configuration menu
    Copy the full SHA
    2e6de8e View commit details
    Browse the repository at this point in the history
  45. Configuration menu
    Copy the full SHA
    54353ca View commit details
    Browse the repository at this point in the history
  46. Removes stale PAD FX mappings

    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    21176bf View commit details
    Browse the repository at this point in the history
  47. Configuration menu
    Copy the full SHA
    bfb6e79 View commit details
    Browse the repository at this point in the history
  48. Configuration menu
    Copy the full SHA
    3120764 View commit details
    Browse the repository at this point in the history
  49. Configuration menu
    Copy the full SHA
    115d4dc View commit details
    Browse the repository at this point in the history
  50. Fixes code style issues

    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    e09f302 View commit details
    Browse the repository at this point in the history
  51. Configuration menu
    Copy the full SHA
    90e3d05 View commit details
    Browse the repository at this point in the history
  52. Configuration menu
    Copy the full SHA
    b421cbd View commit details
    Browse the repository at this point in the history
  53. Minor cosmetic restructuring

    Moves some code around so that the mapping read from top to bottom
    almost matches the controls mapped in sequence from left to right.
    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    310686b View commit details
    Browse the repository at this point in the history
  54. Inverts the control logic on the Level/Depth knob

    Uses the knob for wet/dry mix when an effect is enabled and for
    the effect's metaknob when the effect is disabled.
    
    Previously this was the other way around.
    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    662f034 View commit details
    Browse the repository at this point in the history
  55. Configuration menu
    Copy the full SHA
    01114ec View commit details
    Browse the repository at this point in the history
  56. Unmaps master gain knob

    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    d779baf View commit details
    Browse the repository at this point in the history
  57. Removes experimental pad modes

    - Keyboard mode
    - Pad FX1
    - Keyshift mode
    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    e6cd0f0 View commit details
    Browse the repository at this point in the history
  58. Final cosmetic restructuring

    The main script now reads top to bottom so that functions map to the
    controller in order (starting at the mixer, then moving through controls
    in the deck in a left-right, top to bottom sequence)
    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    f91bec1 View commit details
    Browse the repository at this point in the history
  59. Fixes FX channel switch

    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    d21112a View commit details
    Browse the repository at this point in the history
  60. Configuration menu
    Copy the full SHA
    d320773 View commit details
    Browse the repository at this point in the history
  61. Configuration menu
    Copy the full SHA
    bef3cb0 View commit details
    Browse the repository at this point in the history
  62. Configuration menu
    Copy the full SHA
    b68b6b9 View commit details
    Browse the repository at this point in the history
  63. Configuration menu
    Copy the full SHA
    619e523 View commit details
    Browse the repository at this point in the history
  64. Configuration menu
    Copy the full SHA
    e8b7961 View commit details
    Browse the repository at this point in the history
  65. Configuration menu
    Copy the full SHA
    752529b View commit details
    Browse the repository at this point in the history
  66. Updates xml mapping

    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    b5d5f09 View commit details
    Browse the repository at this point in the history
  67. Replaces sync_master with explicit enabling of sync_enabled (i.e., sy…

    …nc lock) on long press)
    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    c5cfb7e View commit details
    Browse the repository at this point in the history
  68. Configuration menu
    Copy the full SHA
    0c972eb View commit details
    Browse the repository at this point in the history
  69. Improves effects implementation

    - Removes getters & setters with side effects
    - Uses callbacks to keep the FX light in sync when changes
      are made through the UI
    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    632608a View commit details
    Browse the repository at this point in the history
  70. Configuration menu
    Copy the full SHA
    881a703 View commit details
    Browse the repository at this point in the history
  71. Configuration menu
    Copy the full SHA
    cc851c9 View commit details
    Browse the repository at this point in the history
  72. Prevents redundant disabling of sync lock

    Co-authored-by: Be <be.0@gmx.com>
    jusko and Be-ing committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    4a9322d View commit details
    Browse the repository at this point in the history
  73. Simplifies beatjump pad lighting

    Relies solely on <outputs> for lighting up the required pads in
    beatjump mode.
    
    This removes the need to track the controllers padmode in the script.
    
    This is desirable, because the controller tracks the padmode in its
    firmware and seems to be susceptible to benign but unexpected
    behavior when that process is interfered with (e.g., manually
    resetting the padmode lights sometimes prevents the next pad mode
    from being enabled until a sequence of other buttons are pressed).
    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    7df6b0a View commit details
    Browse the repository at this point in the history
  74. Removes unneeded shift binding

    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    e51a3b4 View commit details
    Browse the repository at this point in the history
  75. Removes unneeded output mapping

    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    cef4518 View commit details
    Browse the repository at this point in the history
  76. Cleans up unneeded comments

    jusko committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    4ed1ebf View commit details
    Browse the repository at this point in the history
  77. Configuration menu
    Copy the full SHA
    d03096d View commit details
    Browse the repository at this point in the history
  78. Configuration menu
    Copy the full SHA
    6b1f108 View commit details
    Browse the repository at this point in the history
  79. Configuration menu
    Copy the full SHA
    04028e2 View commit details
    Browse the repository at this point in the history
  80. Configuration menu
    Copy the full SHA
    f4a9283 View commit details
    Browse the repository at this point in the history