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

Removed Lightpack based on hidapi from build (not working)

Browse Source 
Former-commit-id: b3882807daf5993073a7af811db50fe3d0a45c28
This commit is contained in:
Johan
2013-11-25 16:55:59 +01:00
parent f892a8c09a
commit 983ce30331
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libsrc/hyperion/CMakeLists.txt
View File

@@ -4,9 +4,14 @@ SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/hyperion)
SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/hyperion) SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/hyperion)
#add libusb and pthreads (required for the Lighpack usb device) #add libusb and pthreads (required for the Lighpack usb device)
#find_package(UDev REQUIRED)
find_package(libusb-1.0 REQUIRED) find_package(libusb-1.0 REQUIRED)
find_package(Threads REQUIRED)
#find_package(UDev REQUIRED)
include_directories( include_directories(
../../include/hidapi
# ${UDEV_INCLUDE_DIR}
${LIBUSB_1_INCLUDE_DIRS}) # for Lightpack device ${LIBUSB_1_INCLUDE_DIRS}) # for Lightpack device
# Group the headers that go through the MOC compiler # Group the headers that go through the MOC compiler
@@ -37,7 +42,6 @@ SET(Hyperion_HEADERS
${CURRENT_SOURCE_DIR}/device/LedDeviceLpd8806.h ${CURRENT_SOURCE_DIR}/device/LedDeviceLpd8806.h
${CURRENT_SOURCE_DIR}/device/LedDeviceLightpack.h ${CURRENT_SOURCE_DIR}/device/LedDeviceLightpack.h
${CURRENT_SOURCE_DIR}/device/LedDeviceMultiLightpack.h ${CURRENT_SOURCE_DIR}/device/LedDeviceMultiLightpack.h
${CURRENT_SOURCE_DIR}/device/LedDeviceLightpack-hidapi.h
) )
SET(Hyperion_SOURCES SET(Hyperion_SOURCES
@@ -62,7 +66,6 @@ SET(Hyperion_SOURCES
${CURRENT_SOURCE_DIR}/device/LedDeviceAdalight.cpp ${CURRENT_SOURCE_DIR}/device/LedDeviceAdalight.cpp
${CURRENT_SOURCE_DIR}/device/LedDeviceLightpack.cpp ${CURRENT_SOURCE_DIR}/device/LedDeviceLightpack.cpp
${CURRENT_SOURCE_DIR}/device/LedDeviceMultiLightpack.cpp ${CURRENT_SOURCE_DIR}/device/LedDeviceMultiLightpack.cpp
${CURRENT_SOURCE_DIR}/device/LedDeviceLightpack-hidapi.cpp
) )
set(Hyperion_RESOURCES set(Hyperion_RESOURCES
@@ -84,6 +87,8 @@ add_library(hyperion
target_link_libraries(hyperion target_link_libraries(hyperion
hyperion-utils hyperion-utils
serialport serialport
hidapi-libusb ${LIBUSB_1_LIBRARIES} #apt-get install libusb-1.0-0-dev
${CMAKE_THREAD_LIBS_INIT}
# ${UDEV_LIBRARIES} # apt-get install libudev-dev
${QT_LIBRARIES} ${QT_LIBRARIES}
) )

10
libsrc/hyperion/Hyperion.cpp
View File

@@ -20,7 +20,6 @@
#include "device/LedDeviceWs2801.h" #include "device/LedDeviceWs2801.h"
#include "device/LedDeviceAdalight.h" #include "device/LedDeviceAdalight.h"
#include "device/LedDeviceLightpack.h" #include "device/LedDeviceLightpack.h"
#include "device/LedDeviceLightpack-hidapi.h"
#include "device/LedDeviceMultiLightpack.h" #include "device/LedDeviceMultiLightpack.h"
#include "LinearColorSmoothing.h" #include "LinearColorSmoothing.h"
@@ -95,15 +94,6 @@ LedDevice* Hyperion::createDevice(const Json::Value& deviceConfig)
device = deviceLightpack; device = deviceLightpack;
} }
else if (type == "lightpack-hidapi")
{
const std::string output = deviceConfig.get("output", "").asString();
LedDeviceLightpackHidapi* deviceLightpack = new LedDeviceLightpackHidapi();
deviceLightpack->open(output);
device = deviceLightpack;
}
else if (type == "multi-lightpack") else if (type == "multi-lightpack")
{ {
LedDeviceMultiLightpack* deviceLightpack = new LedDeviceMultiLightpack(); LedDeviceMultiLightpack* deviceLightpack = new LedDeviceMultiLightpack();