Fix some typos
This commit is contained in:
parent
cd0af1646a
commit
40512509ae
@ -961,7 +961,7 @@ void ZigbeeBridgeControllerDeconz::onInterfacePackageReceived(const QByteArray &
|
|||||||
}
|
}
|
||||||
|
|
||||||
// We got a notification, lets set the current sequence number to the notification id,
|
// We got a notification, lets set the current sequence number to the notification id,
|
||||||
// so the next request will be a continuouse increase
|
// so the next request will be a continuous increase
|
||||||
m_sequenceNumber = sequenceNumber + 1;
|
m_sequenceNumber = sequenceNumber + 1;
|
||||||
|
|
||||||
// No request for this data, lets check which notification and process the data
|
// No request for this data, lets check which notification and process the data
|
||||||
|
|||||||
@ -137,7 +137,7 @@ void ZigbeeClusterDoorLock::processDataIndication(ZigbeeClusterLibrary::Frame fr
|
|||||||
{
|
{
|
||||||
//qCDebug(dcZigbeeCluster()) << "Processing cluster frame" << m_node << m_endpoint << this << frame;
|
//qCDebug(dcZigbeeCluster()) << "Processing cluster frame" << m_node << m_endpoint << this << frame;
|
||||||
|
|
||||||
// Increase the tsn for continuouse id increasing on both sides
|
// Increase the tsn for continuous id increasing on both sides
|
||||||
m_transactionSequenceNumber = frame.header.transactionSequenceNumber;
|
m_transactionSequenceNumber = frame.header.transactionSequenceNumber;
|
||||||
|
|
||||||
qCWarning(dcZigbeeCluster()) << "Unhandled ZCL indication in" << m_node << m_endpoint << this << frame;
|
qCWarning(dcZigbeeCluster()) << "Unhandled ZCL indication in" << m_node << m_endpoint << this << frame;
|
||||||
|
|||||||
@ -113,7 +113,7 @@ void ZigbeeClusterLevelControl::setAttribute(const ZigbeeClusterAttribute &attri
|
|||||||
emit attributeChanged(attribute);
|
emit attributeChanged(attribute);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse the information for convinience
|
// Parse the information for convenience
|
||||||
if (attribute.id() == AttributeCurrentLevel) {
|
if (attribute.id() == AttributeCurrentLevel) {
|
||||||
bool valueOk = false;
|
bool valueOk = false;
|
||||||
quint8 value = attribute.dataType().toUInt8(&valueOk);
|
quint8 value = attribute.dataType().toUInt8(&valueOk);
|
||||||
@ -130,7 +130,7 @@ void ZigbeeClusterLevelControl::processDataIndication(ZigbeeClusterLibrary::Fram
|
|||||||
{
|
{
|
||||||
qCDebug(dcZigbeeCluster()) << "Processing cluster frame" << m_node << m_endpoint << this << frame;
|
qCDebug(dcZigbeeCluster()) << "Processing cluster frame" << m_node << m_endpoint << this << frame;
|
||||||
|
|
||||||
// Increase the tsn for continuouse id increasing on both sides
|
// Increase the tsn for continuous id increasing on both sides
|
||||||
m_transactionSequenceNumber = frame.header.transactionSequenceNumber;
|
m_transactionSequenceNumber = frame.header.transactionSequenceNumber;
|
||||||
|
|
||||||
switch (m_direction) {
|
switch (m_direction) {
|
||||||
|
|||||||
@ -87,7 +87,7 @@ void ZigbeeClusterOnOff::setAttribute(const ZigbeeClusterAttribute &attribute)
|
|||||||
emit attributeChanged(attribute);
|
emit attributeChanged(attribute);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse the information for convinience
|
// Parse the information for convenience
|
||||||
if (attribute.id() == AttributeOnOff) {
|
if (attribute.id() == AttributeOnOff) {
|
||||||
bool valueOk = false;
|
bool valueOk = false;
|
||||||
bool value = attribute.dataType().toBool(&valueOk);
|
bool value = attribute.dataType().toBool(&valueOk);
|
||||||
@ -104,7 +104,7 @@ void ZigbeeClusterOnOff::processDataIndication(ZigbeeClusterLibrary::Frame frame
|
|||||||
{
|
{
|
||||||
qCDebug(dcZigbeeCluster()) << "Processing cluster frame" << m_node << m_endpoint << this << frame;
|
qCDebug(dcZigbeeCluster()) << "Processing cluster frame" << m_node << m_endpoint << this << frame;
|
||||||
|
|
||||||
// Increase the tsn for continuouse id increasing on both sides
|
// Increase the tsn for continuous id increasing on both sides
|
||||||
m_transactionSequenceNumber = frame.header.transactionSequenceNumber;
|
m_transactionSequenceNumber = frame.header.transactionSequenceNumber;
|
||||||
|
|
||||||
switch (m_direction) {
|
switch (m_direction) {
|
||||||
|
|||||||
@ -230,7 +230,7 @@ void ZigbeeClusterColorControl::processDataIndication(ZigbeeClusterLibrary::Fram
|
|||||||
{
|
{
|
||||||
qCDebug(dcZigbeeCluster()) << "Processing cluster frame" << m_node << m_endpoint << this << frame;
|
qCDebug(dcZigbeeCluster()) << "Processing cluster frame" << m_node << m_endpoint << this << frame;
|
||||||
|
|
||||||
// Increase the tsn for continuouse id increasing on both sides
|
// Increase the tsn for continuous id increasing on both sides
|
||||||
m_transactionSequenceNumber = frame.header.transactionSequenceNumber;
|
m_transactionSequenceNumber = frame.header.transactionSequenceNumber;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -47,7 +47,7 @@ void ZigbeeClusterIlluminanceMeasurment::setAttribute(const ZigbeeClusterAttribu
|
|||||||
emit attributeChanged(attribute);
|
emit attributeChanged(attribute);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse the information for convinience
|
// Parse the information for convenience
|
||||||
if (attribute.id() == AttributeMeasuredValue) {
|
if (attribute.id() == AttributeMeasuredValue) {
|
||||||
bool valueOk = false;
|
bool valueOk = false;
|
||||||
quint16 value = attribute.dataType().toUInt16(&valueOk);
|
quint16 value = attribute.dataType().toUInt16(&valueOk);
|
||||||
|
|||||||
@ -47,7 +47,7 @@ void ZigbeeClusterOccupancySensing::setAttribute(const ZigbeeClusterAttribute &a
|
|||||||
emit attributeChanged(attribute);
|
emit attributeChanged(attribute);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse the information for convinience
|
// Parse the information for convenience
|
||||||
if (attribute.id() == AttributeOccupancy) {
|
if (attribute.id() == AttributeOccupancy) {
|
||||||
bool valueOk = false;
|
bool valueOk = false;
|
||||||
bool value = attribute.dataType().toBool(&valueOk);
|
bool value = attribute.dataType().toBool(&valueOk);
|
||||||
|
|||||||
@ -47,7 +47,7 @@ void ZigbeeClusterRelativeHumidityMeasurement::setAttribute(const ZigbeeClusterA
|
|||||||
emit attributeChanged(attribute);
|
emit attributeChanged(attribute);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse the information for convinience
|
// Parse the information for convenience
|
||||||
if (attribute.id() == AttributeMeasuredValue) {
|
if (attribute.id() == AttributeMeasuredValue) {
|
||||||
bool valueOk = false;
|
bool valueOk = false;
|
||||||
quint16 value = attribute.dataType().toUInt16(&valueOk);
|
quint16 value = attribute.dataType().toUInt16(&valueOk);
|
||||||
|
|||||||
@ -47,7 +47,7 @@ void ZigbeeClusterTemperatureMeasurement::setAttribute(const ZigbeeClusterAttrib
|
|||||||
emit attributeChanged(attribute);
|
emit attributeChanged(attribute);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse the information for convinience
|
// Parse the information for convenience
|
||||||
if (attribute.id() == AttributeMeasuredValue) {
|
if (attribute.id() == AttributeMeasuredValue) {
|
||||||
bool valueOk = false;
|
bool valueOk = false;
|
||||||
qint16 value = attribute.dataType().toInt16(&valueOk);
|
qint16 value = attribute.dataType().toInt16(&valueOk);
|
||||||
|
|||||||
@ -65,7 +65,7 @@ void ZigbeeClusterOta::processDataIndication(ZigbeeClusterLibrary::Frame frame)
|
|||||||
{
|
{
|
||||||
qCDebug(dcZigbeeCluster()) << "Processing cluster frame" << m_node << m_endpoint << this << frame;
|
qCDebug(dcZigbeeCluster()) << "Processing cluster frame" << m_node << m_endpoint << this << frame;
|
||||||
|
|
||||||
// Increase the tsn for continuouse id increasing on both sides
|
// Increase the tsn for continuous id increasing on both sides
|
||||||
m_transactionSequenceNumber = frame.header.transactionSequenceNumber;
|
m_transactionSequenceNumber = frame.header.transactionSequenceNumber;
|
||||||
|
|
||||||
switch (m_direction) {
|
switch (m_direction) {
|
||||||
|
|||||||
@ -55,7 +55,7 @@ void ZigbeeClusterIasZone::processDataIndication(ZigbeeClusterLibrary::Frame fra
|
|||||||
{
|
{
|
||||||
qCDebug(dcZigbeeCluster()) << "Processing cluster frame" << m_node << m_endpoint << this << frame;
|
qCDebug(dcZigbeeCluster()) << "Processing cluster frame" << m_node << m_endpoint << this << frame;
|
||||||
|
|
||||||
// Increase the tsn for continuouse id increasing on both sides
|
// Increase the tsn for continuous id increasing on both sides
|
||||||
m_transactionSequenceNumber = frame.header.transactionSequenceNumber;
|
m_transactionSequenceNumber = frame.header.transactionSequenceNumber;
|
||||||
|
|
||||||
switch (m_direction) {
|
switch (m_direction) {
|
||||||
|
|||||||
@ -356,7 +356,7 @@ void ZigbeeCluster::finishZclReply(ZigbeeClusterReply *zclReply)
|
|||||||
|
|
||||||
void ZigbeeCluster::processDataIndication(ZigbeeClusterLibrary::Frame frame)
|
void ZigbeeCluster::processDataIndication(ZigbeeClusterLibrary::Frame frame)
|
||||||
{
|
{
|
||||||
// Increase the tsn for continuouse id increasing on both sides
|
// Increase the tsn for continuous id increasing on both sides
|
||||||
m_transactionSequenceNumber = frame.header.transactionSequenceNumber;
|
m_transactionSequenceNumber = frame.header.transactionSequenceNumber;
|
||||||
|
|
||||||
// Warn about the unhandled cluster indication, you can override this method in cluster implementations
|
// Warn about the unhandled cluster indication, you can override this method in cluster implementations
|
||||||
@ -391,7 +391,7 @@ void ZigbeeCluster::processApsDataIndication(const QByteArray &asdu, const Zigbe
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Increase the tsn for continuouse id increasing on both sides
|
// Increase the tsn for continuous id increasing on both sides
|
||||||
m_transactionSequenceNumber = frame.header.transactionSequenceNumber;
|
m_transactionSequenceNumber = frame.header.transactionSequenceNumber;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -411,7 +411,7 @@ void ZigbeeCluster::processApsDataIndication(const QByteArray &asdu, const Zigbe
|
|||||||
setAttribute(ZigbeeClusterAttribute(attributeId, dataType));
|
setAttribute(ZigbeeClusterAttribute(attributeId, dataType));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Increase the tsn for continuouse id increasing on both sides
|
// Increase the tsn for continuous id increasing on both sides
|
||||||
m_transactionSequenceNumber = frame.header.transactionSequenceNumber;
|
m_transactionSequenceNumber = frame.header.transactionSequenceNumber;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -136,7 +136,7 @@ private:
|
|||||||
qint32 m_serialBaudrate = 115200;
|
qint32 m_serialBaudrate = 115200;
|
||||||
ZigbeeAddress m_macAddress;
|
ZigbeeAddress m_macAddress;
|
||||||
|
|
||||||
// Continuouse ASP sequence number for network requests
|
// Continuous ASP sequence number for network requests
|
||||||
quint8 m_sequenceNumber = 0;
|
quint8 m_sequenceNumber = 0;
|
||||||
|
|
||||||
// Network configurations
|
// Network configurations
|
||||||
|
|||||||
@ -410,7 +410,7 @@ void ZigbeeNode::initBasicCluster()
|
|||||||
ZigbeeClusterBasic *basicCluster = endpoint->inputCluster<ZigbeeClusterBasic>(ZigbeeClusterLibrary::ClusterIdBasic);
|
ZigbeeClusterBasic *basicCluster = endpoint->inputCluster<ZigbeeClusterBasic>(ZigbeeClusterLibrary::ClusterIdBasic);
|
||||||
if (!basicCluster) {
|
if (!basicCluster) {
|
||||||
qCWarning(dcZigbeeNode()) << "Could not find basic cluster on" << this << "Set the node to initialized anyways.";
|
qCWarning(dcZigbeeNode()) << "Could not find basic cluster on" << this << "Set the node to initialized anyways.";
|
||||||
// Set the device initialized any ways since this ist just for convinience
|
// Set the device initialized any ways since this ist just for convenience
|
||||||
setState(StateInitialized);
|
setState(StateInitialized);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -115,7 +115,7 @@ private:
|
|||||||
void initEndpoints();
|
void initEndpoints();
|
||||||
void initEndpoint(quint8 endpointId);
|
void initEndpoint(quint8 endpointId);
|
||||||
|
|
||||||
// For convinience and having base information about the first endpoint
|
// For convenience and having base information about the first endpoint
|
||||||
void initBasicCluster();
|
void initBasicCluster();
|
||||||
void readManufacturerName(ZigbeeClusterBasic *basicCluster);
|
void readManufacturerName(ZigbeeClusterBasic *basicCluster);
|
||||||
void readModelIdentifier(ZigbeeClusterBasic *basicCluster);
|
void readModelIdentifier(ZigbeeClusterBasic *basicCluster);
|
||||||
|
|||||||
@ -98,7 +98,7 @@ public:
|
|||||||
ZigbeeCluster *getOutputCluster(ZigbeeClusterLibrary::ClusterId clusterId) const;
|
ZigbeeCluster *getOutputCluster(ZigbeeClusterLibrary::ClusterId clusterId) const;
|
||||||
bool hasOutputCluster(ZigbeeClusterLibrary::ClusterId clusterId) const;
|
bool hasOutputCluster(ZigbeeClusterLibrary::ClusterId clusterId) const;
|
||||||
|
|
||||||
// Convinience cast methods for getting a specific cluster object
|
// Convenience cast methods for getting a specific cluster object
|
||||||
template<typename T>
|
template<typename T>
|
||||||
inline T* inputCluster(ZigbeeClusterLibrary::ClusterId clusterId)
|
inline T* inputCluster(ZigbeeClusterLibrary::ClusterId clusterId)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user