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

Merge branch 'master' into refactor/led_device

Browse Source
This commit is contained in:
Murat Seker
2020-08-23 21:02:25 +02:00
committed by GitHub
parent dd2d5e4b40 bae39f667d
commit bc57a45089
272 changed files with 1711 additions and 1738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/leddevice/dev_serial/LedDeviceAdalight.h
View File

@@ -35,7 +35,7 @@ private:
/// @param[in] deviceConfig the JSON device configuration
/// @return True, if success
///
virtual bool init(const QJsonObject &deviceConfig) override;
bool init(const QJsonObject &deviceConfig) override;
///
/// @brief Writes the RGB-Color values to the LEDs.
@@ -43,7 +43,7 @@ private:
/// @param[in] ledValues The RGB-color per LED
/// @return Zero on success, else negative
///
virtual int write(const std::vector<ColorRgb> & ledValues) override;
int write(const std::vector<ColorRgb> & ledValues) override;
const short _headerSize;
bool _ligthBerryAPA102Mode;

4
libsrc/leddevice/dev_serial/LedDeviceAtmo.h
View File

@@ -30,7 +30,7 @@ private:
///
/// @param[in] deviceConfig the JSON device configuration
/// @return True, if success
virtual bool init(const QJsonObject &deviceConfig) override;
bool init(const QJsonObject &deviceConfig) override;
///
/// @brief Writes the RGB-Color values to the LEDs.
@@ -38,7 +38,7 @@ private:
/// @param[in] ledValues The RGB-color per LED
/// @return Zero on success, else negative
///
virtual int write(const std::vector<ColorRgb> &ledValues) override;
int write(const std::vector<ColorRgb> &ledValues) override;
};
#endif // LEDEVICEATMO_H

6
libsrc/leddevice/dev_serial/LedDeviceDMX.h
View File

@@ -24,7 +24,7 @@ public:
/// @param[in] deviceConfig Device's configuration as JSON-Object
/// @return LedDevice constructed
static LedDevice* construct(const QJsonObject &deviceConfig);
private:
///
@@ -33,7 +33,7 @@ private:
/// @param[in] deviceConfig the JSON device configuration
/// @return True, if success
///
virtual bool init(const QJsonObject &deviceConfig) override;
bool init(const QJsonObject &deviceConfig) override;
///
/// @brief Writes the RGB-Color values to the LEDs.
@@ -41,7 +41,7 @@ private:
/// @param[in] ledValues The RGB-color per LED
/// @return Zero on success, else negative
///
virtual int write(const std::vector<ColorRgb> &ledValues) override;
int write(const std::vector<ColorRgb> &ledValues) override;
int _dmxDeviceType = 0;
int _dmxStart = 1;

4
libsrc/leddevice/dev_serial/LedDeviceKarate.h
View File

@@ -34,14 +34,14 @@ private:
/// @param[in] deviceConfig the JSON device configuration
/// @return True, if success
///
virtual bool init(const QJsonObject &deviceConfig) override;
bool init(const QJsonObject &deviceConfig) override;
/// @brief 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) override;
int write(const std::vector<ColorRgb> &ledValues) override;
};
#endif // LEDEVICEKARATE_H

4
libsrc/leddevice/dev_serial/LedDeviceSedu.h
View File

@@ -33,7 +33,7 @@ private:
/// @param[in] deviceConfig the JSON device configuration
/// @return True, if success
///
virtual bool init(const QJsonObject &deviceConfig) override;
bool init(const QJsonObject &deviceConfig) override;
///
/// @brief Writes the RGB-Color values to the LEDs.
@@ -41,7 +41,7 @@ private:
/// @param[in] ledValues The RGB-color per LED
/// @return Zero on success, else negative
///
virtual int write(const std::vector<ColorRgb> &ledValues) override;
int write(const std::vector<ColorRgb> &ledValues) override;
};
#endif // LEDEVICESEDU_H

4
libsrc/leddevice/dev_serial/LedDeviceTpm2.h
View File

@@ -33,7 +33,7 @@ private:
/// @param[in] deviceConfig the JSON device configuration
/// @return True, if success
///
virtual bool init(const QJsonObject &deviceConfig) override;
bool init(const QJsonObject &deviceConfig) override;
///
/// @brief Writes the RGB-Color values to the LEDs.
@@ -41,7 +41,7 @@ private:
/// @param[in] ledValues The RGB-color per LED
/// @return Zero on success, else negative
///
virtual int write(const std::vector<ColorRgb> &ledValues) override;
int write(const std::vector<ColorRgb> &ledValues) override;
};
#endif // LEDEVICETPM2_H

2
libsrc/leddevice/dev_serial/ProviderRs232.cpp
View File

@@ -110,7 +110,7 @@ bool ProviderRs232::powerOff()
return rc;
}
bool ProviderRs232::tryOpen(const int delayAfterConnect_ms)
bool ProviderRs232::tryOpen(int delayAfterConnect_ms)
{
if (_deviceName.isEmpty() || _rs232Port.portName().isEmpty())
{

18
libsrc/leddevice/dev_serial/ProviderRs232.h
View File

@@ -24,7 +24,7 @@ public:
///
/// @brief Destructor of the UDP LED-device
///
virtual ~ProviderRs232() override;
~ProviderRs232() override;
protected:
@@ -34,21 +34,21 @@ protected:
/// @param[in] deviceConfig the JSON device configuration
/// @return True, if success
///
virtual bool init(const QJsonObject &deviceConfig) override;
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;
int open() override;
///
/// @brief Closes the UDP device.
///
/// @return Zero on success (i.e. device is closed), else negative
///
virtual int close() override;
int close() override;
///
/// @brief Power-/turn off a RS232-device
@@ -57,21 +57,21 @@ protected:
///
/// @return True, if success
///
virtual bool powerOff() override;
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;
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;
QJsonObject discover() override;
///
/// @brief Write the given bytes to the RS232-device
@@ -96,7 +96,7 @@ protected slots:
///
/// @param errorMsg The error message to be logged
///
virtual void setInError( const QString& errorMsg) override;
void setInError( const QString& errorMsg) override;
private:
@@ -105,7 +105,7 @@ private:
///
/// @return True,if on success
///
bool tryOpen(const int delayAfterConnect_ms);
bool tryOpen(int delayAfterConnect_ms);
/// Try to auto-discover device name?
bool _isAutoDeviceName;