awawa-dev · awawa-dev · Jan 26, 2025 · Dec 26, 2024 · Dec 26, 2024 · Dec 26, 2024
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2024 awawa-dev
+Copyright (c) 2020-2025 awawa-dev
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/cmake/installers.cmake b/cmake/installers.cmake
@@ -347,8 +347,7 @@ macro(DeployUnix TARGET)
 			"libdl"
 			"libexpat"
 			"libfontconfig"
-			"libgcc_s"			
-			"libgpg-error"
+			"libgcc_s"
 			"libm"
 			"libpthread"
 			"librt"

diff --git a/include/base/AutomaticToneMapping.h b/include/base/AutomaticToneMapping.h
@@ -2,7 +2,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/base/RawUdpServer.h b/include/base/RawUdpServer.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/bonjour/DiscoveryRecord.h b/include/bonjour/DiscoveryRecord.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/bonjour/DiscoveryWrapper.h b/include/bonjour/DiscoveryWrapper.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/db/SQLite.h b/include/db/SQLite.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/effects/EffectManufactory.h b/include/effects/EffectManufactory.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/flatbuffers/parser/FlatBuffersParser.h b/include/flatbuffers/parser/FlatBuffersParser.h
@@ -2,7 +2,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/flatbuffers/server/FlatBuffersServerConnection.h b/include/flatbuffers/server/FlatBuffersServerConnection.h
@@ -2,7 +2,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/grabber/windows/DX/PixelShaderHyperHDR.h b/include/grabber/windows/DX/PixelShaderHyperHDR.h
@@ -2,7 +2,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/grabber/windows/DX/VertexShaderHyperHDR.h b/include/grabber/windows/DX/VertexShaderHyperHDR.h
@@ -2,7 +2,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/image/MemoryBuffer.h b/include/image/MemoryBuffer.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/led-drivers/LedDeviceManufactory.h b/include/led-drivers/LedDeviceManufactory.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/led-drivers/net/DriverNetHomeAssistant.h b/include/led-drivers/net/DriverNetHomeAssistant.h
@@ -22,7 +22,7 @@ class DriverNetHomeAssistant : public LedDevice
 		QString homeAssistantHost;
 		QString longLivedAccessToken;
 		int transition;
-		int constantBrightness;
+		int constantBrightness = 255;
 		bool restoreOriginalState;
 
 		std::list<HomeAssistantLamp> lamps;
@@ -34,6 +34,7 @@ class DriverNetHomeAssistant : public LedDevice
 
 		QString name;
 		Mode colorModel;
+		int currentBrightness = 255;
 
 		struct
 		{
@@ -63,6 +64,7 @@ class DriverNetHomeAssistant : public LedDevice
 	HomeAssistantInstance _haInstance;
 
 	std::unique_ptr<ProviderRestApi> _restApi;
+	long long						_lastUpdate;
 
 	static bool isRegistered;
 };
