mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
a960894d14
* Removed -HUP so the default -TERM signal is sent instead.
- hyperiond only listens for TERM and INT. HUP is often used to get an exe to reread its config
Changed pgrep to add '-x' so it wont partial match on the exe name.
- I have multiple instances with multiple hyperiond-instance1 names
- this ensures the service script only kills the right process
* reversing errant change to hyperion.systemd.sh
* This add a new device type - ws2812spi.
I've (ab)used the SPI interface to send the correct timing pulses to keep the ws2812 happy.
THE RATE IS IMPORTANT!
A FIXED CORE_CLK IS IMPORTANT!
Attach the SPI MOSI pin on the Pi to the DIN pin on your ws2812
"device" :
{
"name" : "MyPi",
"type" : "ws2812spi",
"colorOrder" : "grb",
"output" : "/dev/spidev0.0",
"rate" : 3800000
},
* updated hyperiond.test-binary
* Updated default SPI speed to the "correct" value.
My Pi was undervolted so was dropping the core clock confusing everything
* Code cleanups
explicitly set the final 3 bytes to 0
* Removed latchtime option - not applicable
* updated test binary
Former-commit-id: d3c19c8374999f7a554bb25ca181a8a483f86289
166 lines
4.8 KiB
CMake
Executable File
166 lines
4.8 KiB
CMake
Executable File
|
|
# Define the current source locations
|
|
SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/leddevice)
|
|
SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/leddevice)
|
|
|
|
#add libusb and pthreads (required for the Lighpack usb device)
|
|
find_package(libusb-1.0 REQUIRED)
|
|
find_package(Threads REQUIRED)
|
|
|
|
include_directories(
|
|
../../include/hidapi
|
|
${LIBUSB_1_INCLUDE_DIRS}) # for Lightpack device
|
|
|
|
# Group the headers that go through the MOC compiler
|
|
SET(Leddevice_QT_HEADERS
|
|
${CURRENT_SOURCE_DIR}/LedRs232Device.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceAdalight.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceAdalightApa102.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceAmbiLed.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceAtmoOrb.h
|
|
${CURRENT_SOURCE_DIR}/LedDevicePhilipsHue.h
|
|
${CURRENT_SOURCE_DIR}/LedHIDDevice.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceRawHID.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceFile.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceFadeCandy.h
|
|
)
|
|
|
|
SET(Leddevice_HEADERS
|
|
${CURRENT_HEADER_DIR}/LedDevice.h
|
|
${CURRENT_HEADER_DIR}/LedDeviceFactory.h
|
|
|
|
${CURRENT_SOURCE_DIR}/LedDeviceLightpack.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceMultiLightpack.h
|
|
${CURRENT_SOURCE_DIR}/LedDevicePaintpack.h
|
|
${CURRENT_SOURCE_DIR}/LedDevicePiBlaster.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceSedu.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceFile.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceFadeCandy.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceUdp.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceHyperionUsbasp.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceTpm2.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceAtmo.h
|
|
)
|
|
|
|
SET(Leddevice_SOURCES
|
|
${CURRENT_SOURCE_DIR}/LedDeviceFactory.cpp
|
|
|
|
${CURRENT_SOURCE_DIR}/LedRs232Device.cpp
|
|
${CURRENT_SOURCE_DIR}/LedHIDDevice.cpp
|
|
|
|
${CURRENT_SOURCE_DIR}/LedDeviceAdalight.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceAdalightApa102.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceAmbiLed.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceAtmoOrb.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceRawHID.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceLightpack.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceMultiLightpack.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDevicePaintpack.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDevicePiBlaster.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceSedu.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceFile.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceFadeCandy.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceUdp.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceHyperionUsbasp.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDevicePhilipsHue.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceTpm2.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceAtmo.cpp
|
|
)
|
|
|
|
if(ENABLE_SPIDEV)
|
|
SET(Leddevice_HEADERS
|
|
${Leddevice_HEADERS}
|
|
${CURRENT_SOURCE_DIR}/LedSpiDevice.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceLpd6803.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceLpd8806.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceP9813.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceWs2801.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceWs2812SPI.h
|
|
${CURRENT_SOURCE_DIR}/LedDeviceAPA102.h
|
|
)
|
|
SET(Leddevice_SOURCES
|
|
${Leddevice_SOURCES}
|
|
${CURRENT_SOURCE_DIR}/LedSpiDevice.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceLpd6803.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceLpd8806.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceP9813.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceWs2801.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceWs2812SPI.cpp
|
|
${CURRENT_SOURCE_DIR}/LedDeviceAPA102.cpp
|
|
)
|
|
endif(ENABLE_SPIDEV)
|
|
|
|
if(ENABLE_WS2812BPWM)
|
|
SET(Leddevice_HEADERS
|
|
${Leddevice_HEADERS}
|
|
${CURRENT_SOURCE_DIR}/LedDeviceWS2812b.h
|
|
)
|
|
SET(Leddevice_SOURCES
|
|
${Leddevice_SOURCES}
|
|
${CURRENT_SOURCE_DIR}/LedDeviceWS2812b.cpp
|
|
)
|
|
endif(ENABLE_WS2812BPWM)
|
|
|
|
if(ENABLE_WS281XPWM)
|
|
include_directories(../../dependencies/external/rpi_ws281x)
|
|
SET(Leddevice_HEADERS
|
|
${Leddevice_HEADERS}
|
|
${CURRENT_SOURCE_DIR}/LedDeviceWS281x.h
|
|
)
|
|
SET(Leddevice_SOURCES
|
|
${Leddevice_SOURCES}
|
|
${CURRENT_SOURCE_DIR}/LedDeviceWS281x.cpp
|
|
)
|
|
endif(ENABLE_WS281XPWM)
|
|
|
|
if(ENABLE_TINKERFORGE)
|
|
SET(Leddevice_HEADERS
|
|
${Leddevice_HEADERS}
|
|
${CURRENT_SOURCE_DIR}/LedDeviceTinkerforge.h
|
|
)
|
|
SET(Leddevice_SOURCES
|
|
${Leddevice_SOURCES}
|
|
${CURRENT_SOURCE_DIR}/LedDeviceTinkerforge.cpp
|
|
)
|
|
endif(ENABLE_TINKERFORGE)
|
|
|
|
if(ENABLE_QT5)
|
|
QT5_WRAP_CPP(Leddevice_HEADERS_MOC ${Leddevice_QT_HEADERS})
|
|
else(ENABLE_QT5)
|
|
QT4_WRAP_CPP(Leddevice_HEADERS_MOC ${Leddevice_QT_HEADERS})
|
|
endif(ENABLE_QT5)
|
|
|
|
|
|
add_library(leddevice
|
|
${Leddevice_HEADERS}
|
|
${Leddevice_QT_HEADERS}
|
|
${Leddevice_HEADERS_MOC}
|
|
${Leddevice_SOURCES}
|
|
)
|
|
|
|
if(ENABLE_QT5)
|
|
qt5_use_modules(leddevice Widgets Network)
|
|
endif(ENABLE_QT5)
|
|
|
|
target_link_libraries(leddevice
|
|
hyperion-utils
|
|
serialport
|
|
${LIBUSB_1_LIBRARIES} #apt-get install libusb-1.0-0-dev
|
|
${CMAKE_THREAD_LIBS_INIT}
|
|
${QT_LIBRARIES}
|
|
)
|
|
|
|
if(ENABLE_TINKERFORGE)
|
|
target_link_libraries(leddevice tinkerforge)
|
|
endif()
|
|
|
|
if(ENABLE_WS281XPWM)
|
|
target_link_libraries(leddevice ws281x)
|
|
endif()
|
|
|
|
if(APPLE)
|
|
target_link_libraries(leddevice hidapi-mac)
|
|
else()
|
|
target_link_libraries(leddevice hidapi-libusb)
|
|
endif()
|