Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceType.java

Former-commit-id: 27aea22da889530529b5dc24f38441950594a7e5

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')

deploy/HyperCon.jar.REMOVED.git-id

@@ -1 +1 @@
-73c0de615f1ed0905a42ceb4a21c07a845f5e806
+31c7e1854b15c73ce492d394e16ee27bb5b69c30

deploy/hyperiond.REMOVED.git-id

@@ -1 +1 @@
-632c368d0a5ce42aff067c6ba5f63dbe108dddc9
+477dd3a5e1eae900ac9e02c6bdcfef3e2c3b6ca9

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

libsrc/hyperion/Hyperion.cpp

@@ -10,7 +10,7 @@
 #include <hyperion/LedDevice.h>
 #include <hyperion/ImageProcessorFactory.h>
 
-#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();

libsrc/hyperion/device/LedDeviceLpd6803.cpp

@@ -8,7 +8,7 @@
 #include <sys/ioctl.h>
 
 // hyperion local includes
-#include "LedDeviceLdp6803.h"
+#include "LedDeviceLpd6803.h"
 
 LedDeviceLdp6803::LedDeviceLdp6803(const std::string& outputDevice, const unsigned baudrate) :
 	LedSpiDevice(outputDevice, baudrate),

libsrc/hyperion/device/LedRs232Device.cpp

@@ -48,6 +48,10 @@ int LedRs232Device::writeBytes(const unsigned size, const uint8_t * data)
 		return -1;
 	}
 
+	//for (int i = 0; i < 20; ++i)
+	//	std::cout << std::hex << (int)data[i] << " ";
+	//std::cout << std::endl;
+
 	try
 	{
 		_rs232Port.write(data, size);

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();