HWCDC: added optimized timedRead and timedPeek

Author: imwhocodes

Diff for: cores/esp32/HWCDC.cpp

@@ -558,23 +558,23 @@ int HWCDC::available(void) {
   return uxQueueMessagesWaiting(rx_queue);
 }
 
-int HWCDC::peek(void) {
+int HWCDC::_peek(TickType_t timeout) {
   if (rx_queue == NULL) {
     return -1;
   }
   uint8_t c;
-  if (xQueuePeek(rx_queue, &c, 0)) {
+  if (xQueuePeek(rx_queue, &c, timeout)) {
     return c;
   }
   return -1;
 }
 
-int HWCDC::read(void) {
+int HWCDC::_read(TickType_t timeout) {
   if (rx_queue == NULL) {
     return -1;
   }
   uint8_t c = 0;
-  if (xQueueReceive(rx_queue, &c, 0)) {
+  if (xQueueReceive(rx_queue, &c, timeout)) {
     return c;
   }
   return -1;

Diff for: cores/esp32/HWCDC.h

@@ -48,6 +48,17 @@ class HWCDC : public Stream {
   static bool deinit(void *busptr);
   static bool isCDC_Connected();
 
+protected:
+  int _peek(TickType_t timeout);
+  int _read(TickType_t timeout);
+
+  virtual int timedRead() override {
+    return _read(pdMS_TO_TICKS(_timeout));
+  }
+  virtual int timedPeek() override {
+    return _peek(pdMS_TO_TICKS(_timeout));
+  }
+
 public:
   HWCDC();
   ~HWCDC();
@@ -63,8 +74,12 @@ class HWCDC : public Stream {
 
   int available(void);
   int availableForWrite(void);
-  int peek(void);
-  int read(void);
+  int peek(void){
+    return _peek(0);
+  }
+  int read(void){
+    return _read(0);
+  }
   size_t read(uint8_t *buffer, size_t size);
   size_t write(uint8_t);
   size_t write(const uint8_t *buffer, size_t size);