From fb23befdeead8d3cab503e28cb63a81d4035e1b5 Mon Sep 17 00:00:00 2001 From: "T. van der Zwan" Date: Sat, 2 Nov 2013 16:06:54 +0100 Subject: [PATCH] Added the ldp6803 led device to HyperCon Former-commit-id: 899bc2f50974ed22948a515f2839a6c14570d74d --- deploy/HyperCon.jar.REMOVED.git-id | 2 +- .../src/org/hyperion/hypercon/spec/DeviceConfig.java | 2 +- .../ConfigTool/src/org/hyperion/hypercon/spec/DeviceType.java | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/deploy/HyperCon.jar.REMOVED.git-id b/deploy/HyperCon.jar.REMOVED.git-id index 0e21a5ef..d20b95cb 100644 --- a/deploy/HyperCon.jar.REMOVED.git-id +++ b/deploy/HyperCon.jar.REMOVED.git-id @@ -1 +1 @@ -35cdefd478667e83a1e20cda67cef4763b59ec25 \ No newline at end of file +6f2aab422e3d1b03080de92c3e3aea9b270a3e9b \ No newline at end of file diff --git a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceConfig.java b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceConfig.java index 9ef573a7..9c693328 100644 --- a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceConfig.java +++ b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceConfig.java @@ -26,7 +26,7 @@ public class DeviceConfig { strBuf.append("\t/// Device configuration contains the following fields: \n"); strBuf.append("\t/// * 'name' : The user friendly name of the device (only used for display purposes)\n"); - strBuf.append("\t/// * 'type' : The type of the device or leds (known types for now are 'ws2801', 'test' and 'none')\n"); + strBuf.append("\t/// * 'type' : The type of the device or leds (known types for now are 'ws2801', 'ldp6803', 'test' and 'none')\n"); strBuf.append("\t/// * 'output' : The output specification depends on selected device\n"); 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"); diff --git a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceType.java b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceType.java index 4d2f1819..809bb18d 100644 --- a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceType.java +++ b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceType.java @@ -4,8 +4,10 @@ package org.hyperion.hypercon.spec; * Enumeration of known device types */ public enum DeviceType { - /** WS2801 Led String device with one continuous shift-register */ + /** WS2801 Led String device with one continuous shift-register (1 byte per color-channel) */ ws2801("WS2801"), + /** LDP6803 Led String device with one continuous shift-register (5 bits per color channel)*/ + ldp6803("LDP6803"), /** Test device for writing color values to file-output */ test("Test"), /** No device, no output is generated */