Code

Dmxkeypad#280

Code

Open

kripton wants to merge 27 commits intomcallegari:mastermcallegari/qlcplus:masterfrom kripton:dmxkeypadkripton/qlcplus:dmxkeypadCopy head branch name to clipboard

+578-2

Commits

Commits on Apr 11, 2014

• Add DMX KeyPad with UI to SimpleDesk

  kripton

  committed
  b34c025

  Copy full SHA for b34c025

Commits on Apr 12, 2014

• Merge branch 'master' of git://github.com/mcallegari/qlcplus into dmxkeypad

  kripton

  committed
  ff642c8

  Copy full SHA for ff642c8

• Make DMXKeyPad work

  kripton

  committed
  d75ec31

  Copy full SHA for d75ec31

• Make CLR work

  kripton

  committed
  ae35185

  Copy full SHA for ae35185

Commits on Apr 13, 2014

• First work on "BY" button

  kripton

  committed
  cdee8dc

  Copy full SHA for cdee8dc

• WiP: StateMachine refactoring

  kripton

  committed
  bedd188

  Copy full SHA for bedd188

Commits on Apr 14, 2014

• Merge branch 'master' into dmxkeypad

  kripton

  committed
  3f71ee8

  Copy full SHA for 3f71ee8

• Finish StateMachine refactoring

  kripton

  committed
  82d22e7

  Copy full SHA for 82d22e7

• Amazing speed-up if we don't update the sliders after every channel change but only once after the range

  kripton

  committed
  ccf8a67

  Copy full SHA for ccf8a67

• Make StepSize ("BY") work

  kripton

  committed
  9d6d611

  Copy full SHA for 9d6d611

Commits on Apr 17, 2014

• WiP: Add channel(s) to range

  kripton

  committed
  77a7955

  Copy full SHA for 77a7955

• Merge branch 'master' into dmxkeypad

  kripton

  committed
  958f287

  Copy full SHA for 958f287

Commits on Apr 18, 2014

• Merge branch 'master' into dmxkeypad

  kripton

  committed
  75bc6aa

  Copy full SHA for 75bc6aa

Commits on Apr 20, 2014

• Merge branch 'master' into dmxkeypad

  kripton

  committed
  11ddfae

  Copy full SHA for 11ddfae

• Add more debugging output, fix PLUS function, implement MINUS (subtract range) function (not all cases covered yet)

  kripton

  committed
  b0ce839

  Copy full SHA for b0ce839

• Add "FAN function" (value range)

  kripton

  committed
  981115a

  Copy full SHA for 981115a

• Fix for non-faned values

  kripton

  committed
  292cfc7

  Copy full SHA for 292cfc7

• Disable buttons for not-yet-implemented functions/combinations

  kripton

  committed
  4164560

  Copy full SHA for 4164560

Commits on Apr 22, 2014

• Merge branch 'master' into dmxkeypad

  kripton

  committed
  16d65f5

  Copy full SHA for 16d65f5

• very minor comment fixes

  kripton

  committed
  335177c

  Copy full SHA for 335177c

• Merge branch 'master' into dmxkeypad

  kripton

  committed
  2bdfe2f

  Copy full SHA for 2bdfe2f

Commits on Apr 23, 2014

• Merge branch 'master' into dmxkeypad

  kripton

  committed
  11eebff

  Copy full SHA for 11eebff

Commits on Apr 25, 2014

• Merge branch 'master' into dmxkeypad

  kripton

  committed
  b21c2d5

  Copy full SHA for b21c2d5

• Merge branch 'master' into dmxkeypad

  kripton

  committed
  9d5c358

  Copy full SHA for 9d5c358

Commits on Aug 29, 2014

• Merge branch 'master' into dmxkeypad

  kripton

  committed
  c4ef52d

  Copy full SHA for c4ef52d

Commits on Mar 11, 2015

• Merge remote-tracking branch 'upstream/master' into dmxkeypad

  kripton

  committed
  22342ad

  Copy full SHA for 22342ad

Commits on Jul 11, 2015

• Merge remote-tracking branch 'upstream/master' into dmxkeypad

  kripton

  committed
  ba21918

  Copy full SHA for ba21918