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

Dmxkeypad #280

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open

Dmxkeypad #280

wants to merge 27 commits into from

Commits on Apr 11, 2014

  1. Add DMX KeyPad with UI to SimpleDesk

    @kripton
    kripton committed Apr 11, 2014
    Configuration menu
    Copy the full SHA
    b34c025 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2014

  1. Merge branch 'master' of git://github.com/mcallegari/qlcplus into dmx… 

    …keypad
    @kripton
    kripton committed Apr 12, 2014
    Configuration menu
    Copy the full SHA
    ff642c8 View commit details
    Browse the repository at this point in the history

  2. Make DMXKeyPad work

    @kripton
    kripton committed Apr 12, 2014
    Configuration menu
    Copy the full SHA
    d75ec31 View commit details
    Browse the repository at this point in the history

  3. Make CLR work

    @kripton
    kripton committed Apr 12, 2014
    Configuration menu
    Copy the full SHA
    ae35185 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2014

  1. First work on "BY" button

    @kripton
    kripton committed Apr 13, 2014
    Configuration menu
    Copy the full SHA
    cdee8dc View commit details
    Browse the repository at this point in the history

  2. WiP: StateMachine refactoring

    @kripton
    kripton committed Apr 13, 2014
    Configuration menu
    Copy the full SHA
    bedd188 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2014

  1. Merge branch 'master' into dmxkeypad

    @kripton
    kripton committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    3f71ee8 View commit details
    Browse the repository at this point in the history

  2. Finish StateMachine refactoring

    @kripton
    kripton committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    82d22e7 View commit details
    Browse the repository at this point in the history

  3. Amazing speed-up if we don't update the sliders after every channel c… 

    …hange but only once after the range
    @kripton
    kripton committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    ccf8a67 View commit details
    Browse the repository at this point in the history

  4. Make StepSize ("BY") work

    @kripton
    kripton committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    9d6d611 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2014

  1. WiP: Add channel(s) to range

    @kripton
    kripton committed Apr 17, 2014
    Configuration menu
    Copy the full SHA
    77a7955 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into dmxkeypad

    @kripton
    kripton committed Apr 17, 2014
    Configuration menu
    Copy the full SHA
    958f287 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2014

  1. Merge branch 'master' into dmxkeypad

    @kripton
    kripton committed Apr 18, 2014
    Configuration menu
    Copy the full SHA
    75bc6aa View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2014

  1. Merge branch 'master' into dmxkeypad

    @kripton
    kripton committed Apr 20, 2014
    Configuration menu
    Copy the full SHA
    11ddfae View commit details
    Browse the repository at this point in the history

  2. Add more debugging output, fix PLUS function, implement MINUS (subtra… 

    …ct range) function (not all cases covered yet)
    @kripton
    kripton committed Apr 20, 2014
    Configuration menu
    Copy the full SHA
    b0ce839 View commit details
    Browse the repository at this point in the history

  3. Add "FAN function" (value range)

    @kripton
    kripton committed Apr 20, 2014
    Configuration menu
    Copy the full SHA
    981115a View commit details
    Browse the repository at this point in the history

  4. Fix for non-faned values

    @kripton
    kripton committed Apr 20, 2014
    Configuration menu
    Copy the full SHA
    292cfc7 View commit details
    Browse the repository at this point in the history

  5. Disable buttons for not-yet-implemented functions/combinations

    @kripton
    kripton committed Apr 20, 2014
    Configuration menu
    Copy the full SHA
    4164560 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2014

  1. Merge branch 'master' into dmxkeypad

    @kripton
    kripton committed Apr 22, 2014
    Configuration menu
    Copy the full SHA
    16d65f5 View commit details
    Browse the repository at this point in the history

  2. very minor comment fixes

    @kripton
    kripton committed Apr 22, 2014
    Configuration menu
    Copy the full SHA
    335177c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into dmxkeypad

    @kripton
    kripton committed Apr 22, 2014
    Configuration menu
    Copy the full SHA
    2bdfe2f View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2014

  1. Merge branch 'master' into dmxkeypad

    @kripton
    kripton committed Apr 23, 2014
    Configuration menu
    Copy the full SHA
    11eebff View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2014

  1. Merge branch 'master' into dmxkeypad

    @kripton
    kripton committed Apr 25, 2014
    Configuration menu
    Copy the full SHA
    b21c2d5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into dmxkeypad

    @kripton
    kripton committed Apr 25, 2014
    Configuration menu
    Copy the full SHA
    9d5c358 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2014

  1. Merge branch 'master' into dmxkeypad

    @kripton
    kripton committed Aug 29, 2014
    Configuration menu
    Copy the full SHA
    c4ef52d View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2015

  1. Merge remote-tracking branch 'upstream/master' into dmxkeypad

    @kripton
    kripton committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    22342ad View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2015

  1. Merge remote-tracking branch 'upstream/master' into dmxkeypad

    @kripton
    kripton committed Jul 11, 2015
    Configuration menu
    Copy the full SHA
    ba21918 View commit details
    Browse the repository at this point in the history