UART rework

many possible problems fixed in preparation for thread-safe

Author: me-no-dev

cores/esp32/HardwareSerial.cpp

@@ -33,80 +33,48 @@ void HardwareSerial::setDebugOutput(bool en)
  return;
  }
  if(en) {
- if(_uart->txEnabled) {
- uartSetDebug(_uart);
- } else {
- uartSetDebug(0);
- }
+ uartSetDebug(_uart);
  } else {
  if(uartGetDebug() == _uart_nr) {
  uartSetDebug(0);
  }
  }
 }
 
-bool HardwareSerial::isTxEnabled(void)
-{
- if(_uart == 0) {
- return false;
- }
- return _uart->txEnabled;
-}
-
-bool HardwareSerial::isRxEnabled(void)
-{
- if(_uart == 0) {
- return false;
- }
- return _uart->rxEnabled;
-}
-
 int HardwareSerial::available(void)
 {
- if (_uart && _uart->rxEnabled) {
- return uartAvailable(_uart);
- }
- return 0;
+ return uartAvailable(_uart);
 }
 
 int HardwareSerial::peek(void)
 {
- if (_uart && _uart->rxEnabled) {
+ if (available()) {
  return uartPeek(_uart);
  }
  return -1;
 }
 
 int HardwareSerial::read(void)
 {
- if(_uart && _uart->rxEnabled) {
+ if(available()) {
  return uartRead(_uart);
  }
  return -1;
 }
 
 void HardwareSerial::flush()
 {
- if(_uart == 0 || !_uart->txEnabled) {
- return;
- }
  uartFlush(_uart);
 }
 
 size_t HardwareSerial::write(uint8_t c)
 {
- if(_uart == 0 || !_uart->txEnabled) {
- return 0;
- }
  uartWrite(_uart, c);
  return 1;
 }
 
 size_t HardwareSerial::write(const uint8_t *buffer, size_t size)
 {
- if(_uart == 0 || !_uart->txEnabled) {
- return 0;
- }
  uartWriteBuf(_uart, buffer, size);
  return size;
 }

cores/esp32/HardwareSerial.h

@@ -65,8 +65,6 @@ class HardwareSerial: public Stream
  operator bool() const;
 
  void setDebugOutput(bool);
- bool isTxEnabled(void);
- bool isRxEnabled(void);
 
 protected:
  int _uart_nr;