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

Implement Electricalmeasurement server command handling

pull/58/head
Michael Zanetti 2022-07-04 14:08:44 +02:00
parent 7e436c85e4
commit ebf004af01
2 changed files with 86 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libnymea-zigbee/zcl/measurement/zigbeeclusterelectricalmeasurement.cpp
View File

@ -1,5 +1,7 @@
#include "zigbeeclusterelectricalmeasurement.h"
#include <QDateTime>
#include <QDataStream>
#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(dcZigbeeCluster)
@ -26,3 +28,48 @@ void ZigbeeClusterElectricalMeasurement::setAttribute(const ZigbeeClusterAttribu
break;
}
}
void ZigbeeClusterElectricalMeasurement::processDataIndication(ZigbeeClusterLibrary::Frame frame)
{
switch (m_direction) {
case Client:
qCWarning(dcZigbeeCluster()) << "ElectricalMeasurement: Unhandled ZCL indication in" << m_node << m_endpoint << this << frame;
break;
case Server:
ServerCommand command = static_cast<ServerCommand>(frame.header.command);
switch (command) {
case CommandGetProfileInfoResponse: {
QDataStream stream(frame.payload);
stream.setByteOrder(QDataStream::LittleEndian);
quint8 profileCount, profileIntervalPeriod, maxNumberOfIntervals;
QList<quint16> attributes;
stream >> profileCount >> profileIntervalPeriod >> maxNumberOfIntervals;
while (!stream.atEnd()) {
stream >> attributes;
}
qCDebug(dcZigbeeCluster()) << "ElectricalMeasurement: GetProfileInfoResponse received:" << profileCount << static_cast<ProfileIntervalPeriod>(profileIntervalPeriod) << maxNumberOfIntervals << attributes;
emit getProfileInfoResponse(profileCount, static_cast<ProfileIntervalPeriod>(profileIntervalPeriod), maxNumberOfIntervals, attributes);
break;
}
case CommandGetMeasurementProfileResponse: {
QDataStream stream(frame.payload);
stream.setByteOrder(QDataStream::LittleEndian);
quint32 startTime;
// According to the spec, attributeId is 1 octet, however, normally an attributeId is 2 octets...
quint8 status, profileIntervalPeriod, numberOfIntevalsDelivered, attributeId;
QList<quint16> values;
stream >> startTime >> status >> profileIntervalPeriod >> numberOfIntevalsDelivered >> attributeId;
while (!stream.atEnd()) {
stream >> values;
}
qCDebug(dcZigbeeCluster()) << "ElectricalMeasurement: GetMeasurementProfileInfoResponse:" << QDateTime::fromMSecsSinceEpoch((qulonglong)startTime * 1000) << static_cast<MeasurementStatus>(status) << static_cast<ProfileIntervalPeriod>(profileIntervalPeriod) << numberOfIntevalsDelivered << attributeId << values;
emit getMeasurementProfileInfoResponse(QDateTime::fromMSecsSinceEpoch((qulonglong)startTime * 1000), static_cast<MeasurementStatus>(status), static_cast<ProfileIntervalPeriod>(profileIntervalPeriod), numberOfIntevalsDelivered, attributeId, values);
break;
}
default:
qCInfo(dcZigbeeCluster()) << "ElectricalMeasurement: Ignoring out of spec command:" << m_node << m_endpoint << this << frame << m_direction;
}
break;
}
}

39
libnymea-zigbee/zcl/measurement/zigbeeclusterelectricalmeasurement.h
View File

@ -225,6 +225,39 @@ public:
Q_DECLARE_FLAGS(ACAlarmsMask, ACAlarm)
Q_FLAG(ACAlarmsMask)
enum ProfileIntervalPeriod {
ProfileIntervalPeriodDaily = 0x00,
ProfileIntervalPeriod60Minutes = 0x01,
ProfileIntervalPeriod30Minutes = 0x02,
ProfileIntervalPeriod15Minutes = 0x03,
ProfileIntervalPeriod10Minutes = 0x04,
ProfileIntervalPeriod7p5Minutes = 0x05,
ProfileIntervalPeriod5Minutes = 0x06,
ProfileIntervalPeriod2p5Minutes = 0x07
};
Q_ENUM(ProfileIntervalPeriod)
enum MeasurementStatus {
MeasurementStatusSuccess = 0x00,
MeasurementTypeAttributeProfileNotSupported = 0x01,
MeasurementStatusInvalidStartTime = 0x02,
MeasurementStatusMoreIntervalsRequestedThanCanBeReturned = 0x03,
MeasurementTypeNoIntervalsAvailableForRequestedTime = 0x04
};
Q_ENUM(MeasurementStatus)
enum ClientCommand {
CommandGetProfileInfo = 0x00,
CommandGetMeasurementProfileInfo = 0x01
};
Q_ENUM(ClientCommand)
enum ServerCommand {
CommandGetProfileInfoResponse = 0x00,
CommandGetMeasurementProfileResponse = 0x01
};
Q_ENUM(ServerCommand)
explicit ZigbeeClusterElectricalMeasurement(ZigbeeNetwork *network, ZigbeeNode *node, ZigbeeNodeEndpoint *endpoint, Direction direction, QObject *parent = nullptr);
quint16 activePowerPhaseA() const;
@ -232,6 +265,12 @@ public:
signals:
void activePowerPhaseAChanged(qint16 activePowerPhaseA);
void getProfileInfoResponse(quint8 profileCount, ProfileIntervalPeriod profileIntervalPeriod, quint8 maxNumberOfIntervals, const QList<quint16> &attributes);
void getMeasurementProfileInfoResponse(const QDateTime &startTime, MeasurementStatus status, ProfileIntervalPeriod profileIntervalPeriod, quint8 numberOfIntervals, quint8 attributeId, const QList<quint16> &values);
protected:
void processDataIndication(ZigbeeClusterLibrary::Frame frame) override;
private:
void setAttribute(const ZigbeeClusterAttribute &attribute) override;