patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VE.Direct: do not use debug buffer at all if verbose logging disabled (#437)

Browse Source 
this avoids the debug buffer being overrun if verbose logging is
disabled in particular. that would happen because the buffer would
only be reset if verbose logging was enabled but filled in any case.
This commit is contained in:
Bernhard Kirchen 2023-09-13 12:13:56 +02:00 committed by GitHub
parent 2eeb5f1d19
commit 88a5117007
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/VeDirectFrameHandler/VeDirectFrameHandler.cpp
View File

@ -78,6 +78,7 @@ VeDirectFrameHandler::VeDirectFrameHandler() :
void VeDirectFrameHandler::setVerboseLogging(bool verboseLogging) void VeDirectFrameHandler::setVerboseLogging(bool verboseLogging)
{ {
_verboseLogging = verboseLogging; _verboseLogging = verboseLogging;
if (!_verboseLogging) { _debugIn = 0; }
} }
void VeDirectFrameHandler::init(int8_t rx, int8_t tx, Print* msgOut, bool verboseLogging) void VeDirectFrameHandler::init(int8_t rx, int8_t tx, Print* msgOut, bool verboseLogging)
@ -120,16 +121,18 @@ void VeDirectFrameHandler::loop()
} }
/* /*
* rxData * rxData
* This function is called by loop() which passes a byte of serial data * This function is called by loop() which passes a byte of serial data
* Based on Victron's example code. But using String and Map instead of pointer and arrays * Based on Victron's example code. But using String and Map instead of pointer and arrays
*/ */
void VeDirectFrameHandler::rxData(uint8_t inbyte) void VeDirectFrameHandler::rxData(uint8_t inbyte)
{ {
_debugBuffer[_debugIn] = inbyte; if (_verboseLogging) {
_debugIn = (_debugIn + 1) % _debugBuffer.size(); _debugBuffer[_debugIn] = inbyte;
if (0 == _debugIn) { _debugIn = (_debugIn + 1) % _debugBuffer.size();
_msgOut->println("[VE.Direct] ERROR: debug buffer overrun!"); if (0 == _debugIn) {
_msgOut->println("[VE.Direct] ERROR: debug buffer overrun!");
}
} }
if ( (inbyte == ':') && (_state != CHECKSUM) ) { if ( (inbyte == ':') && (_state != CHECKSUM) ) {