WiFiClient - rename flush() to clear() (breaking)

espressif · Nov 11, 2023 · bd5fe04 · bd5fe04
1 parent fbfcb80
commit bd5fe04
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/libraries/WiFi/examples/WiFiIPv6/WiFiIPv6.ino b/libraries/WiFi/examples/WiFiIPv6/WiFiIPv6.ino
@@ -50,7 +50,7 @@ void wifiConnectedLoop(){
     if(packetLength >= NTP_PACKET_SIZE){
       ntpClient.read(ntpPacketBuffer, NTP_PACKET_SIZE);
     }
-    ntpClient.flush();
+    ntpClient.clear();
     uint32_t secsSince1900 = (uint32_t)ntpPacketBuffer[40] << 24 | (uint32_t)ntpPacketBuffer[41] << 16 | (uint32_t)ntpPacketBuffer[42] << 8 | ntpPacketBuffer[43];
     //Serial.printf("Seconds since Jan 1 1900: %u\n", secsSince1900);
     uint32_t epoch = secsSince1900 - 2208988800UL;

diff --git a/libraries/WiFi/src/WiFiClient.cpp b/libraries/WiFi/src/WiFiClient.cpp
@@ -154,7 +154,7 @@ class WiFiClientRxBuffer {
         return _fill - _pos + r_available();
     }
 
-    void flush(){
+    void clear(){
         if(r_available()){
             fillBuffer();
         }
@@ -465,6 +465,11 @@ size_t WiFiClient::write(Stream &stream)
     return written;
 }
 
+void WiFiClient::flush()
+{
+
+}
+
 int WiFiClient::read(uint8_t *buf, size_t size)
 {
     int res = -1;
@@ -507,9 +512,9 @@ int WiFiClient::available()
 
 // Though flushing means to send all pending data,
 // seems that in Arduino it also means to clear RX
-void WiFiClient::flush() {
+void WiFiClient::clear() {
     if (_rxBuffer != nullptr) {
-        _rxBuffer->flush();
+        _rxBuffer->clear();
     }
 }
 

diff --git a/libraries/WiFi/src/WiFiClient.h b/libraries/WiFi/src/WiFiClient.h
@@ -57,11 +57,12 @@ class WiFiClient : public ESPLwIPClient
     size_t write(const uint8_t *buf, size_t size);
     size_t write_P(PGM_P buf, size_t size);
     size_t write(Stream &stream);
+    void flush(); // Print::flush tx
     int available();
     int read();
     int read(uint8_t *buf, size_t size);
     int peek();
-    void flush();
+    void clear();  // clear rx
     void stop();
     uint8_t connected();
 

diff --git a/libraries/WiFi/src/WiFiUdp.cpp b/libraries/WiFi/src/WiFiUdp.cpp
@@ -204,6 +204,11 @@ size_t WiFiUDP::write(const uint8_t *buffer, size_t size){
   return i;
 }
 
+void WiFiUDP::flush()
+{
+
+}
+
 int WiFiUDP::parsePacket(){
   if(rx_buffer)
     return 0;
@@ -267,7 +272,7 @@ int WiFiUDP::peek(){
   return rx_buffer->peek();
 }
 
-void WiFiUDP::flush(){
+void WiFiUDP::clear(){
   if(!rx_buffer) return;
   cbuf *b = rx_buffer;
   rx_buffer = 0;

diff --git a/libraries/WiFi/src/WiFiUdp.h b/libraries/WiFi/src/WiFiUdp.h
@@ -63,13 +63,14 @@ class WiFiUDP : public UDP {
   int endPacket();
   size_t write(uint8_t);
   size_t write(const uint8_t *buffer, size_t size);
+  void flush(); // Print::flush tx
   int parsePacket();
   int available();
   int read();
   int read(unsigned char* buffer, size_t len);
   int read(char* buffer, size_t len);
   int peek();
-  void flush();
+  void clear();  // clear rx
   IPAddress remoteIP();
   uint16_t remotePort();
 };