Skip to content

Commit

Permalink
WiFiClient - rename flush() to clear() (breaking)
Browse files Browse the repository at this point in the history
  • Loading branch information
JAndrassy committed Apr 3, 2024
1 parent 64235dc commit 169469f
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 9 deletions.
8 changes: 8 additions & 0 deletions docs/en/migration_guides/2.x_to_3.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -197,3 +197,11 @@ Functional changes
* Any pin set as -1 in ``begin()`` or ``setPins()`` won't be changed nor detached.
* ``begin(baud)`` will not change any pins that have been set before this call, through a previous ``begin(baud, rx, tx)`` or ``setPin()``.
* If the application only uses RX or TX, ``begin(baud, -1, tx)`` or ``begin(baud, rx)`` will change only the assigned pin and keep the other unchanged.

WiFi
----

Functional changes
******************

* WiFiClient and WiFiUDP function`flush()`doesn't clear the receive buffer anymore. A new function `clear()` clears the receive buffer. In Arduino (and other frameworks) function named `flush()` is intended to send out the transmit buffer content. Currently `flush()` does nothing in WiFiClient, WiFiClientSecure and WiFiUDP.
13 changes: 8 additions & 5 deletions libraries/Network/src/NetworkClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ class NetworkClientRxBuffer {
return _fill - _pos + r_available();
}

void flush(){
void clear(){
if(r_available()){
fillBuffer();
}
Expand Down Expand Up @@ -391,6 +391,11 @@ int NetworkClient::read()
return data;
}

void NetworkClient::flush()
{

}

size_t NetworkClient::write(const uint8_t *buf, size_t size)
{
int res =0;
Expand Down Expand Up @@ -534,11 +539,9 @@ int NetworkClient::available()
return res;
}

// Though flushing means to send all pending data,
// seems that in Arduino it also means to clear RX
void NetworkClient::flush() {
void NetworkClient::clear() {
if (_rxBuffer != nullptr) {
_rxBuffer->flush();
_rxBuffer->clear();
}
}

Expand Down
3 changes: 2 additions & 1 deletion libraries/Network/src/NetworkClient.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,12 @@ class NetworkClient : 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();
void setSSE(bool sse);
Expand Down
7 changes: 6 additions & 1 deletion libraries/Network/src/NetworkUdp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,11 @@ size_t NetworkUDP::write(const uint8_t *buffer, size_t size){
return i;
}

void NetworkUDP::flush()
{

}

int NetworkUDP::parsePacket(){
if(rx_buffer)
return 0;
Expand Down Expand Up @@ -374,7 +379,7 @@ int NetworkUDP::peek(){
return rx_buffer->peek();
}

void NetworkUDP::flush(){
void NetworkUDP::clear(){
if(!rx_buffer) return;
cbuf *b = rx_buffer;
rx_buffer = 0;
Expand Down
3 changes: 2 additions & 1 deletion libraries/Network/src/NetworkUdp.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,14 @@ class NetworkUDP : 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();
};
Expand Down
2 changes: 1 addition & 1 deletion libraries/WiFi/examples/WiFiIPv6/WiFiIPv6.ino
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 169469f

Please sign in to comment.