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

reenable sendframe handling

Browse Source 
reenable rxProcess in loop
fixes a memory leak
This commit is contained in:
Marco Scholl 2024-04-05 00:04:43 +02:00
parent 7b910eba59
commit e65afebd3a
No known key found for this signature in database
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/knx/tpuart_data_link_layer.cpp
View File

@ -560,11 +560,11 @@ void TpUartDataLinkLayer::setFrameRepetition(uint8_t nack, uint8_t busy)
bool TpUartDataLinkLayer::sendFrame(CemiFrame &cemiFrame) bool TpUartDataLinkLayer::sendFrame(CemiFrame &cemiFrame)
{ {
// if (!_connected) if (!_connected || _monitoring)
// { {
// dataConReceived(cemiFrame, false); dataConReceived(cemiFrame, false);
// return false; return false;
// } }
TpFrame *tpFrame = new TpFrame(cemiFrame); TpFrame *tpFrame = new TpFrame(cemiFrame);
// printHex(" TP>: ", tpFrame->data(), tpFrame->size()); // printHex(" TP>: ", tpFrame->data(), tpFrame->size());
@ -686,9 +686,14 @@ bool TpUartDataLinkLayer::reset()
_rxInvalidFrameCounter = 0; _rxInvalidFrameCounter = 0;
_rxUnkownControlCounter = 0; _rxUnkownControlCounter = 0;
if (_txFrame != nullptr) if (_txFrame != nullptr)
_txFrame->reset(); {
_txFrame = nullptr;
delete _txFrame;
}
if (_rxFrame != nullptr) if (_rxFrame != nullptr)
{
_rxFrame->reset(); _rxFrame->reset();
}
_rxState = RX_IDLE; _rxState = RX_IDLE;
_txState = TX_IDLE; _txState = TX_IDLE;
_connected = false; _connected = false;
@ -792,7 +797,6 @@ void TpUartDataLinkLayer::processTxQueue()
if (_rxState != RX_IDLE) if (_rxState != RX_IDLE)
return; return;
//
if (_txState != TX_IDLE) if (_txState != TX_IDLE)
return; return;
@ -806,16 +810,23 @@ void TpUartDataLinkLayer::processTxQueue()
_txFrameQueue.back = nullptr; _txFrameQueue.back = nullptr;
} }
// free old frame
if (_txFrame != nullptr)
delete _txFrame;
// use frame from queue and delete queue entry
_txFrame = entry->frame; _txFrame = entry->frame;
delete entry;
_txState = TX_FRAME;
_txLastTime = millis();
#ifdef DEBUG_TP_FRAMES #ifdef DEBUG_TP_FRAMES
print("Outbound: "); print("Outbound: ");
printFrame(_txFrame); printFrame(_txFrame);
println(); println();
#endif #endif
_txState = TX_FRAME;
_txLastTime = millis();
delete entry;
processTxFrameBytes(); processTxFrameBytes();
} }
} }
@ -875,7 +886,7 @@ void TpUartDataLinkLayer::loop()
_tpState = 0; _tpState = 0;
} }
// processRx(); processRx();
#ifdef USE_TP_RX_QUEUE #ifdef USE_TP_RX_QUEUE
processRxQueue(); processRxQueue();
#endif #endif