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

handle receiving and distributing on NMEA messages

Browse Source
This commit is contained in:
andreas
2021-10-28 10:25:12 +02:00
parent edb8d6e863
commit 1be2b1a667
8 changed files with 111 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/serial/GwSerial.cpp
View File

@@ -13,17 +13,24 @@ class SerialWriter : public GwBufferWriter{
};
GwSerial::GwSerial(GwLog *logger, uart_port_t num)
GwSerial::GwSerial(GwLog *logger, uart_port_t num, int id,bool allowRead)
{
this->id=id;
this->logger = logger;
this->num = num;
this->buffer = new GwBuffer(logger,1600);
this->buffer = new GwBuffer(logger,GwBuffer::TX_BUFFER_SIZE);
this->writer = new SerialWriter(num);
this->allowRead=allowRead;
if (allowRead){
this->readBuffer=new GwBuffer(logger, GwBuffer::RX_BUFFER_SIZE);
}
}
GwSerial::~GwSerial()
{
delete buffer;
delete writer;
if (readBuffer) delete readBuffer;
}
int GwSerial::setup(int baud, int rxpin, int txpin)
{
@@ -54,13 +61,32 @@ int GwSerial::setup(int baud, int rxpin, int txpin)
bool GwSerial::isInitialized() { return initialized; }
size_t GwSerial::enqueue(const uint8_t *data, size_t len)
{
if (! isInitialized()) return 0;
return buffer->addData(data, len);
}
GwBuffer::WriteStatus GwSerial::write(){
if (! isInitialized()) return GwBuffer::ERROR;
return buffer->fetchData(writer,false);
}
const char *GwSerial::read(){
void GwSerial::sendToClients(const char *buf,int sourceId){
if ( sourceId == id) return;
size_t len=strlen(buf);
size_t enqueued=enqueue((const uint8_t*)buf,len);
if (enqueued != len){
LOG_DEBUG(GwLog::DEBUG,"GwSerial overflow on channel %d",id);
overflows++;
}
}
void GwSerial::loop(bool handleRead){
write();
if (! handleRead) return;
char buffer[10];
uart_read_bytes(num,(uint8_t *)(&buffer),10,0);
return NULL;
int rt=uart_read_bytes(num,(uint8_t *)(&buffer),10,0);
if (allowRead & rt > 0){
readBuffer->addData((uint8_t *)(&buffer),rt,true);
}
}
bool GwSerial::readMessages(GwBufferWriter *writer){
if (! allowRead) return false;
return readBuffer->fetchMessage(writer,'\n',true) == GwBuffer::OK;
}

15
lib/serial/GwSerial.h
View File

@@ -7,19 +7,24 @@ class SerialWriter;
class GwSerial{
private:
GwBuffer *buffer;
GwBuffer *readBuffer;
GwBuffer *readBuffer=NULL;
GwLog *logger;
SerialWriter *writer;
uart_port_t num;
bool initialized=false;
bool allowRead=true;
GwBuffer::WriteStatus write();
int id=-1;
int overflows=0;
size_t enqueue(const uint8_t *data, size_t len);
public:
static const int bufferSize=200;
GwSerial(GwLog *logger,uart_port_t num);
GwSerial(GwLog *logger,uart_port_t num,int id,bool allowRead=true);
~GwSerial();
int setup(int baud,int rxpin,int txpin);
bool isInitialized();
size_t enqueue(const uint8_t *data, size_t len);
GwBuffer::WriteStatus write();
const char *read();
void sendToClients(const char *buf,int sourceId);
void loop(bool handleRead=true);
bool readMessages(GwBufferWriter *writer);
};
#endif