mirror of
https://github.com/thooge/esp32-nmea2000-obp60.git
synced 2025-12-13 05:53:06 +01:00
use nonblocking write for serial
This commit is contained in:
@@ -1,25 +1,38 @@
|
||||
#include "GwLog.h"
|
||||
|
||||
GwLog::GwLog(bool logSerial, int level){
|
||||
this->logSerial=logSerial;
|
||||
class DefaultLogWriter: public GwLogWriter{
|
||||
public:
|
||||
virtual ~DefaultLogWriter(){};
|
||||
virtual void write(const char *data){
|
||||
Serial.print(data);
|
||||
}
|
||||
};
|
||||
|
||||
GwLog::GwLog(int level, GwLogWriter *writer){
|
||||
logLevel=level;
|
||||
if (writer == NULL) writer=new DefaultLogWriter();
|
||||
this->writer=writer;
|
||||
}
|
||||
void GwLog::logString(const char *fmt,...){
|
||||
if (! writer) return;
|
||||
va_list args;
|
||||
va_start(args,fmt);
|
||||
vsnprintf(buffer,99,fmt,args);
|
||||
if (logSerial){
|
||||
Serial.print("LOG: ");
|
||||
Serial.println(buffer);
|
||||
}
|
||||
writer->write(prefix.c_str());
|
||||
writer->write(buffer);
|
||||
writer->write("\n");
|
||||
}
|
||||
void GwLog::logDebug(int level,const char *fmt,...){
|
||||
if (level > logLevel) return;
|
||||
if (! writer) return;
|
||||
va_list args;
|
||||
va_start(args,fmt);
|
||||
vsnprintf(buffer,99,fmt,args);
|
||||
if (logSerial){
|
||||
Serial.print("LOG: ");
|
||||
Serial.println(buffer);
|
||||
}
|
||||
writer->write(prefix.c_str());
|
||||
writer->write(buffer);
|
||||
writer->write("\n");
|
||||
}
|
||||
void GwLog::setWriter(GwLogWriter *writer){
|
||||
if (this->writer) delete this->writer;
|
||||
this->writer=writer;
|
||||
}
|
||||
|
||||
@@ -1,17 +1,25 @@
|
||||
#ifndef _GWLOG_H
|
||||
#define _GWLOG_H
|
||||
#include <Arduino.h>
|
||||
|
||||
class GwLogWriter{
|
||||
public:
|
||||
virtual ~GwLogWriter(){}
|
||||
virtual void write(const char *data)=0;
|
||||
};
|
||||
class GwLog{
|
||||
private:
|
||||
char buffer[100];
|
||||
bool logSerial=false;
|
||||
int logLevel=1;
|
||||
GwLogWriter *writer;
|
||||
public:
|
||||
static const int LOG=1;
|
||||
static const int ERROR=0;
|
||||
static const int DEBUG=3;
|
||||
static const int TRACE=2;
|
||||
GwLog(bool logSerial,int level=LOG);
|
||||
String prefix="LOG:";
|
||||
GwLog(int level=LOG, GwLogWriter *writer=NULL);
|
||||
void setWriter(GwLogWriter *writer);
|
||||
void logString(const char *fmt,...);
|
||||
void logDebug(int level, const char *fmt,...);
|
||||
int isActive(int level){return level <= logLevel;};
|
||||
|
||||
66
lib/serial/GwSerial.cpp
Normal file
66
lib/serial/GwSerial.cpp
Normal file
@@ -0,0 +1,66 @@
|
||||
#include "GwSerial.h"
|
||||
class SerialWriter : public GwBufferWriter{
|
||||
private:
|
||||
uart_port_t num;
|
||||
public:
|
||||
SerialWriter(uart_port_t num){
|
||||
this->num=num;
|
||||
}
|
||||
virtual ~SerialWriter(){}
|
||||
virtual int write(const uint8_t *buffer,size_t len){
|
||||
return uart_tx_chars(num,(const char *)buffer,len);
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
GwSerial::GwSerial(GwLog *logger, uart_port_t num)
|
||||
{
|
||||
this->logger = logger;
|
||||
this->num = num;
|
||||
this->buffer = new GwBuffer(logger);
|
||||
this->writer = new SerialWriter(num);
|
||||
}
|
||||
GwSerial::~GwSerial()
|
||||
{
|
||||
delete buffer;
|
||||
delete writer;
|
||||
}
|
||||
int GwSerial::setup(int baud, int rxpin, int txpin)
|
||||
{
|
||||
uart_config_t config = {
|
||||
.baud_rate = baud,
|
||||
.data_bits = UART_DATA_8_BITS,
|
||||
.parity = UART_PARITY_DISABLE,
|
||||
.stop_bits = UART_STOP_BITS_1,
|
||||
.flow_ctrl = UART_HW_FLOWCTRL_DISABLE,
|
||||
};
|
||||
if (uart_driver_install(num, bufferSize, 0, 0, NULL, 0) != ESP_OK)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
// Configure UART parameters
|
||||
if (uart_param_config(num, &config) != ESP_OK)
|
||||
{
|
||||
return -2;
|
||||
}
|
||||
if (uart_set_pin(num, txpin, rxpin, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE) != ESP_OK)
|
||||
{
|
||||
return -3;
|
||||
}
|
||||
buffer->reset();
|
||||
initialized = true;
|
||||
return true;
|
||||
}
|
||||
bool GwSerial::isInitialized() { return initialized; }
|
||||
size_t GwSerial::enqueue(const uint8_t *data, size_t len)
|
||||
{
|
||||
return buffer->addData(data, len);
|
||||
}
|
||||
GwBuffer::WriteStatus GwSerial::write(){
|
||||
return buffer->fetchData(writer,false);
|
||||
}
|
||||
const char *GwSerial::read(){
|
||||
char buffer[10];
|
||||
uart_read_bytes(num,(uint8_t *)(&buffer),10,0);
|
||||
return NULL;
|
||||
}
|
||||
24
lib/serial/GwSerial.h
Normal file
24
lib/serial/GwSerial.h
Normal file
@@ -0,0 +1,24 @@
|
||||
#ifndef _GWSERIAL_H
|
||||
#define _GWSERIAL_H
|
||||
#include "driver/uart.h"
|
||||
#include "GwLog.h"
|
||||
#include "GwBuffer.h"
|
||||
class SerialWriter;
|
||||
class GwSerial{
|
||||
private:
|
||||
GwBuffer *buffer;
|
||||
GwLog *logger;
|
||||
SerialWriter *writer;
|
||||
uart_port_t num;
|
||||
bool initialized=false;
|
||||
public:
|
||||
static const int bufferSize=200;
|
||||
GwSerial(GwLog *logger,uart_port_t num);
|
||||
~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();
|
||||
};
|
||||
#endif
|
||||
Reference in New Issue
Block a user