From c327f78d30101cd8dd2da1272737d6aa70ddb510 Mon Sep 17 00:00:00 2001 From: johan Date: Wed, 13 Nov 2013 23:33:17 +0100 Subject: [PATCH] new devices added to HyperCon Former-commit-id: 51f564f6375d377144787675cfd33c511a363a80 --- .../src/org/hyperion/hypercon/spec/DeviceConfig.java | 6 +++--- .../src/org/hyperion/hypercon/spec/DeviceType.java | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) 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 6f3ed4ce..7be938f7 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,10 +26,10 @@ 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', 'lpd6803', 'sedu',\n"); - strBuf.append("\t/// 'adalight', 'test' and 'none')\n"); + strBuf.append("\t/// * 'type' : The type of the device or leds (known types for now are 'ws2801', 'ldp8806',\n"); + strBuf.append("\t/// 'lpd6803', 'sedu', 'adalight', 'lightpack', 'test' and 'none')\n"); strBuf.append("\t/// * 'output' : The output specification depends on selected device. This can for example be the\n"); - strBuf.append("\t/// device specifier or the output file name\n"); + strBuf.append("\t/// device specifier, device serial number, or the output file name\n"); strBuf.append("\t/// * 'rate' : The baudrate of the output to the device\n"); strBuf.append("\t/// * 'colorOrder' : The order of the color bytes ('rgb', 'rbg', 'bgr', etc.).\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 9d9fe70d..674c883c 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 @@ -6,12 +6,16 @@ package org.hyperion.hypercon.spec; public enum DeviceType { /** WS2801 Led String device with one continuous shift-register (1 byte per color-channel) */ ws2801("WS2801"), + /** LDP8806 Led String device with one continuous shift-register (1 + 7 bits per color channel)*/ + lpd8806("LPD8806"), /** LDP6803 Led String device with one continuous shift-register (5 bits per color channel)*/ lpd6803("LPD6803"), /** SEDU LED device */ sedu("SEDU"), /** Adalight device */ adalight("Adalight"), + /** Lightpack USB led device */ + lightpack("Lightpack"), /** Test device for writing color values to file-output */ test("Test"), /** No device, no output is generated */