Use IOChannel discardInput() and flushOutput(), had to set discard_timeout_ms = 0

Author: FozzTexx

lib/bus/sio/NetSIO.cpp

@@ -72,6 +72,8 @@ void NetSIO::begin(int baud)
         end();
     }
 
+    discard_timeout_ms = 0;
+
     _baud = baud;
     _resume_time = 0;
 
@@ -551,22 +553,24 @@ bool NetSIO::wait_for_credit(int needed)
     return true;
 }
 
+#ifdef OBSOLETE
 /* Discards anything in the input buffer
 */
 void NetSIO::flush_input()
 {
     if (_initialized)
         _fifo.clear();
 }
+#endif /* OBSOLETE */
 
 /* Clears input buffer and flushes out transmit buffer waiting at most
    waiting MAX_FLUSH_WAIT_TICKS until all sends are completed
 */
-void NetSIO::flush()
+void NetSIO::flushOutput()
 {
     if (_initialized)
     {
-        flush_input();
+        discardInput();
         wait_sock_writable(500);
     }
 }

lib/bus/sio/NetSIO.h

@@ -74,7 +74,7 @@ class NetSIO : public IOChannel
     void end();
     bool poll(int ms);
 
-    void flushOutput() override { flush(); }
+    void flushOutput() override;
 
     void set_baudrate(uint32_t baud);
     uint32_t get_baudrate();
@@ -89,8 +89,10 @@ class NetSIO : public IOChannel
 #ifdef OBSOLETE
     int available();
 #endif /* OBSOLETE */
+#ifdef OBSOLETE
     void flush();
     void flush_input();
+#endif /* OBSOLETE */
 
 #ifdef OBSOLETE
     // read single byte

lib/bus/sio/sio.cpp

@@ -462,7 +462,7 @@ void systemBus::service()
         SYSTEM_BUS.discardInput();
 #else
         if (_port.get_sio_mode() == SioCom::sio_mode::SERIAL)
-            _port.flush_input();
+            _port.discardInput();
 #endif
     }
 
@@ -536,7 +536,7 @@ void systemBus::setup()
     // Set the initial HSIO index
     setHighSpeedIndex(Config.get_general_hsioindex());
 
-    _port.flush_input();
+    _port.discardInput();
 #endif
 }
 
@@ -640,8 +640,8 @@ void systemBus::toggleBaudrate()
     // Debug_printf("Toggling baudrate from %d to %d\n", _sioBaud, baudrate);
     _sioBaud = baudrate;
 #ifndef ESP_PLATFORM
-    _port.flush_input();
-    _port.flush();
+    _port.discardInput();
+    _port.flushOutput();
     // hmm, calling flush() may not be enough to empty TX buffer
     fnSystem.delay_microseconds(2000);
 #endif

lib/bus/sio/sio.h

@@ -345,8 +345,8 @@ class systemBus
     size_t write(const void *buffer, size_t length) { return _port.write((uint8_t *) buffer, length); }
     size_t write(int n) { return _port.write(n); }
     size_t available() { return _port.available(); }
-    void flush() { _port.flush(); }
-    void discardInput() { _port.flush_input(); }
+    void flush() { _port.flushOutput(); }
+    void discardInput() { _port.discardInput(); }
     size_t print(int n, int base = 10) { return _port.print(n, base); }
     size_t print(const char *str) { return _port.print(str); }
     size_t print(const std::string &str) { return _port.print(str); }