Skip to content

Commit

Permalink
Update RGB Color Selector to utilize new Base Station Code
Browse files Browse the repository at this point in the history
Switched <S> command which originally was used to select RGB Color to
<G> command which is new method (since <S> is now used for
creating/editing sensors).
  • Loading branch information
DccPlusPlus committed Dec 21, 2015
1 parent 415ec59 commit 2dd4a75
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion DCCpp_Controller/coreComponents.pde
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
// - clicking the button toggles the throttle between either 0 or 126 (max speed)
// - the default configuration of DCC++ Controller defines an
// Extras Window that includes this button
//
// LEDColorButton - provide for interactive control of an LED-RGB Light Strip

//////////////////////////////////////////////////////////////////////////
// DCC Component: PowerButton
Expand Down Expand Up @@ -289,7 +291,7 @@ class LEDColorButton extends DccComponent{
colorMode(HSB,1.0,1.0,1.0);
c=color(hue,sat,val);
colorMode(RGB,255);
aPort.write("<S RGB "+int(red(c))+" "+int(green(c))+" "+int(blue(c))+" "+s+">");
aPort.write("<G RGB "+int(red(c))+" "+int(green(c))+" "+int(blue(c))+" "+s+">");
ledHueMsg.setMessage("Hue: "+int(hue*360),color(200,200,200));
ledSatMsg.setMessage("Sat: "+int(sat*100),color(200,200,200));
ledValMsg.setMessage("Val: "+int(val*100),color(200,200,200));
Expand Down
2 changes: 1 addition & 1 deletion DCCpp_Controller/dccStatus.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@
<throttleDefaults FULL="100" REVERSE="-50" REVERSE_SLOW="-45" SLOW="50" STOP="0"/>
</Cab2904>
</cabDefaults>
<arduinoPort>192.168.1.169</arduinoPort>
<arduinoPort>/dev/tty.usbmodem1431</arduinoPort>
<serverList>192.168.1.169</serverList>
</dccStatus>

0 comments on commit 2dd4a75

Please sign in to comment.