mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
259becea04
* whitespaces + typo fixes * JS / LGTM fixes * SSDP Handler crash fix * MessageForwarder handlePriorityChanges Slave fixes * use aboutToQuit Signal * complete rewriten Hue Entertainment API structure combined Philips Hue and Entertainment API with new MbedTLS based SSL UDP Provider * add required cross-compile submodules * logical rebuild fn: initLeds, setLights + new logs -more detailed checks and error handling inside iniLeds and setLights - logical script procedure before ProviderUdpSSL init - first steps for multiple ProviderUdpSSL usage - better fallback support to old RestAPI, if entertainment api is not supported - just 4 u LordGrey: new log fn for cosmetic config outputs ;) * add OSX CompileHowTo - undo from CrossCompileHowTo * whitespace fixes * lightID toString fix * fix unsigned int E-API + debug output * bugfixes, reworked black signal detection, wizard: - change device config field light-ids from int to string -> real unsigned int fix - add signal detection brightness minimum threshold value 0.0 for 0% brightness - 1.0 for 100% brightness to count for blacklight signal detection reason: input may not 100% black, like mine - i have a deep dark gray input signal -> my threshold value is set to 0.005 for 0.5% minimum brightness = 1 (from max 255) to count as black - wizard optimations, with fallback without entertainment support (beta state) - whitespace fixes * cleanup + minor fixes * change fixed Hue UPD SSL config to _devConfig paras * Hotfix SSL Connection, new light models, wizard: - Fix UPD SSL Connection failed Problems - add new supported gamut C light models: LCG002, LCA001, LCA002, LCA003 - wizard: extend fallback support to classic mode + hints * whitespace, typo fix * uncheck useEntertainmentAPI, if noAPISupport detected + hint * coredump fix -> add _blackLightsTimer nullptr init * code cleanup / remove old debugs + whitespacefixes * add gamut C LCP001, LCP002 * SSL UDP config made more flexible + remove qDebug -> switch to hyerion.ng _log -> replace logCommand with verbose -> code cleanups etc... * extended mbedtls debugging infos * add adjustable ssl timeout settings * error handling * streamdebugger bugfixes * UPDSSL psk / psk_identity bugfixes! + hue wizard fn typo fix + - verbose option available without dependencies - whitespace fixes * Philips Hue Assistant now recognizes non-original bridges better... + Added note if no clientkey is set when using the entertainment API + User creation (+ clientkey) for non-original bridges can now also be used + Minor changes and bug fixes * CMAKE mbedTLS detection * minor bug fixes + code cleanups * FindMbedTLS.cmake remove Path-Hints + wizard.js: ajax timeout handling Test - content_grabber.js: run relevant code only, if V4L2_AVAIL is true: conf_grabber don't displays other devices, if V4L2 is not available * compile mbedtls via cmake as static lib * remove libmbedtls-dev from compileHowto / scripts * Fix Windows build * Fix windows build (part 2) * removed unnecessary osx x11 include directory path * QTimer Shutdown bugfix * cmake win32 fix + minor bugfixes * cmake debug msg used mbedtls libs * Bugfix: noSignalDetection wasn't switchedOn again if no signal was previously detected * Some code fixes based on alerts from lgtm.com Co-authored-by: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com>
138 lines
2.9 KiB
C++
138 lines
2.9 KiB
C++
|
|
// STL includes
|
|
#include <cstring>
|
|
#include <cstdio>
|
|
#include <iostream>
|
|
#include <exception>
|
|
// Linux includes
|
|
#include <fcntl.h>
|
|
|
|
#include <QStringList>
|
|
#include <QUdpSocket>
|
|
#include <QHostInfo>
|
|
|
|
// Local Hyperion includes
|
|
#include "ProviderUdp.h"
|
|
|
|
ProviderUdp::ProviderUdp()
|
|
: LedDevice()
|
|
, _udpSocket (nullptr)
|
|
, _port(1)
|
|
, _defaultHost("127.0.0.1")
|
|
{
|
|
_deviceReady = false;
|
|
_latchTime_ms = 1;
|
|
}
|
|
|
|
ProviderUdp::~ProviderUdp()
|
|
{
|
|
_udpSocket->deleteLater();
|
|
}
|
|
|
|
bool ProviderUdp::init(const QJsonObject &deviceConfig)
|
|
{
|
|
bool isInitOK = LedDevice::init(deviceConfig);
|
|
|
|
QString host = deviceConfig["host"].toString(_defaultHost);
|
|
|
|
if (_address.setAddress(host) )
|
|
{
|
|
Debug( _log, "Successfully parsed %s as an ip address.", deviceConfig["host"].toString().toStdString().c_str());
|
|
}
|
|
else
|
|
{
|
|
Debug( _log, "Failed to parse [%s] as an ip address.", deviceConfig["host"].toString().toStdString().c_str());
|
|
QHostInfo info = QHostInfo::fromName(host);
|
|
if (info.addresses().isEmpty())
|
|
{
|
|
Debug( _log, "Failed to parse [%s] as a hostname.", deviceConfig["host"].toString().toStdString().c_str());
|
|
QString errortext = QString ("Invalid target address [%1]!").arg(host);
|
|
this->setInError ( errortext );
|
|
return false;
|
|
}
|
|
else
|
|
{
|
|
Debug( _log, "Successfully parsed %s as a hostname.", deviceConfig["host"].toString().toStdString().c_str());
|
|
_address = info.addresses().first();
|
|
}
|
|
}
|
|
|
|
int config_port = deviceConfig["port"].toInt(_port);
|
|
if ( config_port <= 0 || config_port > MAX_PORT )
|
|
{
|
|
QString errortext = QString ("Invalid target port [%1]!").arg(config_port);
|
|
this->setInError ( errortext );
|
|
isInitOK = false;
|
|
}
|
|
else
|
|
{
|
|
_port = static_cast<int>(config_port);
|
|
Debug( _log, "UDP using %s:%d", _address.toString().toStdString().c_str() , _port );
|
|
}
|
|
|
|
return isInitOK;
|
|
}
|
|
|
|
bool ProviderUdp::initNetwork()
|
|
{
|
|
bool isInitOK = false;
|
|
|
|
_udpSocket = new QUdpSocket(this);
|
|
|
|
if ( _udpSocket != nullptr)
|
|
{
|
|
QHostAddress localAddress = QHostAddress::Any;
|
|
quint16 localPort = 0;
|
|
if ( !_udpSocket->bind(localAddress, localPort) )
|
|
{
|
|
Warning ( _log, "Could not bind local address: %s", strerror(errno));
|
|
}
|
|
isInitOK = true;
|
|
}
|
|
|
|
return isInitOK;
|
|
}
|
|
|
|
int ProviderUdp::open()
|
|
{
|
|
int retval = -1;
|
|
QString errortext;
|
|
_deviceReady = false;
|
|
|
|
if ( init(_devConfig) )
|
|
{
|
|
if ( ! initNetwork())
|
|
{
|
|
this->setInError( "UDP Network error!" );
|
|
}
|
|
else
|
|
{
|
|
// Everything is OK -> enable device
|
|
_deviceReady = true;
|
|
setEnable(true);
|
|
retval = 0;
|
|
}
|
|
}
|
|
return retval;
|
|
}
|
|
|
|
void ProviderUdp::close()
|
|
{
|
|
LedDevice::close();
|
|
|
|
// LedDevice specific closing activites
|
|
if ( _udpSocket != nullptr)
|
|
{
|
|
_udpSocket->close();
|
|
}
|
|
}
|
|
|
|
int ProviderUdp::writeBytes(const unsigned size, const uint8_t * data)
|
|
{
|
|
|
|
qint64 retVal = _udpSocket->writeDatagram((const char *)data,size,_address,_port);
|
|
WarningIf((retVal<0), _log, "Error sending: %s", strerror(errno));
|
|
|
|
return retVal;
|
|
}
|