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

Clear data cache buffer on CRC checksum mismatch and clear UART buffers after connecting

Browse Source
This commit is contained in:
Simon Stürz 2020-07-03 12:38:11 +02:00
parent 5cc83bb956
commit 9f7a71ab8e
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libnymea-zigbee/backends/deconz/interface/zigbeeinterfacedeconz.cpp
View File

@ -123,8 +123,9 @@ void ZigbeeInterfaceDeconz::setAvailable(bool available)
return; return;
// Clear the data buffer in any case // Clear the data buffer in any case
if (m_available) if (m_available) {
m_dataBuffer.clear(); m_dataBuffer.clear();
}
m_available = available; m_available = available;
emit availableChanged(m_available); emit availableChanged(m_available);
@ -138,6 +139,7 @@ void ZigbeeInterfaceDeconz::onReconnectTimeout()
m_reconnectTimer->start(); m_reconnectTimer->start();
} else { } else {
qCDebug(dcZigbeeInterface()) << "Interface reconnected successfully on" << m_serialPort->portName() << m_serialPort->baudRate(); qCDebug(dcZigbeeInterface()) << "Interface reconnected successfully on" << m_serialPort->portName() << m_serialPort->baudRate();
m_serialPort->clear();
setAvailable(true); setAvailable(true);
} }
} }
@ -146,6 +148,7 @@ void ZigbeeInterfaceDeconz::onReconnectTimeout()
void ZigbeeInterfaceDeconz::onReadyRead() void ZigbeeInterfaceDeconz::onReadyRead()
{ {
QByteArray data = m_serialPort->readAll(); QByteArray data = m_serialPort->readAll();
// Read each byte until we get END byte, then unescape the package // Read each byte until we get END byte, then unescape the package
for (int i = 0; i < data.length(); i++) { for (int i = 0; i < data.length(); i++) {
quint8 byte = static_cast<quint8>(data.at(i)); quint8 byte = static_cast<quint8>(data.at(i));
@ -168,6 +171,7 @@ void ZigbeeInterfaceDeconz::onReadyRead()
quint16 calculatedChecksum = calculateCrc(package); quint16 calculatedChecksum = calculateCrc(package);
if (receivedChecksum != calculatedChecksum) { if (receivedChecksum != calculatedChecksum) {
qCWarning(dcZigbeeInterfaceTraffic()) << "Checksum verification failed for frame" << ZigbeeUtils::convertByteArrayToHexString(m_dataBuffer) << receivedChecksum << "!=" << calculatedChecksum; qCWarning(dcZigbeeInterfaceTraffic()) << "Checksum verification failed for frame" << ZigbeeUtils::convertByteArrayToHexString(m_dataBuffer) << receivedChecksum << "!=" << calculatedChecksum;
m_dataBuffer.clear();
continue; continue;
} }
@ -256,6 +260,8 @@ bool ZigbeeInterfaceDeconz::enable(const QString &serialPort, qint32 baudrate)
} }
qCDebug(dcZigbeeInterface()) << "Interface enabled successfully on" << serialPort << baudrate; qCDebug(dcZigbeeInterface()) << "Interface enabled successfully on" << serialPort << baudrate;
m_serialPort->clear();
setAvailable(true); setAvailable(true);
return true; return true;
} }