mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
LED Device Features, Fixes and Refactoring (Resubmit PR855) (#875)
* Refactor LedDevices - Initial version * Small renamings * Add WLED as own device * Lpd8806 Remove open() method * remove dependency on Qt 5.10 * Lpd8806 Remove open() method * Update WS281x * Update WS2812SPI * Add writeBlack for WLED powerOff * WLED remove extra bracket * Allow different Nanoleaf panel numbering sequence (Feature req.#827) * build(deps): bump websocket-extensions from 0.1.3 to 0.1.4 in /docs (#826) * Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. - [Release notes](https://github.com/faye/websocket-extensions-node/releases) - [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md) - [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4) * Fix typos * Nanoleaf clean-up * Yeelight support, generalize wizard elements * Update Yeelight to handle quota in music mode * Yeelight extend rage for extraTimeDarkness for testing * Clean-up - Add commentary, Remove development debug statements * Fix brightnessSwitchOffOnMinimum typo and default value * Yeelight support restoreOriginalState, additional Fixes * WLED - Remove UDP-Port, as it is not configurable * Fix merging issue * Remove QHostAddress::operator=(const QString&)' is deprecated * Windows compile errors and (Qt 5.15 deprecation) warnings * Fix order includes * LedDeviceFile Support Qt5.7 and greater * Windows compatibility and other Fixes * Fix Qt Version compatability * Rs232 - Resolve portname from unix /dev/ style, fix DMX sub-type support * Disable WLED Wizard Button (until Wizard is available) * Yeelight updates * Add wrong log-type as per #505 * Fixes and Clean-up after clang-tidy report * Fix udpe131 not enabled for generated CID * Change timer into dynamic for Qt Thread-Affinity * Hue clean-up and diyHue workaround * Updates after review feedback by m-seker * Add "chrono" includes
This commit is contained in:
LordGrey
GitHub
@@ -1,13 +1,12 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QSerialPort>
|
||||
#include <QTimer>
|
||||
#include <QString>
|
||||
#ifndef PROVIDERRS232_H
|
||||
#define PROVIDERRS232_H
|
||||
|
||||
// LedDevice includes
|
||||
#include <leddevice/LedDevice.h>
|
||||
|
||||
// qt includes
|
||||
#include <QSerialPort>
|
||||
|
||||
///
|
||||
/// The ProviderRs232 implements an abstract base-class for LedDevices using a RS232-device.
|
||||
///
|
||||
@@ -16,91 +15,106 @@ class ProviderRs232 : public LedDevice
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
|
||||
///
|
||||
/// Constructs specific LedDevice
|
||||
/// @brief Constructs a RS232 LED-device
|
||||
///
|
||||
ProviderRs232();
|
||||
|
||||
///
|
||||
/// Sets configuration
|
||||
///
|
||||
/// @param deviceConfig the json device config
|
||||
/// @return true if success
|
||||
virtual bool init(const QJsonObject &deviceConfig) override;
|
||||
|
||||
///
|
||||
/// Destructor of the LedDevice; closes the output device if it is open
|
||||
/// @brief Destructor of the UDP LED-device
|
||||
///
|
||||
virtual ~ProviderRs232() override;
|
||||
|
||||
///
|
||||
/// Opens and configures the output device
|
||||
///
|
||||
/// @return Zero on succes else negative
|
||||
///
|
||||
int open() override;
|
||||
|
||||
public slots:
|
||||
///
|
||||
/// Closes the output device.
|
||||
/// Includes switching-off the device and stopping refreshes
|
||||
///
|
||||
virtual void close() override;
|
||||
|
||||
private slots:
|
||||
|
||||
/// Unblock the device after a connection delay
|
||||
void writeTimeout();
|
||||
void unblockAfterDelay();
|
||||
void error(QSerialPort::SerialPortError setInError);
|
||||
void bytesWritten(qint64 bytes);
|
||||
void readyRead();
|
||||
|
||||
signals:
|
||||
void receivedData(QByteArray data);
|
||||
|
||||
protected:
|
||||
/**
|
||||
* Writes the given bytes to the RS232-device and
|
||||
*
|
||||
* @param[in[ size The length of the data
|
||||
* @param[in] data The data
|
||||
*
|
||||
* @return Zero on success else negative
|
||||
*/
|
||||
|
||||
///
|
||||
/// @brief Initialise the RS232 device's configuration and network address details
|
||||
///
|
||||
/// @param[in] deviceConfig the JSON device configuration
|
||||
/// @return True, if success
|
||||
///
|
||||
virtual bool init(const QJsonObject &deviceConfig) override;
|
||||
|
||||
///
|
||||
/// @brief Opens the output device.
|
||||
///
|
||||
/// @return Zero on success (i.e. device is ready), else negative
|
||||
///
|
||||
virtual int open() override;
|
||||
|
||||
///
|
||||
/// @brief Closes the UDP device.
|
||||
///
|
||||
/// @return Zero on success (i.e. device is closed), else negative
|
||||
///
|
||||
virtual int close() override;
|
||||
|
||||
///
|
||||
/// @brief Power-/turn off a RS232-device
|
||||
///
|
||||
/// The off-state is simulated by writing "Black to LED"
|
||||
///
|
||||
/// @return True, if success
|
||||
///
|
||||
virtual bool powerOff() override;
|
||||
|
||||
///
|
||||
/// @brief Discover first devices of a serial device available (for configuration)
|
||||
///
|
||||
/// @return A string of the device found
|
||||
///
|
||||
virtual QString discoverFirst() override;
|
||||
|
||||
///
|
||||
/// @brief Discover RS232 serial devices available (for configuration).
|
||||
///
|
||||
/// @return A JSON structure holding a list of devices found
|
||||
///
|
||||
virtual QJsonObject discover() override;
|
||||
|
||||
///
|
||||
/// @brief Write the given bytes to the RS232-device
|
||||
///
|
||||
/// @param[in[ size The length of the data
|
||||
/// @param[in] data The data
|
||||
/// @return Zero on success, else negative
|
||||
///
|
||||
int writeBytes(const qint64 size, const uint8_t *data);
|
||||
|
||||
void closeDevice();
|
||||
|
||||
QString findSerialDevice();
|
||||
|
||||
// tries to open device if not opened
|
||||
bool tryOpen(const int delayAfterConnect_ms);
|
||||
|
||||
|
||||
/// The name of the output device
|
||||
QString _deviceName;
|
||||
|
||||
/// The used baudrate of the output device
|
||||
/// The RS232 serial-device
|
||||
QSerialPort _rs232Port;
|
||||
/// The used baud-rate of the output device
|
||||
qint32 _baudRate_Hz;
|
||||
|
||||
protected slots:
|
||||
|
||||
///
|
||||
/// @brief Set device in error state
|
||||
///
|
||||
/// @param errorMsg The error message to be logged
|
||||
///
|
||||
virtual void setInError( const QString& errorMsg) override;
|
||||
|
||||
private:
|
||||
|
||||
///
|
||||
/// @brief Try to open device if not opened
|
||||
///
|
||||
/// @return True,if on success
|
||||
///
|
||||
bool tryOpen(const int delayAfterConnect_ms);
|
||||
|
||||
/// Try to auto-discover device name?
|
||||
bool _isAutoDeviceName;
|
||||
|
||||
/// Sleep after the connect before continuing
|
||||
int _delayAfterConnect_ms;
|
||||
|
||||
/// The RS232 serial-device
|
||||
QSerialPort _rs232Port;
|
||||
|
||||
/// A timeout timer for the asynchronous connection
|
||||
QTimer _writeTimeout;
|
||||
|
||||
bool _blockedForDelay;
|
||||
|
||||
bool _stateChanged;
|
||||
|
||||
qint64 _bytesToWrite;
|
||||
qint64 _frameDropCounter;
|
||||
QSerialPort::SerialPortError _lastError;
|
||||
qint64 _preOpenDelayTimeOut;
|
||||
int _preOpenDelay;
|
||||
bool _enableAutoDeviceName;
|
||||
/// Frames dropped, as write failed
|
||||
int _frameDropCounter;
|
||||
};
|
||||
|
||||
#endif // PROVIDERRS232_H
|
||||
|
||||
Reference in New Issue
Block a user