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

Implement data parsing and continue with basic cluster

Browse Source
This commit is contained in:
Simon Stürz 2020-05-26 11:15:12 +02:00
parent 4e897686bb
commit 396c86a0d2
5 changed files with 165 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
libnymea-zigbee/zcl/general/zigbeeclusterbasic.h
View File

@ -43,8 +43,137 @@ public:
};
Q_ENUM(AttributePowerSourceValue)
// Enum for AttributePhysicalEnvironment(0x0011)
enum PhysicalEnvironment {
PhysicalEnvironmentUnspecifiedEnvironment = 0x00,
PhysicalEnvironmentAtrium = 0x01,
PhysicalEnvironmentBar = 0x02,
PhysicalEnvironmentCourtyard = 0x03,
PhysicalEnvironmentBathroom = 0x04,
PhysicalEnvironmentBedroom = 0x05,
PhysicalEnvironmentBilliardRoom = 0x06,
PhysicalEnvironmentUtilityRoom = 0x07,
PhysicalEnvironmentCellar = 0x08,
PhysicalEnvironmentStorageCloset = 0x09,
PhysicalEnvironmentTheater = 0x0a,
PhysicalEnvironmentOffice = 0x0b,
PhysicalEnvironmentDeck = 0x0c,
PhysicalEnvironmentDen = 0x0d,
PhysicalEnvironmentDiningRoom = 0x0e,
PhysicalEnvironmentElectricalRoom = 0x0f,
PhysicalEnvironmentElevator = 0x10,
PhysicalEnvironmentEntry = 0x11,
PhysicalEnvironmentFamilyRoom = 0x12,
PhysicalEnvironmentMainFloor = 0x13,
PhysicalEnvironmentUpstairs = 0x14,
PhysicalEnvironmentDownstairs = 0x15,
PhysicalEnvironmentBasement = 0x16,
PhysicalEnvironmentGallery = 0x17,
PhysicalEnvironmentGameRoom = 0x18,
PhysicalEnvironmentGarage = 0x19,
PhysicalEnvironmentGym = 0x1a,
PhysicalEnvironmentHallway = 0x1b,
PhysicalEnvironmentHouse = 0x1c,
PhysicalEnvironmentKitchen = 0x1d,
PhysicalEnvironmentLaundryRoom = 0x1e,
PhysicalEnvironmentLibrary = 0x1f,
PhysicalEnvironmentMasterBedRoom = 0x20,
PhysicalEnvironmentMudRoom = 0x21,
PhysicalEnvironmentNursery = 0x22,
PhysicalEnvironmentPantry = 0x23,
PhysicalEnvironmentOffice2 = 0x24,
PhysicalEnvironmentOutside = 0x25,
PhysicalEnvironmentPool = 0x26,
PhysicalEnvironmentPorch = 0x27,
PhysicalEnvironmentSewingRoom = 0x28,
PhysicalEnvironmentSittingRoom = 0x29,
PhysicalEnvironmentStairway = 0x2a,
PhysicalEnvironmentYard = 0x2b,
PhysicalEnvironmentAttic = 0x2c,
PhysicalEnvironmentHotTub = 0x2d,
PhysicalEnvironmentLivingRoom = 0x2e,
PhysicalEnvironmentSauna = 0x2f,
PhysicalEnvironmentShopWorkshop = 0x30,
PhysicalEnvironmentGuestBedroom = 0x31,
PhysicalEnvironmentGuestBath = 0x32,
PhysicalEnvironmentPowderRoom = 0x33,
PhysicalEnvironmentBackYard = 0x34,
PhysicalEnvironmentFrontYard = 0x35,
PhysicalEnvironmentPatio = 0x36,
PhysicalEnvironmentDriveway = 0x37,
PhysicalEnvironmentSunRoom = 0x38,
PhysicalEnvironmentGrandRoom = 0x39,
PhysicalEnvironmentSpa = 0x3a,
PhysicalEnvironmentWhirlpool = 0x3b,
PhysicalEnvironmentShed = 0x3c,
PhysicalEnvironmentEquipmentStorage = 0x3d,
PhysicalEnvironmentHobbyCraftRoom = 0x3e,
PhysicalEnvironmentFountain = 0x3f,
PhysicalEnvironmentPond = 0x40,
PhysicalEnvironmentReceptionRoom = 0x41,
PhysicalEnvironmentBreakfastRoom = 0x42,
PhysicalEnvironmentNook = 0x43,
PhysicalEnvironmentGarden = 0x44,
PhysicalEnvironmentBalcony = 0x45,
PhysicalEnvironmentPanicRoom = 0x46,
PhysicalEnvironmentTerrace = 0x47,
PhysicalEnvironmentRoof = 0x48,
PhysicalEnvironmentToilet = 0x49,
PhysicalEnvironmentToiletMain = 0x4a,
PhysicalEnvironmentOutsideToilet = 0x4b,
PhysicalEnvironmentShowerRoom = 0x4c,
PhysicalEnvironmentStudy = 0x4d,
PhysicalEnvironmentFrontGarden = 0x4e,
PhysicalEnvironmentBackGarden = 0x4f,
PhysicalEnvironmentKettle = 0x50,
PhysicalEnvironmentTelevision = 0x51,
PhysicalEnvironmentStove = 0x52,
PhysicalEnvironmentMicrowave = 0x53,
PhysicalEnvironmentToaster = 0x54,
PhysicalEnvironmentVacuum = 0x55,
PhysicalEnvironmentAppliance = 0x56,
PhysicalEnvironmentFrontDoor = 0x57,
PhysicalEnvironmentBackDoor = 0x58,
PhysicalEnvironmentFridgeDoor = 0x59,
PhysicalEnvironmentMedicationCabinetDoor = 0x60,
PhysicalEnvironmentWardrobeDoor = 0x61,
PhysicalEnvironmentFrontCupboardDoor = 0x62,
PhysicalEnvironmentOtherDoor = 0x63,
PhysicalEnvironmentWaitingRoom = 0x64,
PhysicalEnvironmentTriageRoom = 0x65,
PhysicalEnvironmentDoctorsOffice = 0x66,
PhysicalEnvironmentPatientsPrivateRoom = 0x67,
PhysicalEnvironmentConsultationRoom = 0x68,
PhysicalEnvironmentNurseStation = 0x69,
PhysicalEnvironmentWard = 0x6a,
PhysicalEnvironmentCorridor = 0x6b,
PhysicalEnvironmentOperatingTheatre = 0x6c,
PhysicalEnvironmentDentalSurgeryRoom = 0x6d,
PhysicalEnvironmentMedicalImagingRoom = 0x6e,
PhysicalEnvironmentDecontaminationRoom = 0x6f,
PhysicalEnvironmentUnknownEnvironment = 0xff
};
Q_ENUM(PhysicalEnvironment)
// Enum for AttributeAlarmMask(0x0013)
enum AlarmMask {
AlarmMaskGeneralHardwareFault = 0x01,
AlarmMaskGeneralSoftwareFault = 0x02
};
Q_ENUM(AlarmMask)
Q_DECLARE_FLAGS(AlarmMasks, AlarmMask)
enum DiableLocalConfig {
DiableLocalConfigReset = 0x01,
DiableLocalConfigDeviceConfiguration = 0x02
};
Q_ENUM(DiableLocalConfig)
Q_DECLARE_FLAGS(DiableLocalConfigs, DiableLocalConfig)
explicit ZigbeeClusterBasic(ZigbeeNetwork *network, ZigbeeNode *node, ZigbeeNodeEndpoint *endpoint, Direction direction, QObject *parent = nullptr);
private:
void setAttribute(const ZigbeeClusterAttribute &attribute) override;
@ -52,4 +181,7 @@ signals:
};
Q_DECLARE_OPERATORS_FOR_FLAGS(ZigbeeClusterBasic::AlarmMasks)
Q_DECLARE_OPERATORS_FOR_FLAGS(ZigbeeClusterBasic::DiableLocalConfigs)
#endif // ZIGBEECLUSTERBASIC_H

