Update hueplusplus dependency to 1.1.0
This commit is contained in:
parent
4aac04280c
commit
5bcc105cd9
139 changed files with 3685 additions and 6343 deletions
70
OpenRGB.pro
70
OpenRGB.pro
|
|
@ -85,8 +85,8 @@ INCLUDEPATH +=
|
|||
$$GUI_INCLUDES \
|
||||
dependencies/ColorWheel \
|
||||
dependencies/CRCpp/ \
|
||||
dependencies/hueplusplus-1.0.0/include \
|
||||
dependencies/hueplusplus-1.0.0/include/hueplusplus \
|
||||
dependencies/hueplusplus-1.1.0/include \
|
||||
dependencies/hueplusplus-1.1.0/include/hueplusplus \
|
||||
dependencies/httplib \
|
||||
dependencies/json/ \
|
||||
dependencies/libe131/src/ \
|
||||
|
|
@ -149,35 +149,35 @@ SOURCES +=
|
|||
$$GUI_CPP \
|
||||
$$CONTROLLER_CPP \
|
||||
dependencies/ColorWheel/ColorWheel.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/Action.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/APICache.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/BaseDevice.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/BaseHttpHandler.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/Bridge.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/BridgeConfig.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/CLIPSensors.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/ColorUnits.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/EntertainmentMode.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/ExtendedColorHueStrategy.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/ExtendedColorTemperatureStrategy.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/Group.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/HueCommandAPI.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/HueDeviceTypes.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/HueException.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/Light.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/ModelPictures.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/NewDeviceList.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/Scene.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/Schedule.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/Sensor.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/SimpleBrightnessStrategy.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/SimpleColorHueStrategy.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/SimpleColorTemperatureStrategy.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/StateTransaction.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/TimePattern.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/UPnP.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/Utils.cpp \
|
||||
dependencies/hueplusplus-1.0.0/src/ZLLSensors.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/Action.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/APICache.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/BaseDevice.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/BaseHttpHandler.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/Bridge.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/BridgeConfig.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/CLIPSensors.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/ColorUnits.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/EntertainmentMode.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/ExtendedColorHueStrategy.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/ExtendedColorTemperatureStrategy.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/Group.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/HueCommandAPI.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/HueDeviceTypes.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/HueException.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/Light.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/ModelPictures.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/NewDeviceList.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/Scene.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/Schedule.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/Sensor.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/SimpleBrightnessStrategy.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/SimpleColorHueStrategy.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/SimpleColorTemperatureStrategy.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/StateTransaction.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/TimePattern.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/UPnP.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/Utils.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/ZLLSensors.cpp \
|
||||
dependencies/libe131/src/e131.c \
|
||||
main.cpp \
|
||||
cli.cpp \
|
||||
|
|
@ -247,7 +247,7 @@ win32:INCLUDEPATH +=
|
|||
win32:SOURCES -= $$CONTROLLER_CPP_LNX
|
||||
|
||||
win32:SOURCES += \
|
||||
dependencies/hueplusplus-1.0.0/src/WinHttpHandler.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/WinHttpHandler.cpp \
|
||||
dependencies/mbedtls-2.28.8/library/aes.c \
|
||||
dependencies/mbedtls-2.28.8/library/aesni.c \
|
||||
dependencies/mbedtls-2.28.8/library/arc4.c \
|
||||
|
|
@ -501,7 +501,7 @@ contains(QMAKE_PLATFORM, linux) {
|
|||
SOURCES -= $$CONTROLLER_CPP_WIN
|
||||
|
||||
SOURCES += \
|
||||
dependencies/hueplusplus-1.0.0/src/LinHttpHandler.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/LinHttpHandler.cpp \
|
||||
i2c_smbus/i2c_smbus_linux.cpp \
|
||||
scsiapi/scsiapi_linux.c \
|
||||
serial_port/find_usb_serial_port_linux.cpp \
|
||||
|
|
@ -610,7 +610,7 @@ contains(QMAKE_PLATFORM, freebsd) {
|
|||
}
|
||||
|
||||
SOURCES += \
|
||||
dependencies/hueplusplus-1.0.0/src/LinHttpHandler.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/LinHttpHandler.cpp \
|
||||
serial_port/find_usb_serial_port_linux.cpp \
|
||||
AutoStart/AutoStart-FreeBSD.cpp \
|
||||
|
||||
|
|
@ -677,7 +677,7 @@ macx {
|
|||
HEADERS -= $$CONTROLLER_H_WIN
|
||||
|
||||
SOURCES += \
|
||||
dependencies/hueplusplus-1.0.0/src/LinHttpHandler.cpp \
|
||||
dependencies/hueplusplus-1.1.0/src/LinHttpHandler.cpp \
|
||||
serial_port/find_usb_serial_port_linux.cpp \
|
||||
AutoStart/AutoStart-MacOS.cpp \
|
||||
qt/macutils.mm \
|
||||
|
|
|
|||
0
dependencies/hueplusplus-1.0.0/.gitignore → dependencies/hueplusplus-1.1.0/.gitignore
vendored
Normal file → Executable file
0
dependencies/hueplusplus-1.0.0/.gitignore → dependencies/hueplusplus-1.1.0/.gitignore
vendored
Normal file → Executable file
0
dependencies/hueplusplus-1.0.0/.travis.yml → dependencies/hueplusplus-1.1.0/.travis.yml
vendored
Normal file → Executable file
0
dependencies/hueplusplus-1.0.0/.travis.yml → dependencies/hueplusplus-1.1.0/.travis.yml
vendored
Normal file → Executable file
|
|
@ -9,7 +9,7 @@ endif()
|
|||
# Add cmake dir to module path, so Find*.cmake can be found
|
||||
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
|
||||
|
||||
project(hueplusplus VERSION 1.0.0 LANGUAGES CXX)
|
||||
project(hueplusplus VERSION 1.1.0 LANGUAGES CXX)
|
||||
|
||||
# check whether hueplusplus is compiled directly or included as a subdirectory
|
||||
if(NOT DEFINED hueplusplus_master_project)
|
||||
0
dependencies/hueplusplus-1.0.0/Doxyfile → dependencies/hueplusplus-1.1.0/Doxyfile
vendored
Normal file → Executable file
0
dependencies/hueplusplus-1.0.0/Doxyfile → dependencies/hueplusplus-1.1.0/Doxyfile
vendored
Normal file → Executable file
0
dependencies/hueplusplus-1.0.0/Jenkinsfile → dependencies/hueplusplus-1.1.0/Jenkinsfile
vendored
Normal file → Executable file
0
dependencies/hueplusplus-1.0.0/Jenkinsfile → dependencies/hueplusplus-1.1.0/Jenkinsfile
vendored
Normal file → Executable file
0
dependencies/hueplusplus-1.0.0/LICENSE → dependencies/hueplusplus-1.1.0/LICENSE
vendored
Normal file → Executable file
0
dependencies/hueplusplus-1.0.0/LICENSE → dependencies/hueplusplus-1.1.0/LICENSE
vendored
Normal file → Executable file
0
dependencies/hueplusplus-1.0.0/README.md → dependencies/hueplusplus-1.1.0/README.md
vendored
Normal file → Executable file
0
dependencies/hueplusplus-1.0.0/README.md → dependencies/hueplusplus-1.1.0/README.md
vendored
Normal file → Executable file
0
dependencies/hueplusplus-1.0.0/codecov.yml → dependencies/hueplusplus-1.1.0/codecov.yml
vendored
Normal file → Executable file
0
dependencies/hueplusplus-1.0.0/codecov.yml → dependencies/hueplusplus-1.1.0/codecov.yml
vendored
Normal file → Executable file
File diff suppressed because it is too large
Load diff
|
|
@ -56,14 +56,20 @@ std::string BaseHttpHandler::sendHTTPRequest(const std::string& method, const st
|
|||
request.append("HTTP/1.0"); // HTTP-Version
|
||||
request.append("\r\n"); // Ending
|
||||
// Entities
|
||||
request.append("Content-Type:"); // entity-header
|
||||
request.append(" "); // Separation
|
||||
request.append(contentType); // media-type
|
||||
request.append("\r\n"); // Entity ending
|
||||
request.append("Content-Length:"); // entity-header
|
||||
request.append(" "); // Separation
|
||||
request.append(std::to_string(body.size())); // length
|
||||
request.append("\r\n\r\n"); // Entity ending & Request-Line ending
|
||||
if (!contentType.empty())
|
||||
{
|
||||
request.append("Content-Type:"); // entity-header
|
||||
request.append(" "); // Separation
|
||||
request.append(contentType); // media-type
|
||||
request.append("\r\n"); // Entity ending
|
||||
}
|
||||
if (!body.empty())
|
||||
{
|
||||
request.append("Content-Length:"); // entity-header
|
||||
request.append(" "); // Separation
|
||||
request.append(std::to_string(body.size())); // length
|
||||
request.append("\r\n\r\n"); // Entity ending & Request-Line ending
|
||||
}
|
||||
request.append(body); // message-body
|
||||
request.append("\r\n\r\n"); // Ending
|
||||
|
||||
|
|
@ -21,6 +21,7 @@
|
|||
**/
|
||||
|
||||
#include "hueplusplus/EntertainmentMode.h"
|
||||
#include "mbedtls/certs.h"
|
||||
#include "mbedtls/ctr_drbg.h"
|
||||
#include "mbedtls/debug.h"
|
||||
#include "mbedtls/entropy.h"
|
||||
|
|
@ -121,12 +122,6 @@ EntertainmentMode::EntertainmentMode(Bridge& b, Group& g)
|
|||
| Seed the Deterministic Random Bit Generator (RNG) |
|
||||
\*-------------------------------------------------*/
|
||||
int ret = mbedtls_ctr_drbg_seed(&tls_context->ctr_drbg, mbedtls_entropy_func, &tls_context->entropy, NULL, 0);
|
||||
|
||||
/*-------------------------------------------------*\
|
||||
| Parse certificate |
|
||||
\*-------------------------------------------------*/
|
||||
//ret = mbedtls_x509_crt_parse(
|
||||
// &tls_context->cacert, (const unsigned char*)mbedtls_test_cas_pem, mbedtls_test_cas_pem_len);
|
||||
}
|
||||
|
||||
EntertainmentMode::~EntertainmentMode()
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue