Skip to content

Commit 0d6ae64

Browse files
CalcProgrammer1CalcProgrammer1
committed
Update hueplusplus dependency to 1.2.0
1 parent bb6f8e2 commit 0d6ae64

File tree

153 files changed

+305
-23091
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+305
-23091
lines changed

Diff for: ‎Controllers/ElgatoKeyLightController/ElgatoKeyLightController.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include <iostream>
1313
#include "ElgatoKeyLightController.h"
14-
#include "json.hpp"
14+
#include <nlohmann/json.hpp>
1515

1616
using json = nlohmann::json;
1717

Diff for: ‎Controllers/ElgatoLightStripController/ElgatoLightStripController.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <thread>
1515
#include <vector>
1616
#include "ElgatoLightStripController.h"
17-
#include "json.hpp"
17+
#include <nlohmann/json.hpp>
1818
#include "LogManager.h"
1919

2020
using json = nlohmann::json;

Diff for: ‎Controllers/KasaSmartController/KasaSmartController.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include <cstdint>
1313
#include "KasaSmartController.h"
14-
#include "json.hpp"
14+
#include <nlohmann/json.hpp>
1515
#include "hsv.h"
1616

1717
using json = nlohmann::json;
@@ -273,7 +273,7 @@ void KasaSmartController::SetEffect(std::string effect)
273273
is_initialized = false;
274274
return;
275275
}
276-
276+
277277
std::string response;
278278
KasaSmartController::SendCommand(effect, response);
279279
port.tcp_close();

Diff for: ‎Controllers/LIFXController/LIFXController.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
\*---------------------------------------------------------*/
1111

1212
#include "LIFXController.h"
13-
#include "json.hpp"
13+
#include <nlohmann/json.hpp>
1414
#include "hsv.h"
1515

1616
using json = nlohmann::json;

Diff for: ‎Controllers/NanoleafController/RGBController_Nanoleaf.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "RGBController_Nanoleaf.h"
1313
#include "ResourceManager.h"
1414
#include "LogManager.h"
15-
#include "json.hpp"
15+
#include <nlohmann/json.hpp>
1616

1717
using json = nlohmann::json;
1818

Diff for: ‎Controllers/PhilipsWizController/PhilipsWizController.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
\*---------------------------------------------------------*/
1111

1212
#include "PhilipsWizController.h"
13-
#include "json.hpp"
13+
#include <nlohmann/json.hpp>
1414

1515
using json = nlohmann::json;
1616
using namespace std::chrono_literals;
@@ -130,7 +130,7 @@ void PhilipsWizController::SetColor(unsigned char red, unsigned char green, unsi
130130
command["params"]["w"] = 0;
131131
}
132132

133-
133+
134134
/*-----------------------------------------------------------------*\
135135
| Fill in the setPilot command with RGB and brightness information. |
136136
| The bulb will not respond to 0, 0, 0, so if all channels are zero,|

Diff for: ‎Controllers/YeelightController/YeelightController.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
\*---------------------------------------------------------*/
1111

1212
#include "YeelightController.h"
13-
#include "json.hpp"
13+
#include <nlohmann/json.hpp>
1414

1515
using json = nlohmann::json;
1616

Diff for: ‎LogManager.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <vector>
1616
#include <queue>
1717
#include <memory>
18-
#include "json.hpp"
18+
#include <nlohmann/json.hpp>
1919
#include "filesystem.h"
2020

