ETM-Schurig/powersync-zigbee
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make built with gcc9 and fix compiler deprecated warnings

Browse Source
This commit is contained in:
Simon Stürz 2020-05-29 09:21:34 +02:00
parent 4c4f540f21
commit 9196ff83cf
5 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libnymea-zigbee/zigbeechannelmask.cpp
View File

@ -33,6 +33,11 @@ ZigbeeChannelMask::ZigbeeChannelMask()
} }
ZigbeeChannelMask::ZigbeeChannelMask(const ZigbeeChannelMask &other)
{
m_channelMask = other.toUInt32();
}
ZigbeeChannelMask::ZigbeeChannelMask(quint32 channelMask) : ZigbeeChannelMask::ZigbeeChannelMask(quint32 channelMask) :
m_channelMask(channelMask) m_channelMask(channelMask)
{ {

1
libnymea-zigbee/zigbeechannelmask.h
View File

@ -46,6 +46,7 @@ public:
Q_ENUM(ChannelConfiguration) Q_ENUM(ChannelConfiguration)
ZigbeeChannelMask(); ZigbeeChannelMask();
ZigbeeChannelMask(const ZigbeeChannelMask &other);
ZigbeeChannelMask(quint32 channelMask); ZigbeeChannelMask(quint32 channelMask);
ZigbeeChannelMask(Zigbee::ZigbeeChannels channels); ZigbeeChannelMask(Zigbee::ZigbeeChannels channels);

6
libnymea-zigbee/zigbeedatatype.cpp
View File

@ -36,6 +36,12 @@ ZigbeeDataType::ZigbeeDataType()
setDataType(Zigbee::NoData); setDataType(Zigbee::NoData);
} }
ZigbeeDataType::ZigbeeDataType(const ZigbeeDataType &other)
{
setDataType(other.dataType());
m_data = other.data();
}
ZigbeeDataType::ZigbeeDataType(Zigbee::DataType dataType, const QByteArray &data): ZigbeeDataType::ZigbeeDataType(Zigbee::DataType dataType, const QByteArray &data):
m_data(data) m_data(data)
{ {

1
libnymea-zigbee/zigbeedatatype.h
View File

@ -35,6 +35,7 @@ class ZigbeeDataType
{ {
public: public:
ZigbeeDataType(); ZigbeeDataType();
ZigbeeDataType(const ZigbeeDataType &other);
ZigbeeDataType(Zigbee::DataType dataType, const QByteArray &data = QByteArray()); ZigbeeDataType(Zigbee::DataType dataType, const QByteArray &data = QByteArray());
// From uint // From uint

3
libnymea-zigbee/zigbeenode.h
View File

@ -126,7 +126,7 @@ public:
} ServerMask; } ServerMask;
typedef struct NodeDescriptor { typedef struct NodeDescriptor {
NodeType nodeType = NodeTypeRouter; NodeType nodeType = NodeTypeEndDevice;
bool complexDescriptorAvailable = false; bool complexDescriptorAvailable = false;
bool userDescriptorAvailable = false; bool userDescriptorAvailable = false;
FrequencyBand frequencyBand = FrequencyBand2400Mhz; FrequencyBand frequencyBand = FrequencyBand2400Mhz;
@ -288,7 +288,6 @@ private:
void readModelIdentifier(ZigbeeClusterBasic *basicCluster); void readModelIdentifier(ZigbeeClusterBasic *basicCluster);
void readSoftwareBuildId(ZigbeeClusterBasic *basicCluster); void readSoftwareBuildId(ZigbeeClusterBasic *basicCluster);
signals: signals:
void stateChanged(State state); void stateChanged(State state);
void connectedChanged(bool connected); void connectedChanged(bool connected);