Various Cleanups (#1075)

* LedDevice - Address clang findings * Fix Windows Warnings * Ensure newInput is initialised * Clean-up unused elements for Plaform Capture * Fix initialization problem and spellings * Address clang findings and spelling corrections * LedDevice clean-ups * Cleanups * Align that getLedCount is int * Have "display" as default for Grabbers * Fix config during start-up for missing elements * Framegrabber Clean-up - Remove non supported grabbers from selection, filter valid options * Typo * Framegrabber.json - Fix property numbering * Preselect active Grabbertype * Sort Grabbernames * Align options with selected element * Fix deletion of pointer to incomplete type 'BonjourBrowserWrapper' * Address macOS compile warnings * Have default layout = 1 LED only to avoid errors as in #673 * Address lgtm findings * Address finding that params passed to LedDevice discovery were not considered * Cleanups after merging with latest master * Update Changelog * Address lgtm findings * Fix comment * Test Fix * Fix Python Warning * Handle Dummy Device assignment correctly * Address delete called on non-final 'commandline::Option' that has virtual functions but non-virtual destructor * Correct that QTimer.start accepts only int * Have Release Python GIL & reset threat state chnage downward compatible * Correct format specifier * LedDevice - add assertions * Readonly DB - Fix merge issue * Smoothing - Fix wrong defaults * LedDevice - correct assertion * Show smoothing config set# in debug and related values. * Suppress error on windows, if default file is "/dev/null" * CMAKE - Allow to define QT_BASE_DIR dynamically via environment-variable * Ignore Visual Studio specific files Co-authored-by: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com>
2025-03-01 10:33:28 +00:00 · 2020-11-14 17:58:56 +01:00
parent d28540a7fe
commit efc2046ab5
93 changed files with 1140 additions and 1172 deletions
--- a/libsrc/leddevice/dev_net/LedDeviceNanoleaf.cpp
+++ b/libsrc/leddevice/dev_net/LedDeviceNanoleaf.cpp
@@ -7,6 +7,7 @@
 // Qt includes
 #include <QEventLoop>
 #include <QNetworkReply>
+#include <QtEndian>

 //std includes
 #include <sstream>
@@ -14,18 +15,17 @@

 // Constants
 namespace {
-
-const bool verbose  = false;
+const bool verbose = false;
 const bool verbose3 = false;

 // Configuration settings
 const char CONFIG_ADDRESS[] = "host";
 //const char CONFIG_PORT[] = "port";
-const char CONFIG_AUTH_TOKEN[] ="token";
+const char CONFIG_AUTH_TOKEN[] = "token";

-const char CONFIG_PANEL_ORDER_TOP_DOWN[] ="panelOrderTopDown";
-const char CONFIG_PANEL_ORDER_LEFT_RIGHT[] ="panelOrderLeftRight";
-const char CONFIG_PANEL_START_POS[] ="panelStartPos";
+const char CONFIG_PANEL_ORDER_TOP_DOWN[] = "panelOrderTopDown";
+const char CONFIG_PANEL_ORDER_LEFT_RIGHT[] = "panelOrderLeftRight";
+const char CONFIG_PANEL_START_POS[] = "panelStartPos";

 // Panel configuration settings
 const char PANEL_LAYOUT[] = "layout";
@@ -61,16 +61,19 @@ const char API_BASE_PATH[] = "/api/v1/%1/";
 const char API_ROOT[] = "";
 //const char API_EXT_MODE_STRING_V1[] = "{\"write\" : {\"command\" : \"display\", \"animType\" : \"extControl\"}}";
 const char API_EXT_MODE_STRING_V2[] = "{\"write\" : {\"command\" : \"display\", \"animType\" : \"extControl\", \"extControlVersion\" : \"v2\"}}";
-const char API_STATE[] ="state";
+const char API_STATE[] = "state";
 const char API_PANELLAYOUT[] = "panelLayout";
 const char API_EFFECT[] = "effects";

+//Nanoleaf Control data stream
+const int STREAM_FRAME_PANEL_NUM_SIZE = 2;
+const int STREAM_FRAME_PANEL_INFO_SIZE = 8;
+
 // Nanoleaf ssdp services
 const char SSDP_ID[] = "ssdp:all";
 const char SSDP_FILTER_HEADER[] = "ST";
 const char SSDP_CANVAS[] = "nanoleaf:nl29";
 const char SSDP_LIGHTPANELS[] = "nanoleaf_aurora:light";
-
 } //End of constants

 // Nanoleaf Panel Shapetypes
@@ -81,7 +84,7 @@ enum SHAPETYPES {
 	CONTROL_SQUARE_PRIMARY,
 	CONTROL_SQUARE_PASSIVE,
 	POWER_SUPPLY,
-};
+	};

 // Nanoleaf external control versions
 enum EXTCONTROLVERSIONS {
@@ -89,20 +92,20 @@ enum EXTCONTROLVERSIONS {
 	EXTCTRLVER_V2
 };

-LedDeviceNanoleaf::LedDeviceNanoleaf(const QJsonObject &deviceConfig)
+LedDeviceNanoleaf::LedDeviceNanoleaf(const QJsonObject& deviceConfig)
 	: ProviderUdp(deviceConfig)
-	  ,_restApi(nullptr)
-	  ,_apiPort(API_DEFAULT_PORT)
-	  ,_topDown(true)
-	  ,_leftRight(true)
-	  ,_startPos(0)
-	  ,_endPos(0)
-	  ,_extControlVersion (EXTCTRLVER_V2),
+	  , _restApi(nullptr)
+	  , _apiPort(API_DEFAULT_PORT)
+	  , _topDown(true)
+	  , _leftRight(true)
+	  , _startPos(0)
+	  , _endPos(0)
+	  , _extControlVersion(EXTCTRLVER_V2),
 	  _panelLedCount(0)
 {
 }

-LedDevice* LedDeviceNanoleaf::construct(const QJsonObject &deviceConfig)
+LedDevice* LedDeviceNanoleaf::construct(const QJsonObject& deviceConfig)
 {
 	return new LedDeviceNanoleaf(deviceConfig);
 }
@@ -113,7 +116,7 @@ LedDeviceNanoleaf::~LedDeviceNanoleaf()
 	_restApi = nullptr;
 }