2121
/*-------------------------------------------------*\
@@ -78,7 +78,7 @@ class LogManager
7878

7979
// Logfile max level
8080
unsigned int loglevel = LL_INFO;
81-
81+
8282
// Verbosity (stdout) max level
8383
unsigned int verbosity = LL_WARNING;
8484

Diff for: ‎OpenRGB.pro

+36-36
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ INCLUDEPATH +=
143143
$$GUI_INCLUDES \
144144
dependencies/ColorWheel \
145145
dependencies/CRCpp/ \
146-
dependencies/hueplusplus-1.1.0/include \
147-
dependencies/hueplusplus-1.1.0/include/hueplusplus \
146+
dependencies/hueplusplus-1.2.0/include \
147+
dependencies/hueplusplus-1.2.0/include/hueplusplus \
148148
dependencies/httplib \
149149
dependencies/json/ \
150150
dependencies/mdns \
@@ -170,7 +170,7 @@ HEADERS +=
170170
$$CONTROLLER_H \
171171
Colors.h \
172172
dependencies/ColorWheel/ColorWheel.h \
173-
dependencies/json/json.hpp \
173+
dependencies/json/nlohmann/json.hpp \
174174
LogManager.h \
175175
NetworkClient.h \
176176
NetworkProtocol.h \
@@ -210,35 +210,35 @@ SOURCES +=
210210
$$GUI_CPP \
211211
$$CONTROLLER_CPP \
212212
dependencies/ColorWheel/ColorWheel.cpp \
213-
dependencies/hueplusplus-1.1.0/src/Action.cpp \
214-
dependencies/hueplusplus-1.1.0/src/APICache.cpp \
215-
dependencies/hueplusplus-1.1.0/src/BaseDevice.cpp \
216-
dependencies/hueplusplus-1.1.0/src/BaseHttpHandler.cpp \
217-
dependencies/hueplusplus-1.1.0/src/Bridge.cpp \
218-
dependencies/hueplusplus-1.1.0/src/BridgeConfig.cpp \
219-
dependencies/hueplusplus-1.1.0/src/CLIPSensors.cpp \
220-
dependencies/hueplusplus-1.1.0/src/ColorUnits.cpp \
221-
dependencies/hueplusplus-1.1.0/src/EntertainmentMode.cpp \
222-
dependencies/hueplusplus-1.1.0/src/ExtendedColorHueStrategy.cpp \
223-
dependencies/hueplusplus-1.1.0/src/ExtendedColorTemperatureStrategy.cpp \
224-
dependencies/hueplusplus-1.1.0/src/Group.cpp \
225-
dependencies/hueplusplus-1.1.0/src/HueCommandAPI.cpp \
226-
dependencies/hueplusplus-1.1.0/src/HueDeviceTypes.cpp \
227-
dependencies/hueplusplus-1.1.0/src/HueException.cpp \
228-
dependencies/hueplusplus-1.1.0/src/Light.cpp \
229-
dependencies/hueplusplus-1.1.0/src/ModelPictures.cpp \
230-
dependencies/hueplusplus-1.1.0/src/NewDeviceList.cpp \
231-
dependencies/hueplusplus-1.1.0/src/Scene.cpp \
232-
dependencies/hueplusplus-1.1.0/src/Schedule.cpp \
233-
dependencies/hueplusplus-1.1.0/src/Sensor.cpp \
234-
dependencies/hueplusplus-1.1.0/src/SimpleBrightnessStrategy.cpp \
235-
dependencies/hueplusplus-1.1.0/src/SimpleColorHueStrategy.cpp \
236-
dependencies/hueplusplus-1.1.0/src/SimpleColorTemperatureStrategy.cpp \
237-
dependencies/hueplusplus-1.1.0/src/StateTransaction.cpp \
238-
dependencies/hueplusplus-1.1.0/src/TimePattern.cpp \
239-
dependencies/hueplusplus-1.1.0/src/UPnP.cpp \
240-
dependencies/hueplusplus-1.1.0/src/Utils.cpp \
241-
dependencies/hueplusplus-1.1.0/src/ZLLSensors.cpp \
213+
dependencies/hueplusplus-1.2.0/src/Action.cpp \
214+
dependencies/hueplusplus-1.2.0/src/APICache.cpp \
215+
dependencies/hueplusplus-1.2.0/src/BaseDevice.cpp \
216+
dependencies/hueplusplus-1.2.0/src/BaseHttpHandler.cpp \
217+
dependencies/hueplusplus-1.2.0/src/Bridge.cpp \
218+
dependencies/hueplusplus-1.2.0/src/BridgeConfig.cpp \
219+
dependencies/hueplusplus-1.2.0/src/CLIPSensors.cpp \
220+
dependencies/hueplusplus-1.2.0/src/ColorUnits.cpp \
221+
dependencies/hueplusplus-1.2.0/src/EntertainmentMode.cpp \
222+
dependencies/hueplusplus-1.2.0/src/ExtendedColorHueStrategy.cpp \
223+
dependencies/hueplusplus-1.2.0/src/ExtendedColorTemperatureStrategy.cpp \
224+
dependencies/hueplusplus-1.2.0/src/Group.cpp \
225+
dependencies/hueplusplus-1.2.0/src/HueCommandAPI.cpp \
226+
dependencies/hueplusplus-1.2.0/src/HueDeviceTypes.cpp \
227+
dependencies/hueplusplus-1.2.0/src/HueException.cpp \
228+
dependencies/hueplusplus-1.2.0/src/Light.cpp \
229+
dependencies/hueplusplus-1.2.0/src/ModelPictures.cpp \
230+
dependencies/hueplusplus-1.2.0/src/NewDeviceList.cpp \
231+
dependencies/hueplusplus-1.2.0/src/Scene.cpp \
232+
dependencies/hueplusplus-1.2.0/src/Schedule.cpp \
233+
dependencies/hueplusplus-1.2.0/src/Sensor.cpp \
234+
dependencies/hueplusplus-1.2.0/src/SimpleBrightnessStrategy.cpp \
235+
dependencies/hueplusplus-1.2.0/src/SimpleColorHueStrategy.cpp \
236+
dependencies/hueplusplus-1.2.0/src/SimpleColorTemperatureStrategy.cpp \
237+
dependencies/hueplusplus-1.2.0/src/StateTransaction.cpp \
238+
dependencies/hueplusplus-1.2.0/src/TimePattern.cpp \
239+
dependencies/hueplusplus-1.2.0/src/UPnP.cpp \
240+
dependencies/hueplusplus-1.2.0/src/Utils.cpp \
241+
dependencies/hueplusplus-1.2.0/src/ZLLSensors.cpp \
242242
main.cpp \
243243
cli.cpp \
244244
dmiinfo/dmiinfo.cpp \
@@ -333,7 +333,7 @@ win32:INCLUDEPATH +=
333333
win32:SOURCES += $$CONTROLLER_CPP_WINDOWS
334334

335335
win32:SOURCES += \
336-
dependencies/hueplusplus-1.1.0/src/WinHttpHandler.cpp \
336+
dependencies/hueplusplus-1.2.0/src/WinHttpHandler.cpp \
337337
dependencies/mbedtls-2.28.8/library/aes.c \
338338
dependencies/mbedtls-2.28.8/library/aesni.c \
339339
dependencies/mbedtls-2.28.8/library/arc4.c \
@@ -601,7 +601,7 @@ contains(QMAKE_PLATFORM, linux) {
601601
SOURCES += $$CONTROLLER_CPP_LINUX
602602

603603
SOURCES += \
604-
dependencies/hueplusplus-1.1.0/src/LinHttpHandler.cpp \
604+
dependencies/hueplusplus-1.2.0/src/LinHttpHandler.cpp \
605605
dependencies/NVFC/nvapi.cpp \
606606
i2c_smbus/i2c_smbus_linux.cpp \
607607
scsiapi/scsiapi_linux.c \
@@ -727,7 +727,7 @@ contains(QMAKE_PLATFORM, freebsd) {
727727
SOURCES += $$CONTROLLER_CPP_FREEBSD
728728

729729
SOURCES += \
730-
dependencies/hueplusplus-1.1.0/src/LinHttpHandler.cpp \
730+
dependencies/hueplusplus-1.2.0/src/LinHttpHandler.cpp \
731731
serial_port/find_usb_serial_port_linux.cpp \
732732
AutoStart/AutoStart-FreeBSD.cpp \
733733
SuspendResume/SuspendResume_Linux_FreeBSD.cpp \
@@ -795,7 +795,7 @@ macx {
795795
HEADERS += $$CONTROLLER_H_MACOS
796796

797797
SOURCES += \
798-
dependencies/hueplusplus-1.1.0/src/LinHttpHandler.cpp \
798+
dependencies/hueplusplus-1.2.0/src/LinHttpHandler.cpp \
799799
serial_port/find_usb_serial_port_macos.cpp \
800800
AutoStart/AutoStart-MacOS.cpp \
801801
qt/macutils.mm \

Diff for: ‎ResourceManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "i2c_smbus.h"
2525
#include "ResourceManagerInterface.h"
2626
#include "filesystem.h"
27-
#include "json.hpp"
27+
#include <nlohmann/json.hpp>
2828

2929
using json = nlohmann::json;
3030

Diff for: ‎SettingsManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#pragma once
1515

16-
#include "json.hpp"
16+
#include <nlohmann/json.hpp>
1717
#include <mutex>
1818
#include "filesystem.h"
1919

Diff for: ‎dependencies/hueplusplus-1.1.0/Jenkinsfile

-55
This file was deleted.

0 commit comments

Comments
 (0)