diff --git a/include/led-drivers/net/DriverNetZigbee2mqtt.h b/include/led-drivers/net/DriverNetZigbee2mqtt.h
@@ -0,0 +1,67 @@
+#pragma once
+
+#ifndef PCH_ENABLED
+	#include <QJsonObject>
+	#include <QJsonArray>
+	#include <memory>
+	#include <list>
+	#include <atomic>
+	#include <chrono>
+#endif
+
+#include <led-drivers/LedDevice.h>
+#include <linalg.h>
+
+class DriverNetZigbee2mqtt : public LedDevice
+{
+	Q_OBJECT
+
+	struct Zigbee2mqttLamp;
+
+	struct Zigbee2mqttInstance
+	{
+		int transition;
+		int constantBrightness = 255;
+
+		std::list<Zigbee2mqttLamp> lamps;
+	};
+
+	struct Zigbee2mqttLamp
+	{
+		enum Mode { RGB = 0, HSV };
+
+		QString name;
+		Mode colorModel;
+		int currentBrightness = 255;
+	};
+
+public:
+	explicit DriverNetZigbee2mqtt(const QJsonObject& deviceConfig);
+	static LedDevice* construct(const QJsonObject& deviceConfig);
+
+	QJsonObject discover(const QJsonObject& params) override;
+
+	void identify(const QJsonObject& params) override;
+
+public slots:
+	void handlerSignalMqttReceived(QString topic, QString payload);
+
+protected:
+	bool powerOn() override;
+	bool powerOff() override;
+
+private:
+	bool init(const QJsonObject& deviceConfig) override;
+	int write(const std::vector<ColorRgb>& ledValues) override;
+	bool powerOnOff(bool isOn);
+
+	Zigbee2mqttInstance	_zigInstance;
+	std::atomic<bool>	_discoveryFinished;
+	int					_timeLogger;
+	QString				_discoveryMessage;
+	int					_mqttId;
+	long long			_lastUpdate;
+
+	static int mqttId;
+	static bool isRegistered;
+};
diff --git a/include/led-drivers/serial/EspTools.h b/include/led-drivers/serial/EspTools.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/led-drivers/spi/DriverSpiHD108.h b/include/led-drivers/spi/DriverSpiHD108.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/led-strip/ChannelCalibration.h b/include/led-strip/ChannelCalibration.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/led-strip/ColorCalibration.h b/include/led-strip/ColorCalibration.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/led-strip/LedCalibration.h b/include/led-strip/LedCalibration.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/lut-calibrator/BestResult.h b/include/lut-calibrator/BestResult.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/lut-calibrator/BoardUtils.h b/include/lut-calibrator/BoardUtils.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/lut-calibrator/CalibrationWorker.h b/include/lut-calibrator/CalibrationWorker.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/lut-calibrator/CapturedColor.h b/include/lut-calibrator/CapturedColor.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/lut-calibrator/ColorSpace.h b/include/lut-calibrator/ColorSpace.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/lut-calibrator/LutCalibrator.h b/include/lut-calibrator/LutCalibrator.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/lut-calibrator/YuvConverter.h b/include/lut-calibrator/YuvConverter.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/mqtt/mqtt.h b/include/mqtt/mqtt.h
@@ -4,6 +4,8 @@
 	#include <QSet>
 	#include <QJsonDocument>
 	#include <QTimer>
+	#include <QStringList>
+	#include <map>
 #endif
 
 #include <utils/Logger.h>
@@ -28,6 +30,10 @@ public slots:
 
 	void handleSettingsUpdate(settings::type type, const QJsonDocument& config);
 
+	void handleSignalMqttSubscribe(bool subscribe, QString topic);
+	void handleSignalMqttPublish(QString topic, QString payload);
+	void handleSignalMqttLastWill(QString id, QStringList pairs);
+
 private slots:
 	void connected();
 	void error(const QMQTT::ClientError error);
@@ -56,6 +62,9 @@ private slots:
 	QTimer*		_retryTimer;
 	bool		_initialized;
 	QJsonArray	_resultArray;
+	bool		_disableApiAccess;
+
+	std::map<QString, QStringList> _lastWill;
 
 	Logger*		_log;
 	QMQTT::Client*	_clientInstance;	

diff --git a/include/proto-nano-server/ProtoNanoClientConnection.h b/include/proto-nano-server/ProtoNanoClientConnection.h
@@ -2,7 +2,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/suspend-handler/SuspendHandlerDummy.h b/include/suspend-handler/SuspendHandlerDummy.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/suspend-handler/SuspendHandlerLinux.h b/include/suspend-handler/SuspendHandlerLinux.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *

diff --git a/include/suspend-handler/SuspendHandlerMacOS.h b/include/suspend-handler/SuspendHandlerMacOS.h
@@ -4,7 +4,7 @@
 *
 *  MIT License
 *
-*  Copyright (c) 2020-2024 awawa-dev
+*  Copyright (c) 2020-2025 awawa-dev
 *
 *  Project homesite: https://github.com/awawa-dev/HyperHDR
 *