Skip to content

WiFi library ArduinoWiFiServer update #8238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 22, 2021
Merged

WiFi library ArduinoWiFiServer update #8238

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3aaf242
ArduinoWiFiServer - check for clients in write() too
JAndrassy Jul 25, 2021
72fcad7
PagerServer example - fix typo in comment
JAndrassy Jul 25, 2021
1ca65c9
ArduinoWiFiServer - fix typo in class name
JAndrassy Jul 25, 2021
56f0218
Merge branch 'ArduinoWiFiServer' of https://github.com/jandrassy/Ardu…
JAndrassy Sep 22, 2021
78e838f
Merge branch 'master' into ArduinoWiFiServer
JAndrassy Sep 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libraries/ESP8266WiFi/examples/PagerServer/PagerServer.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Pager Server

The ESP8266WiFi library's WiFiServer and WiFiServerSecure
work differently then WiFiServer and EthernetSever
work differently than WiFiServer and EthernetSever
in Arduino networking libraries.
This example demonstrates the ArduinoWiFiServer,
which enhances the WiFiServer.
Expand Down
21 changes: 15 additions & 6 deletions libraries/ESP8266WiFi/src/ArduinoWiFiServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,8 @@ class ArduinoComptibleWiFiServerTemplate : public TServer {
// https://www.arduino.cc/en/Reference/WiFiServerAvailable
TClient available() {

// update connected clients
for (uint8_t i = 0; i < MAX_MONITORED_CLIENTS; i++) {
if (!connectedClients[i]) {
connectedClients[i] = accept();
}
}
acceptClients();

// find next client with data available
for (uint8_t i = 0; i < MAX_MONITORED_CLIENTS; i++) {
if (index == MAX_MONITORED_CLIENTS) {
Expand All @@ -67,6 +63,12 @@ class ArduinoComptibleWiFiServerTemplate : public TServer {
}

virtual size_t write(const uint8_t *buf, size_t size) override {
static uint32_t lastCheck;
uint32_t m = millis();
if (m - lastCheck > 100) {
lastCheck = m;
acceptClients();
}
if (size == 0)
return 0;
size_t ret = 0;
Expand Down Expand Up @@ -127,6 +129,13 @@ class ArduinoComptibleWiFiServerTemplate : public TServer {
TClient connectedClients[MAX_MONITORED_CLIENTS];
uint8_t index = 0;

void acceptClients() {
for (uint8_t i = 0; i < MAX_MONITORED_CLIENTS; i++) {
if (!connectedClients[i]) {
connectedClients[i] = accept();
}
}
}
};

typedef ArduinoComptibleWiFiServerTemplate<WiFiServer, WiFiClient> ArduinoWiFiServer;
Expand Down