From 58b8bbe8ccc8121d642ff3191f2429f32ee519b3 Mon Sep 17 00:00:00 2001 From: johan Date: Tue, 5 Nov 2013 21:11:31 +0100 Subject: [PATCH] rename of lpd6803 device to fix typo Former-commit-id: 4c2b92f51d1903122211e3e91ce876697ea57526 --- config/hyperion.config.json | 2 +- deploy/HyperCon.jar.REMOVED.git-id | 2 +- libsrc/hyperion/CMakeLists.txt | 4 ++-- libsrc/hyperion/Hyperion.cpp | 4 ++-- .../device/{LedDeviceLdp6803.cpp => LedDeviceLpd6803.cpp} | 2 +- .../device/{LedDeviceLdp6803.h => LedDeviceLpd6803.h} | 0 .../ConfigTool/src/org/hyperion/hypercon/spec/DeviceType.java | 2 +- .../src/org/hyperion/hypercon/test/TesConfigWriter.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) rename libsrc/hyperion/device/{LedDeviceLdp6803.cpp => LedDeviceLpd6803.cpp} (93%) rename libsrc/hyperion/device/{LedDeviceLdp6803.h => LedDeviceLpd6803.h} (100%) diff --git a/config/hyperion.config.json b/config/hyperion.config.json index 9f933ecb..601ad3e6 100644 --- a/config/hyperion.config.json +++ b/config/hyperion.config.json @@ -4,7 +4,7 @@ { /// Device configuration contains the following fields: /// * 'name' : The user friendly name of the device (only used for display purposes) - /// * 'type' : The type of the device or leds (known types for now are 'ws2801', 'ldp6803', 'test' and 'none') + /// * 'type' : The type of the device or leds (known types for now are 'ws2801', 'lpd6803', 'test' and 'none') /// * 'output' : The output specification depends on selected device /// - 'ws2801' this is the device (eg '/dev/spidev0.0') /// - 'test' this is the file used to write test output (eg '/home/pi/hyperion.out') diff --git a/deploy/HyperCon.jar.REMOVED.git-id b/deploy/HyperCon.jar.REMOVED.git-id index 2e624926..92a51b5b 100644 --- a/deploy/HyperCon.jar.REMOVED.git-id +++ b/deploy/HyperCon.jar.REMOVED.git-id @@ -1 +1 @@ -73c0de615f1ed0905a42ceb4a21c07a845f5e806 \ No newline at end of file +31c7e1854b15c73ce492d394e16ee27bb5b69c30 \ No newline at end of file diff --git a/libsrc/hyperion/CMakeLists.txt b/libsrc/hyperion/CMakeLists.txt index 60e71032..6b1b424e 100644 --- a/libsrc/hyperion/CMakeLists.txt +++ b/libsrc/hyperion/CMakeLists.txt @@ -26,7 +26,7 @@ SET(Hyperion_HEADERS ${CURRENT_SOURCE_DIR}/device/LedDeviceTest.h ${CURRENT_SOURCE_DIR}/device/LedDeviceSedu.h ${CURRENT_SOURCE_DIR}/device/LedDeviceWs2801.h - ${CURRENT_SOURCE_DIR}/device/LedDeviceLdp6803.h + ${CURRENT_SOURCE_DIR}/device/LedDeviceLpd6803.h ) SET(Hyperion_SOURCES @@ -46,7 +46,7 @@ SET(Hyperion_SOURCES ${CURRENT_SOURCE_DIR}/device/LedDeviceSedu.cpp ${CURRENT_SOURCE_DIR}/device/LedDeviceTest.cpp ${CURRENT_SOURCE_DIR}/device/LedDeviceWs2801.cpp - ${CURRENT_SOURCE_DIR}/device/LedDeviceLdp6803.cpp + ${CURRENT_SOURCE_DIR}/device/LedDeviceLpd6803.cpp ) set(Hyperion_RESOURCES diff --git a/libsrc/hyperion/Hyperion.cpp b/libsrc/hyperion/Hyperion.cpp index 5a257a88..bd906d2d 100644 --- a/libsrc/hyperion/Hyperion.cpp +++ b/libsrc/hyperion/Hyperion.cpp @@ -10,7 +10,7 @@ #include #include -#include "device/LedDeviceLdp6803.h" +#include "device/LedDeviceLpd6803.h" #include "device/LedDeviceSedu.h" #include "device/LedDeviceTest.h" #include "device/LedDeviceWs2801.h" @@ -38,7 +38,7 @@ LedDevice* Hyperion::createDevice(const Json::Value& deviceConfig) device = deviceWs2801; } - else if (type == "ldp6803") + else if (type == "lpd6803" || type == "ldp6803") { const std::string output = deviceConfig["output"].asString(); const unsigned rate = deviceConfig["rate"].asInt(); diff --git a/libsrc/hyperion/device/LedDeviceLdp6803.cpp b/libsrc/hyperion/device/LedDeviceLpd6803.cpp similarity index 93% rename from libsrc/hyperion/device/LedDeviceLdp6803.cpp rename to libsrc/hyperion/device/LedDeviceLpd6803.cpp index 11c6a246..385c7c34 100644 --- a/libsrc/hyperion/device/LedDeviceLdp6803.cpp +++ b/libsrc/hyperion/device/LedDeviceLpd6803.cpp @@ -8,7 +8,7 @@ #include // hyperion local includes -#include "LedDeviceLdp6803.h" +#include "LedDeviceLpd6803.h" LedDeviceLdp6803::LedDeviceLdp6803(const std::string& outputDevice, const unsigned baudrate) : LedSpiDevice(outputDevice, baudrate), diff --git a/libsrc/hyperion/device/LedDeviceLdp6803.h b/libsrc/hyperion/device/LedDeviceLpd6803.h similarity index 100% rename from libsrc/hyperion/device/LedDeviceLdp6803.h rename to libsrc/hyperion/device/LedDeviceLpd6803.h 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 809bb18d..15440adc 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 @@ -7,7 +7,7 @@ public enum DeviceType { /** 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"), + lpd6803("LPD6803"), /** Test device for writing color values to file-output */ test("Test"), /** No device, no output is generated */ diff --git a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/test/TesConfigWriter.java b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/test/TesConfigWriter.java index 11a842ff..accdb499 100644 --- a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/test/TesConfigWriter.java +++ b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/test/TesConfigWriter.java @@ -22,7 +22,7 @@ public class TesConfigWriter { deviceConfig.mColorByteOrder = ColorByteOrder.BGR; deviceConfig.mName = "DAG"; deviceConfig.mOutput = "/dev/null"; - deviceConfig.mType = DeviceType.ldp6803; + deviceConfig.mType = DeviceType.lpd6803; ConfigurationFile configFile = new ConfigurationFile();