Unverified Commit 9b32541c authored by Juraj Andrássy's avatar Juraj Andrássy Committed by GitHub

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

Co-authored-by: default avatarLucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
parent cff2a18a
...@@ -197,3 +197,11 @@ Functional changes ...@@ -197,3 +197,11 @@ Functional changes
* Any pin set as -1 in ``begin()`` or ``setPins()`` won't be changed nor detached. * 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()``. * ``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. * 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
******************
* In Arduino (and other frameworks) the method named ``flush()`` is intended to send out the transmit buffer content. ``WiFiClient`` and ``WiFiUDP`` method ``flush()`` won't clear the receive buffer anymore. A new method called ``clear()`` is now used for that. Currently ``flush()`` does nothing in ``WiFiClient``, ``WiFiClientSecure`` and ``WiFiUDP``.
...@@ -159,7 +159,7 @@ public: ...@@ -159,7 +159,7 @@ public:
return _fill - _pos + r_available(); return _fill - _pos + r_available();
} }
void flush(){ void clear(){
if(r_available()){ if(r_available()){
fillBuffer(); fillBuffer();
} }
...@@ -391,6 +391,11 @@ int NetworkClient::read() ...@@ -391,6 +391,11 @@ int NetworkClient::read()
return data; return data;
} }
void NetworkClient::flush()
{
}
size_t NetworkClient::write(const uint8_t *buf, size_t size) size_t NetworkClient::write(const uint8_t *buf, size_t size)
{ {
int res =0; int res =0;
...@@ -534,11 +539,9 @@ int NetworkClient::available() ...@@ -534,11 +539,9 @@ int NetworkClient::available()
return res; return res;
} }
// Though flushing means to send all pending data, void NetworkClient::clear() {
// seems that in Arduino it also means to clear RX
void NetworkClient::flush() {
if (_rxBuffer != nullptr) { if (_rxBuffer != nullptr) {
_rxBuffer->flush(); _rxBuffer->clear();
} }
} }
......
...@@ -59,11 +59,12 @@ public: ...@@ -59,11 +59,12 @@ public:
size_t write(const uint8_t *buf, size_t size); size_t write(const uint8_t *buf, size_t size);
size_t write_P(PGM_P buf, size_t size); size_t write_P(PGM_P buf, size_t size);
size_t write(Stream &stream); size_t write(Stream &stream);
void flush(); // Print::flush tx
int available(); int available();
int read(); int read();
int read(uint8_t *buf, size_t size); int read(uint8_t *buf, size_t size);
int peek(); int peek();
void flush(); void clear(); // clear rx
void stop(); void stop();
uint8_t connected(); uint8_t connected();
void setSSE(bool sse); void setSSE(bool sse);
......
...@@ -288,6 +288,11 @@ size_t NetworkUDP::write(const uint8_t *buffer, size_t size){ ...@@ -288,6 +288,11 @@ size_t NetworkUDP::write(const uint8_t *buffer, size_t size){
return i; return i;
} }
void NetworkUDP::flush()
{
}
int NetworkUDP::parsePacket(){ int NetworkUDP::parsePacket(){
if(rx_buffer) if(rx_buffer)
return 0; return 0;
...@@ -374,7 +379,7 @@ int NetworkUDP::peek(){ ...@@ -374,7 +379,7 @@ int NetworkUDP::peek(){
return rx_buffer->peek(); return rx_buffer->peek();
} }
void NetworkUDP::flush(){ void NetworkUDP::clear(){
if(!rx_buffer) return; if(!rx_buffer) return;
cbuf *b = rx_buffer; cbuf *b = rx_buffer;
rx_buffer = 0; rx_buffer = 0;
......
...@@ -63,13 +63,14 @@ public: ...@@ -63,13 +63,14 @@ public:
int endPacket(); int endPacket();
size_t write(uint8_t); size_t write(uint8_t);
size_t write(const uint8_t *buffer, size_t size); size_t write(const uint8_t *buffer, size_t size);
void flush(); // Print::flush tx
int parsePacket(); int parsePacket();
int available(); int available();
int read(); int read();
int read(unsigned char* buffer, size_t len); int read(unsigned char* buffer, size_t len);
int read(char* buffer, size_t len); int read(char* buffer, size_t len);
int peek(); int peek();
void flush(); void clear(); // clear rx
IPAddress remoteIP(); IPAddress remoteIP();
uint16_t remotePort(); uint16_t remotePort();
}; };
......
...@@ -50,7 +50,7 @@ void wifiConnectedLoop(){ ...@@ -50,7 +50,7 @@ void wifiConnectedLoop(){
if(packetLength >= NTP_PACKET_SIZE){ if(packetLength >= NTP_PACKET_SIZE){
ntpClient.read(ntpPacketBuffer, 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]; 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); //Serial.printf("Seconds since Jan 1 1900: %u\n", secsSince1900);
uint32_t epoch = secsSince1900 - 2208988800UL; uint32_t epoch = secsSince1900 - 2208988800UL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment