Stop LedDevice:write for disabled devices + Nanoleaf Fixes (#629)

* Handle Exceptions in main & Pythoninit

* Have SSDPDiscover generic again

* Have SSDPDiscover generic again

* Change Info- to Debug logs as technical service messages

* Nanoleaf - When switched on, ensure UDP mode

* Include SQL Database in Cross-Compile instructions

* Fix Clazy (QT code checker) and clang Warnings

* Stop LedDevice:write for disabled device

* Nanoleaf: Fix uint printfs

* NanoLeaf: Fix indents to tabs

* NanoLeaf - Add debug verbosity switches

* Device switchability support, FileDevice with timestamp support

* Nanoleaf Light Panels now support External Control V2

* Enhance LedDeviceFile by Timestamp + fix readyness

* Stop color stream, if LedDevice disabled

* Nanoleaf - remove switchability
This commit is contained in:
LordGrey
2019-12-08 13:12:01 +01:00
committed by Paulchen Panther
parent f917f0fceb
commit ce7c99d2cd
14 changed files with 410 additions and 321 deletions

View File

@@ -31,6 +31,8 @@
#include <effectengine/ActiveEffectDefinition.h>
#include <effectengine/EffectSchema.h>
#include <leddevice/LedDevice.h>
// settings utils
#include <utils/settings.h>
@@ -227,7 +229,12 @@ public:
/// @brief Get the current active led device
/// @return The device nam
/// e
const QString & getActiveDevice();
const QString & getActiveDeviceType();
///
/// @brief Get pointer to current LedDevice
///
LedDevice * getActiveDevice() const;
public slots:
///

View File

@@ -51,8 +51,18 @@ public:
///
const QString & getColorOrder() { return _colorOrder; };
void setActiveDevice(QString dev);
const QString & getActiveDevice() { return _activeDevice; };
///
/// @brief Set the current active ledDevice type
///
/// @param deviceType Device's type
///
void setActiveDeviceType(QString deviceType);
///
/// @brief Get the current active ledDevice type
///
const QString & getActiveDeviceType() { return _activeDeviceType; };
void setLedCount(int ledCount);
int getLedCount() { return _ledCount; }
@@ -66,7 +76,7 @@ public slots:
///
/// Is called on thread start, all construction tasks and init should run here
///
virtual void start() { _deviceReady = open(); };
virtual void start() { _deviceReady = (open() == 0 ? true : false);}
///
/// Writes the RGB-Color values to the leds.
@@ -102,6 +112,14 @@ protected:
///
virtual int open();
///
/// 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;
@@ -113,7 +131,7 @@ protected:
bool _deviceReady;
QString _activeDevice;
QString _activeDeviceType;
int _ledCount;
int _ledRGBCount;

View File

@@ -50,9 +50,9 @@ public:
int getLatchTime();
///
/// @brief Get the current active ledDevice
/// @brief Get the current active ledDevice type
///
const QString & getActiveDevice();
const QString & getActiveDeviceType();
///
/// @brief Return the last enable state