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>
232 lines
5.2 KiB
C++
232 lines
5.2 KiB
C++
#pragma once
|
|
|
|
// qt includes
|
|
#include <QObject>
|
|
#include <QString>
|
|
#include <QJsonObject>
|
|
#include <QJsonArray>
|
|
#include <QJsonDocument>
|
|
#include <QTimer>
|
|
|
|
// STL includes
|
|
#include <vector>
|
|
#include <map>
|
|
#include <algorithm>
|
|
|
|
// Utility includes
|
|
#include <utils/ColorRgb.h>
|
|
#include <utils/ColorRgbw.h>
|
|
#include <utils/RgbToRgbw.h>
|
|
#include <utils/Logger.h>
|
|
#include <functional>
|
|
#include <utils/Components.h>
|
|
|
|
class LedDevice;
|
|
|
|
typedef LedDevice* ( *LedDeviceCreateFuncType ) ( const QJsonObject& );
|
|
typedef std::map<QString,LedDeviceCreateFuncType> LedDeviceRegistry;
|
|
|
|
///
|
|
/// Interface (pure virtual base class) for LedDevices.
|
|
///
|
|
class LedDevice : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
LedDevice(const QJsonObject& config = QJsonObject(), QObject* parent = nullptr);
|
|
virtual ~LedDevice();
|
|
|
|
///
|
|
/// @brief Get color order of device
|
|
/// @return The color order
|
|
///
|
|
const QString & getColorOrder() const { return _colorOrder; }
|
|
|
|
///
|
|
/// @brief Set the current active ledDevice type
|
|
///
|
|
/// @param deviceType Device's type
|
|
///
|
|
void setActiveDeviceType(const QString& deviceType);
|
|
|
|
///
|
|
/// @brief Get the current active ledDevice type
|
|
///
|
|
const QString & getActiveDeviceType() const { return _activeDeviceType; }
|
|
|
|
void setLedCount(unsigned int ledCount);
|
|
unsigned int getLedCount() const { return _ledCount; }
|
|
|
|
bool enabled() const { return _enabled; }
|
|
|
|
int getLatchTime() const { return _latchTime_ms; }
|
|
void setLatchTime( int latchTime_ms );
|
|
|
|
///
|
|
/// Check, if device is ready to be used
|
|
/// i.e. initialisation and configuration were successfull
|
|
///
|
|
/// @return True if device is ready
|
|
///
|
|
bool isReady() const { return _deviceReady; }
|
|
|
|
///
|
|
/// Check, if device is in error state
|
|
///
|
|
/// @return True if device is in error
|
|
///
|
|
bool isInError() const { return _deviceInError; }
|
|
|
|
inline bool componentState() const { return enabled(); }
|
|
|
|
/// Prints the RGB-Color values to stdout.
|
|
///
|
|
/// @param[in] ledValues The RGB-color per led
|
|
///
|
|
static void printLedValues (const std::vector<ColorRgb>& ledValues );
|
|
|
|
|
|
public slots:
|
|
///
|
|
/// Is called on thread start, all construction tasks and init should run here
|
|
///
|
|
virtual void start() { _deviceReady = (open() == 0 ? true : false);}
|
|
|
|
///
|
|
/// Update the RGB-Color values to the leds.
|
|
/// Handles refreshing of leds.
|
|
///
|
|
/// @param[in] ledValues The RGB-color per led
|
|
/// @return Zero on success else negative (i.e. device is not ready)
|
|
///
|
|
virtual int updateLeds(const std::vector<ColorRgb>& ledValues);
|
|
|
|
///
|
|
/// Closes the output device.
|
|
/// Includes switching-off the device and stopping refreshes
|
|
///
|
|
virtual void close();
|
|
|
|
///
|
|
/// Enables/disables the device for output.
|
|
/// If the device is not ready, it will not be enabled
|
|
///
|
|
/// @param enable The new state of the device
|
|
///
|
|
void setEnable(bool enable); ///
|
|
|
|
signals:
|
|
///
|
|
/// Emits whenever the led device switches between on/off
|
|
/// @param newState The new state of the device
|
|
///
|
|
void enableStateChanged(bool newState);
|
|
|
|
protected:
|
|
|
|
///
|
|
/// Initialise a device's configuration
|
|
///
|
|
/// @param deviceConfig the json device config
|
|
/// @return True if success
|
|
///
|
|
virtual bool init(const QJsonObject &deviceConfig);
|
|
|
|
///
|
|
/// Opens and initiatialises the output device
|
|
///
|
|
/// @return Zero on succes (i.e. device is ready and enabled) else negative
|
|
///
|
|
virtual int open();
|
|
|
|
///
|
|
/// Writes the RGB-Color values to the leds.
|
|
///
|
|
/// @param[in] ledValues The RGB-color per led
|
|
///
|
|
/// @return Zero on success else negative
|
|
///
|
|
virtual int write(const std::vector<ColorRgb>& ledValues) = 0;
|
|
|
|
///
|
|
/// Writes "BLACK" to the output stream
|
|
///
|
|
/// @return Zero on success else negative
|
|
///
|
|
virtual int writeBlack();
|
|
|
|
// Helper to pipe device config from constructor to start()
|
|
QJsonObject _devConfig;
|
|
|
|
/// The common Logger instance for all LedDevices
|
|
Logger * _log;
|
|
|
|
/// The buffer containing the packed RGB values
|
|
std::vector<uint8_t> _ledBuffer;
|
|
|
|
bool _deviceReady;
|
|
bool _deviceInError;
|
|
|
|
QString _activeDeviceType;
|
|
|
|
unsigned int _ledCount;
|
|
unsigned int _ledRGBCount;
|
|
unsigned int _ledRGBWCount;
|
|
|
|
/// Timer object which makes sure that led data is written at a minimum rate
|
|
/// e.g. Adalight device will switch off when it does not receive data at least every 15 seconds
|
|
QTimer* _refresh_timer;
|
|
int _refresh_timer_interval;
|
|
|
|
/// timestamp of last write
|
|
qint64 _last_write_time;
|
|
|
|
/// Time a device requires mandatorily between two writes
|
|
int _latchTime_ms;
|
|
|
|
|
|
protected slots:
|
|
|
|
/// Write the last data to the leds again
|
|
///
|
|
/// @return Zero on success else negative
|
|
///
|
|
int rewriteLeds();
|
|
|
|
/// Switch the leds off
|
|
/// Writes "Black to LED" or may switch-off the LED hardware, if supported
|
|
///
|
|
virtual int switchOff();
|
|
|
|
/// Switch the leds on
|
|
/// May switch-on the LED hardware, if supported
|
|
///
|
|
virtual int switchOn();
|
|
|
|
/// Set device in error state
|
|
///
|
|
/// @param errorMsg The error message to be logged
|
|
///
|
|
virtual void setInError( const QString& errorMsg);
|
|
|
|
private:
|
|
|
|
/// Start new refresh cycle
|
|
///
|
|
void startRefreshTimer();
|
|
|
|
/// Stop refresh cycle
|
|
///
|
|
void stopRefreshTimer();
|
|
|
|
|
|
bool _componentRegistered;
|
|
bool _enabled;
|
|
bool _refresh_enabled;
|
|
QString _colorOrder;
|
|
|
|
/// Last LED values written
|
|
std::vector<ColorRgb> _last_ledValues;
|
|
};
|