5
libnymea-zigbee/zcl/zigbeecluster.cpp
View File

@ -227,9 +227,12 @@ void ZigbeeCluster::processApsDataIndication(QByteArray payload)
if (reply->isComplete())
finishZclReply(reply);
return;
}
// FIXME: increase transaction sequence number
qCWarning(dcZigbeeNode()) << m_node << m_endpoint << this << "Unhandled ZCL indication" << ZigbeeUtils::convertByteArrayToHexString(payload);
}
QDebug operator<<(QDebug debug, ZigbeeCluster *cluster)

22
libnymea-zigbee/zcl/zigbeeclusterlibrary.cpp
View File

@ -27,6 +27,7 @@
#include "zigbeeclusterlibrary.h"
#include "loggingcategory.h"
#include "zigbeedatatype.h"
#include "zigbeeutils.h"
#include <QDataStream>
@ -157,10 +158,27 @@ QList<ZigbeeClusterLibrary::ReadAttributeStatusRecord> ZigbeeClusterLibrary::par
data.append(element);
}
}
} else {
// Normal data type
} else if (dataType == Zigbee::OctetString || dataType == Zigbee::CharString) {
quint8 length = 0;
stream >> length;
qCDebug(dcZigbeeClusterLibrary()) << "Parse (octet string, character string)" << "Length:" << length;
for (int i = 0; i < length; i++) {
quint8 element = 0;
stream >> element;
data.append(element);
}
} else if (dataType == Zigbee::LongOctetString || dataType == Zigbee::LongCharString) {
quint16 length = 0;
stream >> length;
qCDebug(dcZigbeeClusterLibrary()) << "Parse (long octet string, long character string)" << "Length:" << length;
for (int i = 0; i < length; i++) {
quint8 element = 0;
stream >> element;
data.append(element);
}
} else {
// Normal data type
int length = ZigbeeDataType::typeLength(dataType);
qCDebug(dcZigbeeClusterLibrary()) << "Parse (normal data type)" << "Number of elements:" << length;
for (int i = 0; i < length; i++) {
quint8 element = 0;

8
libnymea-zigbee/zigbeedatatype.cpp
View File

@ -177,6 +177,9 @@ ZigbeeDataType::ZigbeeDataType(Zigbee::DataType dataType, const QByteArray &data
break;
}
// TODO: verify data length and consistency
/*
switch (dataType) {
case Zigbee::NoData:
@ -296,6 +299,11 @@ ZigbeeDataType::ZigbeeDataType(Zigbee::DataType dataType, const QByteArray &data
}
int ZigbeeDataType::dataLength() const
{
return typeLength(m_dataType);
}
int ZigbeeDataType::typeLength(Zigbee::DataType dataType)
{
int length = 0;

1
libnymea-zigbee/zigbeedatatype.h
View File

@ -12,6 +12,7 @@ public:
QString name() const;
QString className() const;
QByteArray data() const;
int dataLength() const;
static int typeLength(Zigbee::DataType dataType);