dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-24 16:46:13 +01:00
Code Releases Activity

Merge 701bc0a837 into d46a6f092a

Browse Source
This commit is contained in:
Travis Farmer 2023-11-02 18:00:29 +00:00 committed by GitHub
commit 21253e3c18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Wifi_NINA.cpp
View File

@ -55,7 +55,7 @@ public:
NetworkClient(WiFiClient c) {
wifi = c;
};
bool ok() {
bool ok() {
return (inUse && wifi.connected());
};
bool recycle(WiFiClient c) {
@ -65,13 +65,13 @@ public:
// return false here until we have
// implemented a LRU timer
// if (LRU too recent) return false;
return false;
//return false;
wifi = c;
inUse = true;
return true;
};
WiFiClient wifi;
WiFiClient wifi;
bool inUse = true;
};
@ -248,6 +248,9 @@ bool WifiNINA::setup(const char *SSid,
// #else
DIAG(F("Server will be started on port %d"),port);
// #endif
ip = WiFi.localIP();
LCD(4,F("IP: %d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
LCD(5,F("Port:%d"), port);
return true;
}
@ -271,31 +274,33 @@ void WifiNINA::loop() {
for (clientId=0; clientId<clients.size(); clientId++){
// check if client is there and alive
if(clients[clientId].inUse && !clients[clientId].wifi.connected()) {
DIAG(F("Remove client %d"), clientId);
CommandDistributor::forget(clientId);
clients[clientId].wifi.stop();
clients[clientId].inUse = false;
//Do NOT clients.erase(clients.begin()+clientId) as
//that would mix up clientIds for later.
DIAG(F("Remove client %d"), clientId);
CommandDistributor::forget(clientId);
clients[clientId].wifi.stop();
clients[clientId].inUse = false;
//Do NOT clients.erase(clients.begin()+clientId) as
//that would mix up clientIds for later.
}
}
if (server->available()) {
WiFiClient client;
while (client = server->available()) {
WiFiClient client = server->available();
if (client == true) {
///while (client.available() == true) {
for (clientId=0; clientId<clients.size(); clientId++){
if (clients[clientId].recycle(client)) {
ip = client.remoteIP();
DIAG(F("Recycle client %d %s"), clientId, ip);
DIAG(F("Recycle client %d %d.%d.%d.%d"), clientId, ip[0], ip[1], ip[2], ip[3]);
break;
}
}
if (clientId>=clients.size()) {
NetworkClient nc(client);
clients.push_back(nc);
NetworkClient* nc=new NetworkClient(client);
clients.push_back(*nc);
//delete nc;
ip = client.remoteIP();
DIAG(F("New client %d, %s"), clientId, ip);
DIAG(F("New client %d, %d.%d.%d.%d"), clientId, ip[0], ip[1], ip[2], ip[3]);
}
}
///}
}
// loop over all connected clients
for (clientId=0; clientId<clients.size(); clientId++){