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

intermediate: restructure buffer handling

Browse Source
This commit is contained in:
wellenvogel
2021-12-01 22:55:37 +01:00
parent d8950c4eb4
commit 9dcb98bb51
7 changed files with 119 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
lib/serial/GwSerial.cpp
View File

@@ -39,23 +39,7 @@ class GwSerialStream: public Stream{
};
class SerialWriter : public GwBufferWriter{
private:
HardwareSerial *serial;
public:
SerialWriter(HardwareSerial *serial){
this->serial=serial;
}
virtual ~SerialWriter(){}
virtual int write(const uint8_t *buffer,size_t len){
size_t numWrite=serial->availableForWrite();
if (numWrite < len) len=numWrite;
if (!len) return 0;
return serial->write(buffer,len);
}
};
GwSerial::GwSerial(GwLog *logger, int num, int id,bool allowRead)
{
LOG_DEBUG(GwLog::DEBUG,"creating GwSerial %p port %d",this,(int)num);
@@ -68,13 +52,11 @@ GwSerial::GwSerial(GwLog *logger, int num, int id,bool allowRead)
this->readBuffer=new GwBuffer(logger, GwBuffer::RX_BUFFER_SIZE);
}
this->serial=new HardwareSerial(num);
this->writer = new SerialWriter(serial);
}
GwSerial::~GwSerial()
{
delete buffer;
delete writer;
if (readBuffer) delete readBuffer;
delete serial;
}
@@ -93,7 +75,12 @@ size_t GwSerial::enqueue(const uint8_t *data, size_t len, bool partial)
}
GwBuffer::WriteStatus GwSerial::write(){
if (! isInitialized()) return GwBuffer::ERROR;
return buffer->fetchData(writer,-1,false);
size_t numWrite=serial->availableForWrite();
size_t rt=buffer->fetchData(numWrite,[](uint8_t *buffer,size_t len, void *p){
return ((GwSerial *)p)->serial->write(buffer,len);
},this);
LOG_DEBUG(GwLog::DEBUG+1,"Serial %p write %d",this,rt);
return buffer->usedSpace()?GwBuffer::AGAIN:GwBuffer::OK;
}
size_t GwSerial::sendToClients(const char *buf,int sourceId,bool partial){
if ( sourceId == id) return 0;
@@ -109,25 +96,29 @@ void GwSerial::loop(bool handleRead){
write();
if (! isInitialized()) return;
if (! handleRead) return;
char buffer[10];
size_t available=serial->available();
if (! available) return;
if (available > 10) available=10;
int rt=serial->readBytes(buffer,available);
if (allowRead && rt > 0){
size_t wr=readBuffer->addData((uint8_t *)(&buffer),rt,true);
LOG_DEBUG(GwLog::DEBUG+2,"GwSerial read %d bytes, to buffer %d bytes",rt,wr);
if (allowRead){
size_t rd=readBuffer->fillData(available,[](uint8_t *buffer, size_t len, void *p)->size_t{
return ((GwSerial *)p)->serial->readBytes(buffer,len);
},this);
this->logger->logDebug(GwLog::DEBUG+2,"GwSerial read %d bytes",rd);
}
else{
uint8_t buffer[10];
if (available > 10) available=10;
serial->readBytes(buffer,available);
}
}
bool GwSerial::readMessages(GwBufferWriter *writer){
bool GwSerial::readMessages(GwMessageFetcher *writer){
if (! isInitialized()) return false;
if (! allowRead) return false;
return readBuffer->fetchMessage(writer,'\n',true) == GwBuffer::OK;
return writer->handleBuffer(readBuffer);
}
void GwSerial::flush(){
if (! isInitialized()) return;
while (buffer->fetchData(writer,-1,false) == GwBuffer::AGAIN){
while (write() == GwBuffer::AGAIN){
vTaskDelay(1);
}
}

4
lib/serial/GwSerial.h
View File

@@ -3,14 +3,12 @@
#include "HardwareSerial.h"
#include "GwLog.h"
#include "GwBuffer.h"
class SerialWriter;
class GwSerialStream;
class GwSerial{
private:
GwBuffer *buffer;
GwBuffer *readBuffer=NULL;
GwLog *logger;
SerialWriter *writer;
int num;
bool initialized=false;
bool allowRead=true;
@@ -27,7 +25,7 @@ class GwSerial{
bool isInitialized();
size_t sendToClients(const char *buf,int sourceId,bool partial=false);
void loop(bool handleRead=true);
bool readMessages(GwBufferWriter *writer);
bool readMessages(GwMessageFetcher *writer);
void flush();
Stream *getStream(bool partialWrites);
friend GwSerialStream;