Skip to content

Commit 2dd4a75

Browse files
committed
Update RGB Color Selector to utilize new Base Station Code
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).
1 parent 415ec59 commit 2dd4a75

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

DCCpp_Controller/coreComponents.pde

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
// - clicking the button toggles the throttle between either 0 or 126 (max speed)
3131
// - the default configuration of DCC++ Controller defines an
3232
// Extras Window that includes this button
33+
//
34+
// LEDColorButton - provide for interactive control of an LED-RGB Light Strip
3335

3436
//////////////////////////////////////////////////////////////////////////
3537
// DCC Component: PowerButton
@@ -289,7 +291,7 @@ class LEDColorButton extends DccComponent{
289291
colorMode(HSB,1.0,1.0,1.0);
290292
c=color(hue,sat,val);
291293
colorMode(RGB,255);
292-
aPort.write("<S RGB "+int(red(c))+" "+int(green(c))+" "+int(blue(c))+" "+s+">");
294+
aPort.write("<G RGB "+int(red(c))+" "+int(green(c))+" "+int(blue(c))+" "+s+">");
293295
ledHueMsg.setMessage("Hue: "+int(hue*360),color(200,200,200));
294296
ledSatMsg.setMessage("Sat: "+int(sat*100),color(200,200,200));
295297
ledValMsg.setMessage("Val: "+int(val*100),color(200,200,200));

DCCpp_Controller/dccStatus.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@
5858
<throttleDefaults FULL="100" REVERSE="-50" REVERSE_SLOW="-45" SLOW="50" STOP="0"/>
5959
</Cab2904>
6060
</cabDefaults>
61-
<arduinoPort>192.168.1.169</arduinoPort>
61+
<arduinoPort>/dev/tty.usbmodem1431</arduinoPort>
6262
<serverList>192.168.1.169</serverList>
6363
</dccStatus>

0 commit comments

Comments
 (0)