From 1dd3406120d2a2ea8857adefa5a6030750c52e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 15 Dec 2020 16:43:56 +0100 Subject: [PATCH] Update IAS Zone cluster --- libnymea-zigbee/zcl/security/zigbeeclusteriaszone.cpp | 7 +++++-- libnymea-zigbee/zcl/security/zigbeeclusteriaszone.h | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libnymea-zigbee/zcl/security/zigbeeclusteriaszone.cpp b/libnymea-zigbee/zcl/security/zigbeeclusteriaszone.cpp index d71f8b1..ebc9619 100644 --- a/libnymea-zigbee/zcl/security/zigbeeclusteriaszone.cpp +++ b/libnymea-zigbee/zcl/security/zigbeeclusteriaszone.cpp @@ -49,7 +49,7 @@ ZigbeeClusterIasZone::ZoneType ZigbeeClusterIasZone::zoneType() const return m_zoneType; } -ZigbeeClusterIasZone::ZoneStatus ZigbeeClusterIasZone::zoneStatus() const +ZigbeeClusterIasZone::ZoneStatusFlags ZigbeeClusterIasZone::zoneStatus() const { return m_zoneStatus; } @@ -62,12 +62,15 @@ void ZigbeeClusterIasZone::setAttribute(const ZigbeeClusterAttribute &attribute) if (attribute.id() == AttributeZoneState) { quint8 zoneStateInt = attribute.dataType().toUInt8(); m_zoneState = static_cast(zoneStateInt); + qCDebug(dcZigbeeCluster()) << m_node << m_endpoint << m_zoneState; } else if (attribute.id() == AttributeZoneType) { quint16 zoneTypeInt = attribute.dataType().toUInt16(); m_zoneType = static_cast(zoneTypeInt); + qCDebug(dcZigbeeCluster()) << m_node << m_endpoint << m_zoneType; } else if (attribute.id() == AttributeZoneStatus) { quint16 zoneStatusInt = attribute.dataType().toUInt16(); - m_zoneStatus = ZoneStatus(zoneStatusInt); + m_zoneStatus = ZoneStatusFlags(zoneStatusInt); + qCDebug(dcZigbeeCluster()) << m_node << m_endpoint << m_zoneStatus; } } diff --git a/libnymea-zigbee/zcl/security/zigbeeclusteriaszone.h b/libnymea-zigbee/zcl/security/zigbeeclusteriaszone.h index 2d0d554..c9a1a5d 100644 --- a/libnymea-zigbee/zcl/security/zigbeeclusteriaszone.h +++ b/libnymea-zigbee/zcl/security/zigbeeclusteriaszone.h @@ -125,12 +125,12 @@ public: ZoneState zoneState() const; ZoneType zoneType() const; - ZoneStatus zoneStatus() const; + ZoneStatusFlags zoneStatus() const; private: ZoneState m_zoneState = ZoneStateNotEnrolled; ZoneType m_zoneType = ZoneTypeInvalidZone; - ZoneStatus m_zoneStatus; + ZoneStatusFlags m_zoneStatus; void setAttribute(const ZigbeeClusterAttribute &attribute) override;