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

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

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

Former-commit-id: 27aea22da889530529b5dc24f38441950594a7e5
This commit is contained in:
T. van der Zwan 2013-11-08 15:06:19 +01:00
commit 85c8ba0100
10 changed files with 368 additions and 361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/hyperion.config.json
View File

@ -4,7 +4,7 @@
{ {
/// Device configuration contains the following fields: /// Device configuration contains the following fields:
/// * 'name' : The user friendly name of the device (only used for display purposes) /// * '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 /// * 'output' : The output specification depends on selected device
/// - 'ws2801' this is the device (eg '/dev/spidev0.0') /// - 'ws2801' this is the device (eg '/dev/spidev0.0')
/// - 'test' this is the file used to write test output (eg '/home/pi/hyperion.out') /// - 'test' this is the file used to write test output (eg '/home/pi/hyperion.out')

707
dependencies/build/serial/src/impl/unix.cc vendored
View File

File diff suppressed because it is too large Load Diff

2
deploy/HyperCon.jar.REMOVED.git-id
View File

@ -1 +1 @@
73c0de615f1ed0905a42ceb4a21c07a845f5e806 31c7e1854b15c73ce492d394e16ee27bb5b69c30

2
deploy/hyperiond.REMOVED.git-id
View File

@ -1 +1 @@
632c368d0a5ce42aff067c6ba5f63dbe108dddc9 477dd3a5e1eae900ac9e02c6bdcfef3e2c3b6ca9

4
libsrc/hyperion/CMakeLists.txt
View File

@ -26,7 +26,7 @@ SET(Hyperion_HEADERS
${CURRENT_SOURCE_DIR}/device/LedDeviceTest.h ${CURRENT_SOURCE_DIR}/device/LedDeviceTest.h
${CURRENT_SOURCE_DIR}/device/LedDeviceSedu.h ${CURRENT_SOURCE_DIR}/device/LedDeviceSedu.h
${CURRENT_SOURCE_DIR}/device/LedDeviceWs2801.h ${CURRENT_SOURCE_DIR}/device/LedDeviceWs2801.h
${CURRENT_SOURCE_DIR}/device/LedDeviceLdp6803.h ${CURRENT_SOURCE_DIR}/device/LedDeviceLpd6803.h
) )
SET(Hyperion_SOURCES SET(Hyperion_SOURCES
@ -46,7 +46,7 @@ SET(Hyperion_SOURCES
${CURRENT_SOURCE_DIR}/device/LedDeviceSedu.cpp ${CURRENT_SOURCE_DIR}/device/LedDeviceSedu.cpp
${CURRENT_SOURCE_DIR}/device/LedDeviceTest.cpp ${CURRENT_SOURCE_DIR}/device/LedDeviceTest.cpp
${CURRENT_SOURCE_DIR}/device/LedDeviceWs2801.cpp ${CURRENT_SOURCE_DIR}/device/LedDeviceWs2801.cpp
${CURRENT_SOURCE_DIR}/device/LedDeviceLdp6803.cpp ${CURRENT_SOURCE_DIR}/device/LedDeviceLpd6803.cpp
) )
set(Hyperion_RESOURCES set(Hyperion_RESOURCES

4
libsrc/hyperion/Hyperion.cpp
View File

@ -10,7 +10,7 @@
#include <hyperion/LedDevice.h> #include <hyperion/LedDevice.h>
#include <hyperion/ImageProcessorFactory.h> #include <hyperion/ImageProcessorFactory.h>
#include "device/LedDeviceLdp6803.h" #include "device/LedDeviceLpd6803.h"
#include "device/LedDeviceSedu.h" #include "device/LedDeviceSedu.h"
#include "device/LedDeviceTest.h" #include "device/LedDeviceTest.h"
#include "device/LedDeviceWs2801.h" #include "device/LedDeviceWs2801.h"
@ -38,7 +38,7 @@ LedDevice* Hyperion::createDevice(const Json::Value& deviceConfig)
device = deviceWs2801; device = deviceWs2801;
} }
else if (type == "ldp6803") else if (type == "lpd6803" || type == "ldp6803")
{ {
const std::string output = deviceConfig["output"].asString(); const std::string output = deviceConfig["output"].asString();
const unsigned rate = deviceConfig["rate"].asInt(); const unsigned rate = deviceConfig["rate"].asInt();

2
libsrc/hyperion/device/LedDeviceLdp6803.cpp → libsrc/hyperion/device/LedDeviceLpd6803.cpp
View File

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

0
libsrc/hyperion/device/LedDeviceLdp6803.h → libsrc/hyperion/device/LedDeviceLpd6803.h
View File

4
libsrc/hyperion/device/LedRs232Device.cpp
View File

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

2
src/config-tool/ConfigTool/src/org/hyperion/hypercon/test/TesConfigWriter.java
View File

@ -22,7 +22,7 @@ public class TesConfigWriter {
deviceConfig.mColorByteOrder = ColorByteOrder.BGR; deviceConfig.mColorByteOrder = ColorByteOrder.BGR;
deviceConfig.mName = "DAG"; deviceConfig.mName = "DAG";
deviceConfig.mOutput = "/dev/null"; deviceConfig.mOutput = "/dev/null";
deviceConfig.mType = DeviceType.ldp6803; deviceConfig.mType = DeviceType.lpd6803;
ConfigurationFile configFile = new ConfigurationFile(); ConfigurationFile configFile = new ConfigurationFile();