thooge/esp32-nmea2000-obp60
1
0
Fork 0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2025-12-13 05:53:06 +01:00
Code Releases Activity

improve logging MT robustness

Browse Source
This commit is contained in:
andreas
2021-11-13 18:15:50 +01:00
parent 6ef75422d8
commit b3f4a11a8e
6 changed files with 62 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/serial/GwSerial.cpp
View File

@@ -46,23 +46,24 @@ int GwSerial::setup(int baud, int rxpin, int txpin)
return 0;
}
bool GwSerial::isInitialized() { return initialized; }
size_t GwSerial::enqueue(const uint8_t *data, size_t len)
size_t GwSerial::enqueue(const uint8_t *data, size_t len, bool partial)
{
if (! isInitialized()) return 0;
return buffer->addData(data, len);
return buffer->addData(data, len,partial);
}
GwBuffer::WriteStatus GwSerial::write(){
if (! isInitialized()) return GwBuffer::ERROR;
return buffer->fetchData(writer,-1,false);
}
void GwSerial::sendToClients(const char *buf,int sourceId){
if ( sourceId == id) return;
size_t GwSerial::sendToClients(const char *buf,int sourceId,bool partial){
if ( sourceId == id) return 0;
size_t len=strlen(buf);
size_t enqueued=enqueue((const uint8_t*)buf,len);
if (enqueued != len){
size_t enqueued=enqueue((const uint8_t*)buf,len,partial);
if (enqueued != len && ! partial){
LOG_DEBUG(GwLog::DEBUG,"GwSerial overflow on channel %d",id);
overflows++;
}
return enqueued;
}
void GwSerial::loop(bool handleRead){
write();

4
lib/serial/GwSerial.h
View File

@@ -16,7 +16,7 @@ class GwSerial{
GwBuffer::WriteStatus write();
int id=-1;
int overflows=0;
size_t enqueue(const uint8_t *data, size_t len);
size_t enqueue(const uint8_t *data, size_t len,bool partial=false);
HardwareSerial *serial;
public:
static const int bufferSize=200;
@@ -24,7 +24,7 @@ class GwSerial{
~GwSerial();
int setup(int baud,int rxpin,int txpin);
bool isInitialized();
void sendToClients(const char *buf,int sourceId);
size_t sendToClients(const char *buf,int sourceId,bool partial=false);
void loop(bool handleRead=true);
bool readMessages(GwBufferWriter *writer);
void flush();