-bool LedDeviceNanoleaf::init(const QJsonObject &deviceConfig)
+bool LedDeviceNanoleaf::init(const QJsonObject& deviceConfig)
 {
 	// Overwrite non supported/required features
 	setLatchTime(0);
@@ -121,69 +124,69 @@ bool LedDeviceNanoleaf::init(const QJsonObject &deviceConfig)

 	if (deviceConfig["rewriteTime"].toInt(0) > 0)
 	{
-		Info (_log, "Device Nanoleaf does not require rewrites. Refresh time is ignored.");
+		Info(_log, "Device Nanoleaf does not require rewrites. Refresh time is ignored.");
 	}

-	DebugIf(verbose, _log, "deviceConfig: [%s]", QString(QJsonDocument(_devConfig).toJson(QJsonDocument::Compact)).toUtf8().constData() );
+	DebugIf(verbose, _log, "deviceConfig: [%s]", QString(QJsonDocument(_devConfig).toJson(QJsonDocument::Compact)).toUtf8().constData());

 	bool isInitOK = false;

-	if ( LedDevice::init(deviceConfig) )
+	if (LedDevice::init(deviceConfig))
 	{
-		uint configuredLedCount = this->getLedCount();
-		Debug(_log, "DeviceType   : %s", QSTRING_CSTR( this->getActiveDeviceType() ));
-		Debug(_log, "LedCount     : %u", configuredLedCount);
-		Debug(_log, "ColorOrder   : %s", QSTRING_CSTR( this->getColorOrder() ));
+		int configuredLedCount = this->getLedCount();
+		Debug(_log, "DeviceType   : %s", QSTRING_CSTR(this->getActiveDeviceType()));
+		Debug(_log, "LedCount     : %d", configuredLedCount);
+		Debug(_log, "ColorOrder   : %s", QSTRING_CSTR(this->getColorOrder()));
 		Debug(_log, "RewriteTime  : %d", this->getRewriteTime());
 		Debug(_log, "LatchTime    : %d", this->getLatchTime());

 		// Read panel organisation configuration
-		if ( deviceConfig[ CONFIG_PANEL_ORDER_TOP_DOWN ].isString() )
+		if (deviceConfig[CONFIG_PANEL_ORDER_TOP_DOWN].isString())
 		{
-			_topDown = deviceConfig[ CONFIG_PANEL_ORDER_TOP_DOWN ].toString().toInt() == 0;
+			_topDown = deviceConfig[CONFIG_PANEL_ORDER_TOP_DOWN].toString().toInt() == 0;
 		}
 		else
 		{
-			_topDown = deviceConfig[ CONFIG_PANEL_ORDER_TOP_DOWN ].toInt() == 0;
+			_topDown = deviceConfig[CONFIG_PANEL_ORDER_TOP_DOWN].toInt() == 0;
 		}

-		if ( deviceConfig[ CONFIG_PANEL_ORDER_LEFT_RIGHT ].isString() )
+		if (deviceConfig[CONFIG_PANEL_ORDER_LEFT_RIGHT].isString())
 		{
-			_leftRight = deviceConfig[ CONFIG_PANEL_ORDER_LEFT_RIGHT ].toString().toInt() == 0;
+			_leftRight = deviceConfig[CONFIG_PANEL_ORDER_LEFT_RIGHT].toString().toInt() == 0;
 		}
 		else
 		{
-			_leftRight = deviceConfig[ CONFIG_PANEL_ORDER_LEFT_RIGHT ].toInt() == 0;
+			_leftRight = deviceConfig[CONFIG_PANEL_ORDER_LEFT_RIGHT].toInt() == 0;
 		}

-		_startPos = static_cast<uint>( deviceConfig[ CONFIG_PANEL_START_POS ].toInt(0) );
+		_startPos = deviceConfig[CONFIG_PANEL_START_POS].toInt(0);

 		// TODO: Allow to handle port dynamically

 		//Set hostname as per configuration and_defaultHost default port
-		_hostname   = deviceConfig[ CONFIG_ADDRESS ].toString();
-		_apiPort   = API_DEFAULT_PORT;
-		_authToken = deviceConfig[ CONFIG_AUTH_TOKEN ].toString();
+		_hostname = deviceConfig[CONFIG_ADDRESS].toString();
+		_apiPort = API_DEFAULT_PORT;
+		_authToken = deviceConfig[CONFIG_AUTH_TOKEN].toString();

 		//If host not configured the init failed
-		if ( _hostname.isEmpty() )
+		if (_hostname.isEmpty())
 		{
 			this->setInError("No target hostname nor IP defined");
 			isInitOK = false;
 		}
 		else
 		{
-			if ( initRestAPI( _hostname, _apiPort, _authToken ) )
+			if (initRestAPI(_hostname, _apiPort, _authToken))
 			{
 				// Read LedDevice configuration and validate against device configuration
-				if ( initLedsConfiguration() )
+				if (initLedsConfiguration())
 				{
 					// Set UDP streaming host and port
 					_devConfig["host"] = _hostname;
 					_devConfig["port"] = STREAM_CONTROL_DEFAULT_PORT;

 					isInitOK = ProviderUdp::init(_devConfig);
-					Debug(_log, "Hostname/IP  : %s", QSTRING_CSTR( _hostname ));
+					Debug(_log, "Hostname/IP  : %s", QSTRING_CSTR(_hostname));
 					Debug(_log, "Port         : %d", _port);
 				}
 			}
@@ -201,9 +204,9 @@ bool LedDeviceNanoleaf::initLedsConfiguration()
 	// Read Panel count and panel Ids
 	_restApi->setPath(API_ROOT);
 	httpResponse response = _restApi->get();
-	if ( response.error() )
+	if (response.error())
 	{
-		this->setInError ( response.getErrorReason() );
+		this->setInError(response.getErrorReason());
 		isInitOK = false;
 	}
 	else
@@ -215,35 +218,35 @@ bool LedDeviceNanoleaf::initLedsConfiguration()
 		QString deviceManufacturer = jsonAllPanelInfo[DEV_DATA_MANUFACTURER].toString();
 		_deviceFirmwareVersion = jsonAllPanelInfo[DEV_DATA_FIRMWAREVERSION].toString();

-		Debug(_log, "Name           : %s", QSTRING_CSTR( deviceName ));
-		Debug(_log, "Model          : %s", QSTRING_CSTR( _deviceModel ));
-		Debug(_log, "Manufacturer   : %s", QSTRING_CSTR( deviceManufacturer ));
-		Debug(_log, "FirmwareVersion: %s", QSTRING_CSTR( _deviceFirmwareVersion));
+		Debug(_log, "Name           : %s", QSTRING_CSTR(deviceName));
+		Debug(_log, "Model          : %s", QSTRING_CSTR(_deviceModel));
+		Debug(_log, "Manufacturer   : %s", QSTRING_CSTR(deviceManufacturer));
+		Debug(_log, "FirmwareVersion: %s", QSTRING_CSTR(_deviceFirmwareVersion));

 		// Get panel details from /panelLayout/layout
 		QJsonObject jsonPanelLayout = jsonAllPanelInfo[API_PANELLAYOUT].toObject();
 		QJsonObject jsonLayout = jsonPanelLayout[PANEL_LAYOUT].toObject();

-		uint panelNum = static_cast<uint>(jsonLayout[PANEL_NUM].toInt());
+		int panelNum = jsonLayout[PANEL_NUM].toInt();
 		QJsonArray positionData = jsonLayout[PANEL_POSITIONDATA].toArray();

-		std::map<uint, std::map<uint, uint>> panelMap;
+		std::map<int, std::map<int, int>> panelMap;

 		// Loop over all children.
-		for (const QJsonValue value : positionData)
+		foreach(const QJsonValue & value, positionData)
 		{
 			QJsonObject panelObj = value.toObject();

-			uint panelId = static_cast<uint>(panelObj[PANEL_ID].toInt());
-			uint panelX  = static_cast<uint>(panelObj[PANEL_POS_X].toInt());
-			uint panelY  = static_cast<uint>(panelObj[PANEL_POS_Y].toInt());
-			uint panelshapeType = static_cast<uint>(panelObj[PANEL_SHAPE_TYPE].toInt());
-			//uint panelOrientation = static_cast<uint>(panelObj[PANEL_ORIENTATION].toInt());
+			int panelId = panelObj[PANEL_ID].toInt();
+			int panelX = panelObj[PANEL_POS_X].toInt();
+			int panelY = panelObj[PANEL_POS_Y].toInt();
+			int panelshapeType = panelObj[PANEL_SHAPE_TYPE].toInt();
+			//int panelOrientation = panelObj[PANEL_ORIENTATION].toInt();

-			DebugIf(verbose, _log, "Panel [%u] (%u,%u) - Type: [%u]", panelId, panelX, panelY, panelshapeType );
+			DebugIf(verbose, _log, "Panel [%d] (%d,%d) - Type: [%d]", panelId, panelX, panelY, panelshapeType);

 			// Skip Rhythm panels
-			if ( panelshapeType != RHYTM )
+			if (panelshapeType != RHYTM)
 			{
 				panelMap[panelY][panelX] = panelId;
 			}
@@ -254,16 +257,16 @@ bool LedDeviceNanoleaf::initLedsConfiguration()
 		}

 		// Travers panels top down
-		for(auto posY = panelMap.crbegin(); posY != panelMap.crend(); ++posY)
+		for (auto posY = panelMap.crbegin(); posY != panelMap.crend(); ++posY)
 		{
 			// Sort panels left to right
-			if ( _leftRight )
+			if (_leftRight)
 			{
-				for( auto posX =  posY->second.cbegin(); posX !=  posY->second.cend(); ++posX)
+				for (auto posX = posY->second.cbegin(); posX != posY->second.cend(); ++posX)
 				{
-					DebugIf(verbose3, _log, "panelMap[%u][%u]=%u", posY->first, posX->first, posX->second );
+					DebugIf(verbose3, _log, "panelMap[%d][%d]=%d", posY->first, posX->first, posX->second);

-					if ( _topDown )
+					if (_topDown)
 					{
 						_panelIds.push_back(posX->second);
 					}
@@ -276,11 +279,11 @@ bool LedDeviceNanoleaf::initLedsConfiguration()
 			else
 			{
 				// Sort panels right to left
-				for( auto posX =  posY->second.crbegin(); posX !=  posY->second.crend(); ++posX)
+				for (auto posX = posY->second.crbegin(); posX != posY->second.crend(); ++posX)
 				{
-					DebugIf(verbose3, _log, "panelMap[%u][%u]=%u", posY->first, posX->first, posX->second );
+					DebugIf(verbose3, _log, "panelMap[%d][%d]=%d", posY->first, posX->first, posX->second);

-					if ( _topDown )
+					if (_topDown)
 					{
 						_panelIds.push_back(posX->second);
 					}
@@ -292,22 +295,22 @@ bool LedDeviceNanoleaf::initLedsConfiguration()
 			}
 		}

-		this->_panelLedCount = static_cast<uint>(_panelIds.size());
-		_devConfig["hardwareLedCount"] = static_cast<int>(_panelLedCount);
+		this->_panelLedCount = _panelIds.size();
+		_devConfig["hardwareLedCount"] = _panelLedCount;

-		Debug(_log, "PanelsNum      : %u", panelNum);
-		Debug(_log, "PanelLedCount  : %u", _panelLedCount);
+		Debug(_log, "PanelsNum      : %d", panelNum);
+		Debug(_log, "PanelLedCount  : %d", _panelLedCount);

 		// Check. if enough panels were found.
-		uint configuredLedCount = this->getLedCount();
+		int configuredLedCount = this->getLedCount();
 		_endPos = _startPos + configuredLedCount - 1;

 		Debug(_log, "Sort Top>Down  : %d", _topDown);
 		Debug(_log, "Sort Left>Right: %d", _leftRight);
-		Debug(_log, "Start Panel Pos: %u", _startPos);
-		Debug(_log, "End Panel Pos  : %u", _endPos);
+		Debug(_log, "Start Panel Pos: %d", _startPos);
+		Debug(_log, "End Panel Pos  : %d", _endPos);

-		if (_panelLedCount < configuredLedCount )
+		if (_panelLedCount < configuredLedCount)
 		{
 			QString errorReason = QString("Not enough panels [%1] for configured LEDs [%2] found!")
 									  .arg(_panelLedCount)
@@ -317,16 +320,16 @@ bool LedDeviceNanoleaf::initLedsConfiguration()
 		}
 		else
 		{
-			if ( _panelLedCount > this->getLedCount() )
+			if (_panelLedCount > this->getLedCount())
 			{
-				Info(_log, "%s: More panels [%u] than configured LEDs [%u].", QSTRING_CSTR(this->getActiveDeviceType()), _panelLedCount, configuredLedCount );
+				Info(_log, "%s: More panels [%d] than configured LEDs [%d].", QSTRING_CSTR(this->getActiveDeviceType()), _panelLedCount, configuredLedCount);
 			}

 			// Check, if start position + number of configured LEDs is greater than number of panels available
-			if ( _endPos >= _panelLedCount )
+			if (_endPos >= _panelLedCount)
 			{
 				QString errorReason = QString("Start panel [%1] out of range. Start panel position can be max [%2] given [%3] panel available!")
-										  .arg(_startPos).arg(_panelLedCount-configuredLedCount).arg(_panelLedCount);
+										  .arg(_startPos).arg(_panelLedCount - configuredLedCount).arg(_panelLedCount);

 				this->setInError(errorReason);
 				isInitOK = false;
@@ -336,16 +339,16 @@ bool LedDeviceNanoleaf::initLedsConfiguration()
 	return isInitOK;
 }

-bool LedDeviceNanoleaf::initRestAPI(const QString &hostname, int port, const QString &token )
+bool LedDeviceNanoleaf::initRestAPI(const QString& hostname, int port, const QString& token)
 {
 	bool isInitOK = false;

-	if ( _restApi == nullptr )
+	if (_restApi == nullptr)
 	{
-		_restApi = new ProviderRestApi(hostname, port );
+		_restApi = new ProviderRestApi(hostname, port);

 		//Base-path is api-path + authentication token
-		_restApi->setBasePath( QString(API_BASE_PATH).arg(token) );
+		_restApi->setBasePath(QString(API_BASE_PATH).arg(token));

 		isInitOK = true;
 	}
@@ -360,13 +363,13 @@ int LedDeviceNanoleaf::open()
 	QJsonDocument responseDoc = changeToExternalControlMode();
 	// Resolve port for Light Panels
 	QJsonObject jsonStreamControllInfo = responseDoc.object();
-	if ( ! jsonStreamControllInfo.isEmpty() )
+	if (!jsonStreamControllInfo.isEmpty())
 	{
 		//Set default streaming port
 		_port = static_cast<uchar>(jsonStreamControllInfo[STREAM_CONTROL_PORT].toInt());
 	}

-	if ( ProviderUdp::open() == 0 )
+	if (ProviderUdp::open() == 0)
 	{
 		// Everything is OK, device is ready
 		_isDeviceReady = true;
@@ -375,10 +378,10 @@ int LedDeviceNanoleaf::open()
 	return retval;
 }

-QJsonObject LedDeviceNanoleaf::discover()
+QJsonObject LedDeviceNanoleaf::discover(const QJsonObject& /*params*/)
 {
 	QJsonObject devicesDiscovered;
-	devicesDiscovered.insert("ledDeviceType", _activeDeviceType );
+	devicesDiscovered.insert("ledDeviceType", _activeDeviceType);

 	QJsonArray deviceList;

@@ -391,41 +394,41 @@ QJsonObject LedDeviceNanoleaf::discover()
 	discover.setSearchFilter(searchTargetFilter, SSDP_FILTER_HEADER);
 	QString searchTarget = SSDP_ID;

-	if ( discover.discoverServices(searchTarget) > 0 )
+	if (discover.discoverServices(searchTarget) > 0)
 	{
 		deviceList = discover.getServicesDiscoveredJson();
 	}

 	devicesDiscovered.insert("devices", deviceList);
-	Debug(_log, "devicesDiscovered: [%s]", QString(QJsonDocument(devicesDiscovered).toJson(QJsonDocument::Compact)).toUtf8().constData() );
+	Debug(_log, "devicesDiscovered: [%s]", QString(QJsonDocument(devicesDiscovered).toJson(QJsonDocument::Compact)).toUtf8().constData());

 	return devicesDiscovered;
 }

 QJsonObject LedDeviceNanoleaf::getProperties(const QJsonObject& params)
 {
-	Debug(_log, "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData() );
+	Debug(_log, "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData());
 	QJsonObject properties;

 	// Get Nanoleaf device properties
 	QString host = params["host"].toString("");
-	if ( !host.isEmpty() )
+	if (!host.isEmpty())
 	{
 		QString authToken = params["token"].toString("");
 		QString filter = params["filter"].toString("");

 		// Resolve hostname and port (or use default API port)
-		QStringList addressparts = QStringUtils::split(host,":", QStringUtils::SplitBehavior::SkipEmptyParts);
+		QStringList addressparts = QStringUtils::split(host, ":", QStringUtils::SplitBehavior::SkipEmptyParts);
 		QString apiHost = addressparts[0];
 		int apiPort;

-		if ( addressparts.size() > 1)
+		if (addressparts.size() > 1)
 		{
 			apiPort = addressparts[1].toInt();
 		}
 		else
 		{
-			apiPort   = API_DEFAULT_PORT;
+			apiPort = API_DEFAULT_PORT;
 		}

 		initRestAPI(apiHost, apiPort, authToken);
@@ -433,40 +436,39 @@ QJsonObject LedDeviceNanoleaf::getProperties(const QJsonObject& params)

 		// Perform request
 		httpResponse response = _restApi->get();
-		if ( response.error() )
+		if (response.error())
 		{
-			Warning (_log, "%s get properties failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
+			Warning(_log, "%s get properties failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
 		}

 		properties.insert("properties", response.getBody().object());

-		Debug(_log, "properties: [%s]", QString(QJsonDocument(properties).toJson(QJsonDocument::Compact)).toUtf8().constData() );
-
+		Debug(_log, "properties: [%s]", QString(QJsonDocument(properties).toJson(QJsonDocument::Compact)).toUtf8().constData());
 	}
 	return properties;
 }

 void LedDeviceNanoleaf::identify(const QJsonObject& params)
 {
-	Debug(_log, "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData() );
+	Debug(_log, "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData());

 	QString host = params["host"].toString("");
-	if ( !host.isEmpty() )
+	if (!host.isEmpty())
 	{
 		QString authToken = params["token"].toString("");

 		// Resolve hostname and port (or use default API port)
-		QStringList addressparts = QStringUtils::split(host,":", QStringUtils::SplitBehavior::SkipEmptyParts);
+		QStringList addressparts = QStringUtils::split(host, ":", QStringUtils::SplitBehavior::SkipEmptyParts);
 		QString apiHost = addressparts[0];
 		int apiPort;

-		if ( addressparts.size() > 1)
+		if (addressparts.size() > 1)
 		{
 			apiPort = addressparts[1].toInt();
 		}
 		else
 		{
-			apiPort   = API_DEFAULT_PORT;
+			apiPort = API_DEFAULT_PORT;
 		}

 		initRestAPI(apiHost, apiPort, authToken);
@@ -474,33 +476,33 @@ void LedDeviceNanoleaf::identify(const QJsonObject& params)

 		// Perform request
 		httpResponse response = _restApi->put();
-		if ( response.error() )
+		if (response.error())
 		{
-			Warning (_log, "%s identification failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
+			Warning(_log, "%s identification failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason()));
 		}
 	}
 }

 bool LedDeviceNanoleaf::powerOn()
 {
-	if ( _isDeviceReady)
+	if (_isDeviceReady)
 	{
 		changeToExternalControlMode();

 		//Power-on Nanoleaf device
 		_restApi->setPath(API_STATE);
-		_restApi->put( getOnOffRequest(true) );
+		_restApi->put(getOnOffRequest(true));
 	}
 	return true;
 }

 bool LedDeviceNanoleaf::powerOff()
 {
-	if ( _isDeviceReady)
+	if (_isDeviceReady)
 	{
 		//Power-off the Nanoleaf device physically
 		_restApi->setPath(API_STATE);
-		_restApi->put( getOnOffRequest(false) );
+		_restApi->put(getOnOffRequest(false));
 	}
 	return true;
 }
@@ -508,7 +510,7 @@ bool LedDeviceNanoleaf::powerOff()
 QString LedDeviceNanoleaf::getOnOffRequest(bool isOn) const
 {
 	QString state = isOn ? STATE_VALUE_TRUE : STATE_VALUE_FALSE;
-	return QString( "{\"%1\":{\"%2\":%3}}" ).arg(STATE_ON, STATE_ONOFF_VALUE, state);
+	return QString("{\"%1\":{\"%2\":%3}}").arg(STATE_ON, STATE_ONOFF_VALUE, state);
 }

 QJsonDocument LedDeviceNanoleaf::changeToExternalControlMode()
@@ -518,15 +520,14 @@ QJsonDocument LedDeviceNanoleaf::changeToExternalControlMode()
 	//Enable UDP Mode v2

 	_restApi->setPath(API_EFFECT);
-	httpResponse response =_restApi->put(API_EXT_MODE_STRING_V2);
+	httpResponse response = _restApi->put(API_EXT_MODE_STRING_V2);

 	return response.getBody();
 }

-int LedDeviceNanoleaf::write(const std::vector<ColorRgb> & ledValues)
+int LedDeviceNanoleaf::write(const std::vector<ColorRgb>& ledValues)
 {
 	int retVal = 0;
-	uint udpBufferSize;

 	//
 	//    nPanels         2B
@@ -537,35 +538,27 @@ int LedDeviceNanoleaf::write(const std::vector<ColorRgb> & ledValues)
 	//
 	// Note: Nanoleaf Light Panels (Aurora) now support External Control V2 (tested with FW 3.2.0)

-	udpBufferSize = _panelLedCount * 8 + 2;
-	std::vector<uint8_t> udpbuffer;
+	int udpBufferSize = STREAM_FRAME_PANEL_NUM_SIZE + _panelLedCount * STREAM_FRAME_PANEL_INFO_SIZE;
+
+	QByteArray udpbuffer;
 	udpbuffer.resize(udpBufferSize);

-	uchar lowByte;  // lower byte
-	uchar highByte; // upper byte
-
-	uint i=0;
+	int i = 0;

 	// Set number of panels
-	highByte = static_cast<uchar>(_panelLedCount >>8   );
-	lowByte  = static_cast<uchar>(_panelLedCount & 0xFF);
-
-	udpbuffer[i++] = highByte;
-	udpbuffer[i++] = lowByte;
+	qToBigEndian<quint16>(static_cast<quint16>(_panelLedCount), udpbuffer.data() + i);
+	i += 2;

 	ColorRgb color;

 	//Maintain LED counter independent from PanelCounter
-	uint ledCounter = 0;
-	for ( uint panelCounter=0; panelCounter < _panelLedCount; panelCounter++ )
+	int ledCounter = 0;
+	for (int panelCounter = 0; panelCounter < _panelLedCount; panelCounter++)
 	{
-		uint panelID = _panelIds[panelCounter];
-
-		highByte = static_cast<uchar>(panelID >>8   );
-		lowByte  = static_cast<uchar>(panelID & 0xFF);
+		int panelID = _panelIds[panelCounter];

 		// Set panels configured
-		if( panelCounter >= _startPos && panelCounter <= _endPos )  {
+		if (panelCounter >= _startPos && panelCounter <= _endPos) {
 			color = static_cast<ColorRgb>(ledValues.at(ledCounter));
 			++ledCounter;
 		}
@@ -573,49 +566,35 @@ int LedDeviceNanoleaf::write(const std::vector<ColorRgb> & ledValues)
 		{
 			// Set panels not configured to black;
 			color = ColorRgb::BLACK;
-			DebugIf(verbose3, _log, "[%u] >= panelLedCount [%u] => Set to BLACK", panelCounter, _panelLedCount );
+			DebugIf(verbose3, _log, "[%d] >= panelLedCount [%d] => Set to BLACK", panelCounter, _panelLedCount);
 		}

 		// Set panelID
-		udpbuffer[i++] = highByte;
-		udpbuffer[i++] = lowByte;
+		qToBigEndian<quint16>(static_cast<quint16>(panelID), udpbuffer.data() + i);
+		i += 2;

 		// Set panel's color LEDs
-		udpbuffer[i++] = color.red;
-		udpbuffer[i++] = color.green;
-		udpbuffer[i++] = color.blue;
+		udpbuffer[i++] = static_cast<char>(color.red);
+		udpbuffer[i++] = static_cast<char>(color.green);
+		udpbuffer[i++] = static_cast<char>(color.blue);

 		// Set white LED
 		udpbuffer[i++] = 0; // W not set manually

 		// Set transition time
 		unsigned char tranitionTime = 1; // currently fixed at value 1 which corresponds to 100ms
+		qToBigEndian<quint16>(static_cast<quint16>(tranitionTime), udpbuffer.data() + i);
+		i += 2;

-		highByte = static_cast<uchar>(tranitionTime >>8   );
-		lowByte  = static_cast<uchar>(tranitionTime & 0xFF);
-
-		udpbuffer[i++] = highByte;
-		udpbuffer[i++] = lowByte;
-		DebugIf(verbose3, _log, "[%u] Color: {%u,%u,%u}", panelCounter, color.red, color.green, color.blue );
-
+		DebugIf(verbose3, _log, "[%u] Color: {%u,%u,%u}", panelCounter, color.red, color.green, color.blue);
 	}
-	DebugIf(verbose3, _log, "UDP-Address [%s], UDP-Port [%u], udpBufferSize[%u], Bytes to send [%u]", QSTRING_CSTR(_address.toString()), _port, udpBufferSize, i);
-	DebugIf(verbose3, _log, "[%s]", uint8_vector_to_hex_string(udpbuffer).c_str() );

-	retVal &= writeBytes( i , udpbuffer.data());
-	DebugIf(verbose3, _log, "writeBytes(): [%d]",retVal);
+	if (verbose3)
+	{
+		Debug(_log, "UDP-Address [%s], UDP-Port [%u], udpBufferSize[%d], Bytes to send [%d]", QSTRING_CSTR(_address.toString()), _port, udpBufferSize, i);
+		Debug( _log, "packet: [%s]", QSTRING_CSTR(toHex(udpbuffer, 64)));
+	}
+
+	retVal = writeBytes(udpbuffer);
 	return retVal;
 }
-
-std::string LedDeviceNanoleaf::uint8_vector_to_hex_string(const std::vector<uint8_t>& buffer) const
-{
-	std::stringstream ss;
-	ss << std::hex << std::setfill('0');
-	std::vector<uint8_t>::const_iterator it;
-
-	for (it = buffer.begin(); it != buffer.end(); ++it)
-	{
-		ss << " " << std::setw(2) << static_cast<unsigned>(*it);
-	}
-	return ss.str();
-}