frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added the option to specify the color byte order

Browse Source 
Former-commit-id: f911d0f26c25345bbe5e9014fbc31568b7386f08
This commit is contained in:
johan
2013-11-04 20:52:57 +01:00
parent 8d8c4bdfad
commit fc1e4bc6c8
9 changed files with 98 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/ColorByteOrder.java Normal file
View File

@@ -0,0 +1,5 @@
package org.hyperion.hypercon.spec;
public enum ColorByteOrder {
RGB, RBG, BRG, BGR, GRB, GBR
}

8
src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceConfig.java
View File

@@ -15,8 +15,8 @@ public class DeviceConfig extends Observable {
public String mOutput = "/dev/spidev0.0";
/** The baudrate of the device */
public int mBaudrate = 1000000;
/** Flag indicating if the red and blue should be reversed */
public boolean mBgrOutput = false;
/** The order of the color bytes */
public ColorByteOrder mColorByteOrder = ColorByteOrder.RGB;
/**
* Creates the JSON string of the configuration as used in the Hyperion daemon configfile
@@ -33,7 +33,7 @@ public class DeviceConfig extends Observable {
strBuf.append("\t/// - 'ws2801' this is the device (eg '/dev/spidev0.0')\n");
strBuf.append("\t/// - 'test' this is the file used to write test output (eg '/home/pi/hyperion.out')\n");
strBuf.append("\t/// * 'rate' : The baudrate of the output to the device (only applicable for 'ws2801')\n");
strBuf.append("\t/// * 'bgr-output' : Use BGR output instead of RGB (reverse red and blue).\n");
strBuf.append("\t/// * 'colorOrder' : The order of the color bytes ('rgb', 'rbg', 'bgr', etc.).\n");
strBuf.append("\t\"device\" :\n");
strBuf.append("\t{\n");
@@ -42,7 +42,7 @@ public class DeviceConfig extends Observable {
strBuf.append("\t\t\"type\" : \"").append(mType.name()).append("\",\n");
strBuf.append("\t\t\"output\" : \"").append(mOutput).append("\",\n");
strBuf.append("\t\t\"rate\" : ").append(mBaudrate).append(",\n");
strBuf.append("\t\t\"bgr-output\" : ").append(mBgrOutput).append("\n");
strBuf.append("\t\t\"colorOrder\" : ").append(mColorByteOrder.name().toLowerCase()).append("\n");
strBuf.append("\t}");