ETM-Schurig
/
nymea-zigbee
mirror of https://github.com/nymea/nymea-zigbee
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix serial port error declaration for older qt versions

pull/8/head
Simon Stürz 2020-10-21 08:39:35 +02:00
parent 0847bb35a5
commit 5f2560d380
5 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnymea-zigbee/backends/deconz/interface/zigbeeinterfacedeconz.cpp
View File

@ -34,12 +34,8 @@
// SLIP: https://tools.ietf.org/html/rfc1055 // SLIP: https://tools.ietf.org/html/rfc1055
Q_DECLARE_METATYPE(QSerialPort::SerialPortError);
ZigbeeInterfaceDeconz::ZigbeeInterfaceDeconz(QObject *parent) : QObject(parent) ZigbeeInterfaceDeconz::ZigbeeInterfaceDeconz(QObject *parent) : QObject(parent)
{ {
qRegisterMetaType<QSerialPort::SerialPortError>();
m_reconnectTimer = new QTimer(this); m_reconnectTimer = new QTimer(this);
m_reconnectTimer->setSingleShot(true); m_reconnectTimer->setSingleShot(true);
m_reconnectTimer->setInterval(5000); m_reconnectTimer->setInterval(5000);

4
libnymea-zigbee/backends/nxp/interface/zigbeeinterfacenxp.cpp
View File

@ -34,12 +34,8 @@
// SLIP: https://tools.ietf.org/html/rfc1055 // SLIP: https://tools.ietf.org/html/rfc1055
Q_DECLARE_METATYPE(QSerialPort::SerialPortError);
ZigbeeInterfaceNxp::ZigbeeInterfaceNxp(QObject *parent) : QObject(parent) ZigbeeInterfaceNxp::ZigbeeInterfaceNxp(QObject *parent) : QObject(parent)
{ {
qRegisterMetaType<QSerialPort::SerialPortError>();
m_reconnectTimer = new QTimer(this); m_reconnectTimer = new QTimer(this);
m_reconnectTimer->setSingleShot(true); m_reconnectTimer->setSingleShot(true);
m_reconnectTimer->setInterval(5000); m_reconnectTimer->setInterval(5000);

2
libnymea-zigbee/zigbeebridgecontroller.cpp
View File

@ -30,7 +30,7 @@
ZigbeeBridgeController::ZigbeeBridgeController(QObject *parent) : QObject(parent) ZigbeeBridgeController::ZigbeeBridgeController(QObject *parent) : QObject(parent)
{ {
qRegisterMetaType<QSerialPort::SerialPortError>();
} }
QString ZigbeeBridgeController::firmwareVersion() const QString ZigbeeBridgeController::firmwareVersion() const

4
libnymea-zigbee/zigbeebridgecontroller.h
View File

@ -29,9 +29,11 @@
#define ZIGBEEBRIDGECONTROLLER_H #define ZIGBEEBRIDGECONTROLLER_H
#include <QObject> #include <QObject>
#include <QSerialPort>
#include "zigbee.h" #include "zigbee.h"
Q_DECLARE_METATYPE(QSerialPort::SerialPortError);
class ZigbeeBridgeController : public QObject class ZigbeeBridgeController : public QObject
{ {
Q_OBJECT Q_OBJECT

2
nymea-zigbee.pro
View File

@ -1,4 +1,4 @@
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered
SUBDIRS += libnymea-zigbee zigbee-cli SUBDIRS += libnymea-zigbee #zigbee-cli