mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
259becea04
* whitespaces + typo fixes * JS / LGTM fixes * SSDP Handler crash fix * MessageForwarder handlePriorityChanges Slave fixes * use aboutToQuit Signal * complete rewriten Hue Entertainment API structure combined Philips Hue and Entertainment API with new MbedTLS based SSL UDP Provider * add required cross-compile submodules * logical rebuild fn: initLeds, setLights + new logs -more detailed checks and error handling inside iniLeds and setLights - logical script procedure before ProviderUdpSSL init - first steps for multiple ProviderUdpSSL usage - better fallback support to old RestAPI, if entertainment api is not supported - just 4 u LordGrey: new log fn for cosmetic config outputs ;) * add OSX CompileHowTo - undo from CrossCompileHowTo * whitespace fixes * lightID toString fix * fix unsigned int E-API + debug output * bugfixes, reworked black signal detection, wizard: - change device config field light-ids from int to string -> real unsigned int fix - add signal detection brightness minimum threshold value 0.0 for 0% brightness - 1.0 for 100% brightness to count for blacklight signal detection reason: input may not 100% black, like mine - i have a deep dark gray input signal -> my threshold value is set to 0.005 for 0.5% minimum brightness = 1 (from max 255) to count as black - wizard optimations, with fallback without entertainment support (beta state) - whitespace fixes * cleanup + minor fixes * change fixed Hue UPD SSL config to _devConfig paras * Hotfix SSL Connection, new light models, wizard: - Fix UPD SSL Connection failed Problems - add new supported gamut C light models: LCG002, LCA001, LCA002, LCA003 - wizard: extend fallback support to classic mode + hints * whitespace, typo fix * uncheck useEntertainmentAPI, if noAPISupport detected + hint * coredump fix -> add _blackLightsTimer nullptr init * code cleanup / remove old debugs + whitespacefixes * add gamut C LCP001, LCP002 * SSL UDP config made more flexible + remove qDebug -> switch to hyerion.ng _log -> replace logCommand with verbose -> code cleanups etc... * extended mbedtls debugging infos * add adjustable ssl timeout settings * error handling * streamdebugger bugfixes * UPDSSL psk / psk_identity bugfixes! + hue wizard fn typo fix + - verbose option available without dependencies - whitespace fixes * Philips Hue Assistant now recognizes non-original bridges better... + Added note if no clientkey is set when using the entertainment API + User creation (+ clientkey) for non-original bridges can now also be used + Minor changes and bug fixes * CMAKE mbedTLS detection * minor bug fixes + code cleanups * FindMbedTLS.cmake remove Path-Hints + wizard.js: ajax timeout handling Test - content_grabber.js: run relevant code only, if V4L2_AVAIL is true: conf_grabber don't displays other devices, if V4L2 is not available * compile mbedtls via cmake as static lib * remove libmbedtls-dev from compileHowto / scripts * Fix Windows build * Fix windows build (part 2) * removed unnecessary osx x11 include directory path * QTimer Shutdown bugfix * cmake win32 fix + minor bugfixes * cmake debug msg used mbedtls libs * Bugfix: noSignalDetection wasn't switchedOn again if no signal was previously detected * Some code fixes based on alerts from lgtm.com Co-authored-by: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com>
120 lines
3.5 KiB
CMake
Executable File
120 lines
3.5 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)
|
|
|
|
find_package(Qt5 COMPONENTS Network SerialPort REQUIRED)
|
|
|
|
include_directories(
|
|
dev_hid
|
|
dev_net
|
|
dev_other
|
|
dev_serial
|
|
dev_spi
|
|
dev_rpi_pwm
|
|
dev_tinker
|
|
)
|
|
|
|
FILE ( GLOB Leddevice_SOURCES
|
|
"${CURRENT_HEADER_DIR}/*.h"
|
|
"${CURRENT_SOURCE_DIR}/*.h"
|
|
"${CURRENT_SOURCE_DIR}/*.cpp"
|
|
"${CURRENT_SOURCE_DIR}/dev_serial/*.h"
|
|
"${CURRENT_SOURCE_DIR}/dev_serial/*.cpp"
|
|
"${CURRENT_SOURCE_DIR}/dev_net/*.h"
|
|
"${CURRENT_SOURCE_DIR}/dev_net/*.cpp"
|
|
"${CURRENT_SOURCE_DIR}/dev_other/*.h"
|
|
"${CURRENT_SOURCE_DIR}/dev_other/*.cpp"
|
|
)
|
|
|
|
if ( ENABLE_OSX OR WIN32 )
|
|
list(REMOVE_ITEM Leddevice_SOURCES "${CURRENT_SOURCE_DIR}/dev_other/LedDevicePiBlaster.h")
|
|
list(REMOVE_ITEM Leddevice_SOURCES "${CURRENT_SOURCE_DIR}/dev_other/LedDevicePiBlaster.cpp")
|
|
endif()
|
|
|
|
if ( ENABLE_USB_HID )
|
|
find_package(libusb-1.0 REQUIRED)
|
|
include_directories(
|
|
${CMAKE_SOURCE_DIR}/include/hidapi
|
|
${LIBUSB_1_INCLUDE_DIRS}
|
|
)
|
|
FILE ( GLOB Leddevice_USB_HID_SOURCES "${CURRENT_SOURCE_DIR}/dev_hid/*.h" "${CURRENT_SOURCE_DIR}/dev_hid/*.cpp")
|
|
endif()
|
|
|
|
if ( ENABLE_SPIDEV )
|
|
FILE ( GLOB Leddevice_SPI_SOURCES "${CURRENT_SOURCE_DIR}/dev_spi/*.h" "${CURRENT_SOURCE_DIR}/dev_spi/*.cpp")
|
|
endif()
|
|
|
|
if ( ENABLE_TINKERFORGE )
|
|
FILE ( GLOB Leddevice_TINKER_SOURCES "${CURRENT_SOURCE_DIR}/dev_tinker/*.h" "${CURRENT_SOURCE_DIR}/dev_tinker/*.cpp")
|
|
endif()
|
|
|
|
if ( ENABLE_WS281XPWM )
|
|
include_directories(../../dependencies/external/rpi_ws281x)
|
|
FILE ( GLOB Leddevice_PWM_SOURCES "${CURRENT_SOURCE_DIR}/dev_rpi_pwm/*.h" "${CURRENT_SOURCE_DIR}/dev_rpi_pwm/*.cpp")
|
|
endif()
|
|
|
|
set(LedDevice_RESOURCES ${CURRENT_SOURCE_DIR}/LedDeviceSchemas.qrc )
|
|
|
|
SET( Leddevice_SOURCES
|
|
${Leddevice_SOURCES}
|
|
${LedDevice_RESOURCES}
|
|
${Leddevice_USB_HID_SOURCES}
|
|
${Leddevice_TINKER_SOURCES}
|
|
${Leddevice_SPI_SOURCES}
|
|
${Leddevice_PWM_SOURCES}
|
|
)
|
|
|
|
# auto generate header file that include all available leddevice headers
|
|
# auto generate cpp file for register() calls
|
|
FILE ( WRITE "${CMAKE_BINARY_DIR}/LedDevice_headers.h" "#pragma once\n\n//this file is autogenerated, don't touch it\n\n" )
|
|
FILE ( WRITE "${CMAKE_BINARY_DIR}/LedDevice_register.cpp" "//this file is autogenerated, don't touch it\n\n" )
|
|
FOREACH( f ${Leddevice_SOURCES} )
|
|
if ( "${f}" MATCHES "dev_.*/Led.evice.+h$" )
|
|
GET_FILENAME_COMPONENT(fname ${f} NAME)
|
|
FILE ( APPEND "${CMAKE_BINARY_DIR}/LedDevice_headers.h" "#include \"${fname}\"\n" )
|
|
STRING( SUBSTRING ${fname} 9 -1 dname)
|
|
STRING( REPLACE ".h" "" dname "${dname}" )
|
|
FILE ( APPEND "${CMAKE_BINARY_DIR}/LedDevice_register.cpp" "REGISTER(${dname});\n" )
|
|
endif()
|
|
ENDFOREACH()
|
|
|
|
add_library(leddevice ${CMAKE_BINARY_DIR}/LedDevice_headers.h ${Leddevice_SOURCES} )
|
|
|
|
target_link_libraries(leddevice
|
|
hyperion
|
|
hyperion-utils
|
|
${CMAKE_THREAD_LIBS_INIT}
|
|
Qt5::Network
|
|
Qt5::SerialPort
|
|
ssdp
|
|
)
|
|
|
|
if(WIN32)
|
|
target_link_libraries(leddevice ws2_32)
|
|
endif()
|
|
|
|
if(ENABLE_TINKERFORGE)
|
|
target_link_libraries(leddevice tinkerforge)
|
|
endif()
|
|
|
|
if(ENABLE_WS281XPWM)
|
|
target_link_libraries(leddevice ws281x)
|
|
endif()
|
|
|
|
if (ENABLE_USB_HID)
|
|
if(APPLE)
|
|
target_link_libraries(leddevice ${LIBUSB_1_LIBRARIES} hidapi-mac)
|
|
else()
|
|
target_link_libraries(leddevice ${LIBUSB_1_LIBRARIES} hidapi-libusb)
|
|
endif()
|
|
endif()
|
|
|
|
if (NOT DEFAULT_USE_SYSTEM_MBEDTLS_LIBS)
|
|
if (MBEDTLS_LIBRARIES)
|
|
include_directories(${MBEDTLS_INCLUDE_DIR})
|
|
target_link_libraries(leddevice ${MBEDTLS_LIBRARIES})
|
|
target_include_directories(leddevice PRIVATE ${MBEDTLS_INCLUDE_DIR})
|
|
endif (MBEDTLS_LIBRARIES)
|
|
endif ()
|