diff --git a/CMakeLists.txt b/CMakeLists.txt index 061b46c3..067ed786 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -251,6 +251,14 @@ endif () # Add the doxygen generation directory add_subdirectory(doc) +# remove generated files on make cleaan too +LIST( APPEND GENERATED_QRC + ${CMAKE_BINARY_DIR}/EffectEngine.qrc + ${CMAKE_BINARY_DIR}/WebConfig.qrc + ${CMAKE_BINARY_DIR}/HyperionConfig.h +) +set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${GENERATED_QRC}" ) + # uninstall target configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) diff --git a/libsrc/hyperion/schemas/hyperion.schema-2.json b/libsrc/hyperion/schemas/hyperion.schema-2.json index a582d6b4..4a0aa873 100644 --- a/libsrc/hyperion/schemas/hyperion.schema-2.json +++ b/libsrc/hyperion/schemas/hyperion.schema-2.json @@ -290,16 +290,13 @@ }, "hsv" : { "type" : "object", - "required" : false, "properties" : { "saturationGain" : { "type" : "number", - "required" : false, "minimum" : 0.0 }, "valueGain" : { "type" : "number", - "required" : false, "minimum" : 0.0 } }, diff --git a/libsrc/protoserver/ProtoClientConnection.cpp b/libsrc/protoserver/ProtoClientConnection.cpp index 5db92eac..68b20bbf 100644 --- a/libsrc/protoserver/ProtoClientConnection.cpp +++ b/libsrc/protoserver/ProtoClientConnection.cpp @@ -31,7 +31,8 @@ ProtoClientConnection::ProtoClientConnection(QTcpSocket *socket) // connect internal signals and slots connect(_socket, SIGNAL(disconnected()), this, SLOT(socketClosed())); connect(_socket, SIGNAL(readyRead()), this, SLOT(readData())); - + connect(_hyperion, SIGNAL(imageToLedsMappingChanged(int)), _imageProcessor, SLOT(setLedMappingType(int))); + _priorityChannelName = "proto@"+ _socket->peerAddress().toString().toStdString(); }