frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disentangle LedDevice/LinearColorSmoothing, Bug Fixes & Test support (#654)

Browse Source 
* 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

* Fix MultiColorAdjustment, if led-range is greater lednum

* Fix logging

* LedFileDevice/LedDevice - add testing support

* New "Led Test" effect

* LedDeviceFile - Add chrono include + Allow Led rewrites for testing

* Stabilize Effects for LedDevices where latchtime = 0

* Update LedDeviceFile, allow latchtime = 0

* Distangle LinearColorSmoothing and LEDDevice, Fix Effect configuration updates

* Updates LedDeviceFile - Initialize via Open

* Updates LedDeviceNanoleaf - Initialize via Open, Remove throwing exceptions

* Updates ProviderUDP - Remove throwing exceptions

* Framebuffer - Use precise timer

* TestSpi - Align to LedDevice updates

* Pretty Print CrossCompileHowTo as markdown-file

* Ensure that output is only written when LedDevice is ready

* Align APA102 Device to new device staging

* Logger - Remove clang warnings on extra semicolon

* Devices SPI - Align to Device stages and methods

* Fix cppcheck and clang findings

* Add Code-Template for new Devices

* Align devices to stages and methods, clean-up some code

* Allow to reopen LedDevice without restart

* Revert change "Remove Connect (PriorityMuxer::visiblePriorityChanged -> Hyperion::update) due to double writes"

* Remove visiblePriorityChanged from LedDevice to decouple LedDevice from hyperion logic

* Expose LedDevice getLedCount and align signedness
This commit is contained in:
LordGrey
2020-02-10 15:21:58 +01:00
committed by GitHub
parent 1aba51e85c
commit ed5455458b
107 changed files with 2980 additions and 1551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
libsrc/leddevice/dev_tinker/LedDeviceTinkerforge.cpp
View File

@@ -15,92 +15,110 @@ LedDeviceTinkerforge::LedDeviceTinkerforge(const QJsonObject &deviceConfig)
, _ledStrip(nullptr)
, _colorChannelSize(0)
{
init(deviceConfig);
_devConfig = deviceConfig;
_deviceReady = false;
}
LedDeviceTinkerforge::~LedDeviceTinkerforge()
{
// Close the device (if it is opened)
if (_ipConnection != nullptr && _ledStrip != nullptr)
{
switchOff();
}
// Clean up claimed resources
delete _ipConnection;
delete _ledStrip;
}
bool LedDeviceTinkerforge::init(const QJsonObject &deviceConfig)
{
LedDevice::init(deviceConfig);
_host = deviceConfig["output"].toString("127.0.0.1");
_port = deviceConfig["port"].toInt(4223);
_uid = deviceConfig["uid"].toString();
_interval = deviceConfig["rate"].toInt();
if ((unsigned)_ledCount > MAX_NUM_LEDS)
{
Error(_log,"Invalid attempt to write led values. Not more than %d leds are allowed.", MAX_NUM_LEDS);
return -1;
}
if (_colorChannelSize < (unsigned)_ledCount)
{
_redChannel.resize(_ledCount, uint8_t(0));
_greenChannel.resize(_ledCount, uint8_t(0));
_blueChannel.resize(_ledCount, uint8_t(0));
}
_colorChannelSize = _ledCount;
return true;
}
LedDevice* LedDeviceTinkerforge::construct(const QJsonObject &deviceConfig)
{
return new LedDeviceTinkerforge(deviceConfig);
}
bool LedDeviceTinkerforge::init(const QJsonObject &deviceConfig)
{
bool isInitOK = LedDevice::init(deviceConfig);
if (isInitOK)
{
_host = deviceConfig["output"].toString("127.0.0.1");
_port = deviceConfig["port"].toInt(4223);
_uid = deviceConfig["uid"].toString();
_interval = deviceConfig["rate"].toInt();
if ((unsigned)_ledCount > MAX_NUM_LEDS)
{
QString errortext = QString ("Initialization error. Not more than %1 leds are allowed.").arg(MAX_NUM_LEDS);
this->setInError(errortext);
isInitOK = false;
}
else
{
if (_colorChannelSize < (unsigned)_ledCount)
{
_redChannel.resize(_ledCount, uint8_t(0));
_greenChannel.resize(_ledCount, uint8_t(0));
_blueChannel.resize(_ledCount, uint8_t(0));
}
_colorChannelSize = _ledCount;
isInitOK = true;
}
}
return isInitOK;
}
int LedDeviceTinkerforge::open()
{
// Check if connection is already createds
if (_ipConnection != nullptr)
int retval = -1;
QString errortext;
_deviceReady = false;
if ( init(_devConfig) )
{
Error(_log, "Attempt to open existing connection; close before opening");
return 0;
// Check if connection is already createds
if (_ipConnection != nullptr)
{
Error(_log, "Attempt to open existing connection; close before opening");
}
else
{
// Initialise a new connection
_ipConnection = new IPConnection;
ipcon_create(_ipConnection);
int connectionStatus = ipcon_connect(_ipConnection, QSTRING_CSTR(_host), _port);
if (connectionStatus < 0)
{
Error(_log, "Attempt to connect to master brick (%s:%d) failed with status %d", QSTRING_CSTR(_host), _port, connectionStatus);
}
else
{
// Create the 'LedStrip'
_ledStrip = new LEDStrip;
led_strip_create(_ledStrip, QSTRING_CSTR(_uid), _ipConnection);
int frameStatus = led_strip_set_frame_duration(_ledStrip, _interval);
if (frameStatus < 0)
{
Error(_log,"Attempt to connect to led strip bricklet (led_strip_set_frame_duration()) failed with status %d", frameStatus);
}
else
{
// Everything is OK -> enable device
_deviceReady = true;
setEnable(true);
retval = 0;
}
}
}
// On error/exceptions, set LedDevice in error
if ( retval < 0 )
{
this->setInError( "Error opening device!" );
}
}
// Initialise a new connection
_ipConnection = new IPConnection;
ipcon_create(_ipConnection);
int connectionStatus = ipcon_connect(_ipConnection, QSTRING_CSTR(_host), _port);
if (connectionStatus < 0)
{
Error(_log, "Attempt to connect to master brick (%s:%d) failed with status %d", QSTRING_CSTR(_host), _port, connectionStatus);
return 0;
}
// Create the 'LedStrip'
_ledStrip = new LEDStrip;
led_strip_create(_ledStrip, QSTRING_CSTR(_uid), _ipConnection);
int frameStatus = led_strip_set_frame_duration(_ledStrip, _interval);
if (frameStatus < 0)
{
Error(_log,"Attempt to connect to led strip bricklet (led_strip_set_frame_duration()) failed with status %d", frameStatus);
return 0;
}
return 1;
return retval;
}
int LedDeviceTinkerforge::write(const std::vector<ColorRgb> &ledValues)
{
if(!_deviceReady)
return 0;
auto redIt = _redChannel.begin();
auto greenIt = _greenChannel.begin();
auto blueIt = _blueChannel.begin();

18
libsrc/leddevice/dev_tinker/LedDeviceTinkerforge.h
View File

@@ -8,7 +8,6 @@
// Hyperion-Leddevice includes
#include <leddevice/LedDevice.h>
extern "C" {
#include <tinkerforge/ip_connection.h>
#include <tinkerforge/bricklet_led_strip.h>
@@ -22,26 +21,27 @@ public:
///
/// @param deviceConfig json device config
///
LedDeviceTinkerforge(const QJsonObject &deviceConfig);
explicit LedDeviceTinkerforge(const QJsonObject &deviceConfig);
virtual ~LedDeviceTinkerforge();
virtual ~LedDeviceTinkerforge() override;
/// constructs leddevice
static LedDevice* construct(const QJsonObject &deviceConfig);
///
/// Sets configuration
///
/// @param deviceConfig the json device config
/// @return true if success
bool init(const QJsonObject &deviceConfig);
/// constructs leddevice
static LedDevice* construct(const QJsonObject &deviceConfig);
bool init(const QJsonObject &deviceConfig) override;
protected:
///
/// Attempts to open a connection to the master bricklet and the led strip bricklet.
///
/// @return Zero on succes else negative
///
int open();
virtual int open() override;
private:
///
@@ -51,7 +51,7 @@ private:
///
/// @return Zero on success else negative
///
virtual int write(const std::vector<ColorRgb> &ledValues);
virtual int write(const std::vector<ColorRgb> &ledValues) override;
///
/// Writes the data to the led strip blicklet