Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2024-10-20 20:07:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: resets stats

Browse Source
This commit is contained in:
Marco Scholl 2024-05-23 09:35:07 +02:00
parent 06e0365a53
commit 2adac5e4af
No known key found for this signature in database
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/knx/tpuart_data_link_layer.cpp
View File

@ -564,7 +564,6 @@ void TpUartDataLinkLayer::pushTxFrameQueue(TpFrame *tpFrame)
} }
_txQueueCount++; _txQueueCount++;
_txFrameCounter++;
} }
void TpUartDataLinkLayer::setRepetitions(uint8_t nack, uint8_t busy) void TpUartDataLinkLayer::setRepetitions(uint8_t nack, uint8_t busy)
@ -580,12 +579,15 @@ void TpUartDataLinkLayer::setFrameRepetition(uint8_t nack, uint8_t busy)
bool TpUartDataLinkLayer::sendFrame(CemiFrame &cemiFrame) bool TpUartDataLinkLayer::sendFrame(CemiFrame &cemiFrame)
{ {
_txFrameCounter++;
if (!_connected || _monitoring || _txQueueCount > MAX_TX_QUEUE) if (!_connected || _monitoring || _txQueueCount > MAX_TX_QUEUE)
{ {
if (_txQueueCount > MAX_TX_QUEUE) if (_txQueueCount > MAX_TX_QUEUE)
{ {
println("Ignore frame because transmit queue is full!"); println("Ignore frame because transmit queue is full!");
} }
dataConReceived(cemiFrame, false); dataConReceived(cemiFrame, false);
return false; return false;
} }
@ -692,6 +694,17 @@ void TpUartDataLinkLayer::connected(bool state /* = true */)
_connected = state; _connected = state;
} }
void TpUartDataLinkLayer::resetStats()
{
_rxProcessdFrameCounter = 0;
_rxIgnoredFrameCounter = 0;
_rxInvalidFrameCounter = 0;
_rxInvalidFrameCounter = 0;
_rxUnkownControlCounter = 0;
_txFrameCounter = 0;
_txProcessdFrameCounter = 0;
}
bool TpUartDataLinkLayer::reset() bool TpUartDataLinkLayer::reset()
{ {
// println("Reset TP"); // println("Reset TP");
@ -705,11 +718,7 @@ bool TpUartDataLinkLayer::reset()
isrLock(true); isrLock(true);
// Reset // Reset
_rxIgnoredFrameCounter = 0; resetStats();
_rxInvalidFrameCounter = 0;
_rxInvalidFrameCounter = 0;
_rxUnkownControlCounter = 0;
clearTxFrame(); clearTxFrame();
clearTxFrameQueue(); clearTxFrameQueue();
@ -792,6 +801,7 @@ void TpUartDataLinkLayer::monitor()
// println("busmonitor"); // println("busmonitor");
_monitoring = true; _monitoring = true;
_platform.writeUart(U_BUSMON_REQ); _platform.writeUart(U_BUSMON_REQ);
resetStats();
} }
void TpUartDataLinkLayer::enabled(bool value) void TpUartDataLinkLayer::enabled(bool value)

1
src/knx/tpuart_data_link_layer.h
View File

@ -57,6 +57,7 @@ class TpUartDataLinkLayer : public DataLinkLayer
bool isMonitoring(); bool isMonitoring();
bool isStopped(); bool isStopped();
bool isBusy(); bool isBusy();
void resetStats();
#ifdef USE_TP_RX_QUEUE #ifdef USE_TP_RX_QUEUE
void processRxISR(); void processRxISR();