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: reading on tcp

Browse Source
This commit is contained in:
andreas
2021-10-26 20:28:21 +02:00
parent 60eabb05ab
commit 933ea0d0aa
8 changed files with 187 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
lib/queue/GwBuffer.cpp
View File

@@ -6,9 +6,15 @@ void GwBuffer::lp(const char *fkt, int p)
fkt, buffer, offset(writePointer), offset(readPointer), usedSpace(), freeSpace(), p);
}
GwBuffer::GwBuffer(GwLog *logger)
GwBuffer::GwBuffer(GwLog *logger,size_t bufferSize, bool rotate)
{
this->logger = logger;
this->rotate=rotate;
this->bufferSize=bufferSize;
this->buffer=new uint8_t[bufferSize];
}
GwBuffer::~GwBuffer(){
delete buffer;
}
void GwBuffer::reset()
{
@@ -18,13 +24,16 @@ void GwBuffer::reset()
}
size_t GwBuffer::freeSpace()
{
if (! rotate){
return bufferSize-offset(writePointer)-1;
}
if (readPointer < writePointer)
{
size_t rt = BUFFER_SIZE - offset(writePointer) - 1 + offset(readPointer);
size_t rt = bufferSize - offset(writePointer) - 1 + offset(readPointer);
return rt;
}
if (readPointer == writePointer)
return BUFFER_SIZE - 1;
return bufferSize - 1;
return readPointer - writePointer - 1;
}
size_t GwBuffer::usedSpace()
@@ -33,19 +42,27 @@ size_t GwBuffer::usedSpace()
return 0;
if (readPointer < writePointer)
return writePointer - readPointer;
return BUFFER_SIZE - offset(readPointer) - 1 + offset(writePointer);
return bufferSize - offset(readPointer) - 1 + offset(writePointer);
}
size_t GwBuffer::addData(const uint8_t *data, size_t len)
{
lp("addDataE", len);
if (len == 0)
return 0;
if (freeSpace() < len)
if (freeSpace() < len && rotate)
//in rotating mode (send buffer)
//we only fill in a message if it fit's completely
return 0;
size_t written = 0;
bool canRotate=rotate && offset(readPointer) > 0;
if (writePointer >= readPointer)
{
written = BUFFER_SIZE - offset(writePointer) - 1;
written = bufferSize - offset(writePointer) - 1;
if (written > 0 && ! canRotate){
//if we cannot rotate we are not allowed to write to the last byte
//as otherwise we would not be able to distinguish between full and empty
written--;
}
if (written > len)
written = len;
if (written)
@@ -54,7 +71,7 @@ size_t GwBuffer::addData(const uint8_t *data, size_t len)
len -= written;
data += written;
writePointer += written;
if (offset(writePointer) >= (BUFFER_SIZE - 1))
if (offset(writePointer) >= (bufferSize - 1) && canRotate)
writePointer = buffer;
}
lp("addData1", written);
@@ -63,21 +80,24 @@ size_t GwBuffer::addData(const uint8_t *data, size_t len)
return written;
}
}
if (! canRotate) return written;
//now we have the write pointer before the read pointer
//and we did the length check before - so we can safely copy
memcpy(writePointer, data, len);
writePointer += len;
lp("addData2", len);
return len + written;
int maxLen=readPointer-writePointer-1;
if (len < maxLen) maxLen=len;
memcpy(writePointer, data, maxLen);
writePointer += maxLen;
lp("addData2", maxLen);
return maxLen + written;
}
/**
* write some data to the buffer writer
* return an error if the buffer writer returned < 0
*/
GwBuffer::WriteStatus GwBuffer::fetchData(GwBufferWriter *writer, bool errorIf0 )
GwBuffer::WriteStatus GwBuffer::fetchData(GwBufferWriter *writer, int maxLen,bool errorIf0 )
{
lp("fetchDataE");
size_t len = usedSpace();
if (maxLen > 0 && len > maxLen) len=maxLen;
if (len == 0)
return OK;
size_t written = 0;
@@ -85,7 +105,7 @@ GwBuffer::WriteStatus GwBuffer::fetchData(GwBufferWriter *writer, bool errorIf0
if (writePointer < readPointer)
{
//we need to write from readPointer till end and then till writePointer-1
plen = BUFFER_SIZE - offset(readPointer) - 1;
plen = bufferSize - offset(readPointer) - 1;
int rt = writer->write(readPointer, plen);
lp("fetchData1", rt);
if (rt < 0)
@@ -104,7 +124,7 @@ GwBuffer::WriteStatus GwBuffer::fetchData(GwBufferWriter *writer, bool errorIf0
return (errorIf0 ? ERROR : AGAIN);
}
readPointer += rt;
if (offset(readPointer) >= (BUFFER_SIZE - 1))
if (offset(readPointer) >= (bufferSize - 1))
readPointer = buffer;
if (rt < plen)
return AGAIN;
@@ -135,11 +155,43 @@ GwBuffer::WriteStatus GwBuffer::fetchData(GwBufferWriter *writer, bool errorIf0
return ERROR;
}
readPointer += rt;
if (offset(readPointer) >= (BUFFER_SIZE - 1))
if (offset(readPointer) >= (bufferSize - 1))
readPointer = buffer;
lp("fetchData3");
written += rt;
if (written < len)
return AGAIN;
return OK;
}
int GwBuffer::findChar(char x){
int offset=0;
uint8_t *p;
for (p=readPointer; p != writePointer && p < (buffer+bufferSize);p++){
if (*p == x) return offset;
offset++;
}
if (p >= (buffer+bufferSize)){
//we reached the end of the buffer without "hitting" the write pointer
//so we can start from the beginning if rotating...
if (! rotate) return -1;
for (p=buffer;p < writePointer && p < (buffer+bufferSize);p++){
if (*p == x) return offset;
offset++;
}
}
return -1;
}
GwBuffer::WriteStatus GwBuffer::fetchMessage(GwBufferWriter *writer,char delimiter,bool emptyIfFull){
int pos=findChar(delimiter);
if (pos < 0) {
if (!freeSpace() && emptyIfFull){
LOG_DEBUG(GwLog::LOG,"line to long, reset");
reset();
return ERROR;
}
return AGAIN;
}
return fetchData(writer,pos+1,true);
}

16
lib/queue/GwBuffer.h
View File

@@ -6,6 +6,7 @@
class GwBufferWriter{
public:
int id=0; //can be set be users
virtual int write(const uint8_t *buffer,size_t len)=0;
virtual ~GwBufferWriter(){};
};
@@ -24,7 +25,9 @@ class GwBuffer{
AGAIN
} WriteStatus;
private:
uint8_t buffer[BUFFER_SIZE];
size_t bufferSize;
bool rotate;
uint8_t *buffer;
uint8_t *writePointer=buffer;
uint8_t *readPointer=buffer;
size_t offset(uint8_t* ptr){
@@ -32,8 +35,13 @@ class GwBuffer{
}
GwLog *logger;
void lp(const char *fkt,int p=0);
/**
* find the first occurance of x in the buffer, -1 if not found
*/
int findChar(char x);
public:
GwBuffer(GwLog *logger);
GwBuffer(GwLog *logger,size_t bufferSize,bool rotate=true);
~GwBuffer();
void reset();
size_t freeSpace();
size_t usedSpace();
@@ -42,7 +50,9 @@ class GwBuffer{
* write some data to the buffer writer
* return an error if the buffer writer returned < 0
*/
WriteStatus fetchData(GwBufferWriter *writer, bool errorIf0 = true);
WriteStatus fetchData(GwBufferWriter *writer, int maxLen=-1,bool errorIf0 = true);
WriteStatus fetchMessage(GwBufferWriter *writer,char delimiter,bool emptyIfFull=true);
};
#endif