mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-24 16:46:13 +01:00
Compare commits
No commits in common. "5aca3a62d849d70a56465d4c48a40f8526b623ea" and "7f430ce6bd759b0d3835976bde0040529459ada6" have entirely different histories.
5aca3a62d8
...
7f430ce6bd
|
@ -122,8 +122,6 @@ bool WifiNINA::setup(const char *SSid,
|
||||||
DIAG(F("Forcing one more Wifi restart"));
|
DIAG(F("Forcing one more Wifi restart"));
|
||||||
// esp_wifi_start();
|
// esp_wifi_start();
|
||||||
// esp_wifi_connect();
|
// esp_wifi_connect();
|
||||||
WiFi.end();
|
|
||||||
WiFi.begin(SSid, password);
|
|
||||||
tries=40;
|
tries=40;
|
||||||
while (WiFi.status() != WL_CONNECTED && tries) {
|
while (WiFi.status() != WL_CONNECTED && tries) {
|
||||||
Serial.print('.');
|
Serial.print('.');
|
||||||
|
@ -221,7 +219,8 @@ void WifiNINA::checkForNewClient() {
|
||||||
for (byte clientId=0; clientId<MAX_CLIENTS; clientId++){
|
for (byte clientId=0; clientId<MAX_CLIENTS; clientId++){
|
||||||
if (!clients[clientId]) {
|
if (!clients[clientId]) {
|
||||||
clients[clientId]= new WiFiClient(newClient); // use this slot
|
clients[clientId]= new WiFiClient(newClient); // use this slot
|
||||||
//DIAG(F("New client connected to slot %d"),clientId); //TJF: brought in for debugging.
|
clients[clientId]->flush(); // clear out the input buffer
|
||||||
|
DIAG(F("New client connected to slot %d"),clientId); //TJF: brought in for debugging.
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -232,8 +231,9 @@ void WifiNINA::checkForLostClients() {
|
||||||
auto c=clients[clientId];
|
auto c=clients[clientId];
|
||||||
if(c && !c->connected()) {
|
if(c && !c->connected()) {
|
||||||
clients[clientId]->stop();
|
clients[clientId]->stop();
|
||||||
//DIAG(F("Remove client %d"), clientId);
|
DIAG(F("Remove client %d"), clientId);
|
||||||
CommandDistributor::forget(clientId);
|
CommandDistributor::forget(clientId);
|
||||||
|
//delete c; //TJF: this causes a crash when client drops.. commenting out for now.
|
||||||
clients[clientId]=nullptr;
|
clients[clientId]=nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -266,11 +266,16 @@ void WifiNINA::checkForClientOutput() {
|
||||||
if (!c) {
|
if (!c) {
|
||||||
// client is gone, throw away msg
|
// client is gone, throw away msg
|
||||||
for (int i=0;i<replySize;i++) outboundRing->read();
|
for (int i=0;i<replySize;i++) outboundRing->read();
|
||||||
//DIAG(F("gone, drop message.")); //TJF: only for diag
|
DIAG(F("gone, drop message.")); //TJF: only for diag
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// emit data to the client object
|
// emit data to the client object
|
||||||
|
// This should work in theory, the
|
||||||
|
//DIAG(F("send message")); //TJF: only for diag
|
||||||
|
//TJF: the old code had to add a 0x00 byte to the end to terminate the
|
||||||
|
//TJF: c string, before sending it. i take it this is not needed?
|
||||||
for (int i=0;i<replySize;i++) c->write(outboundRing->read());
|
for (int i=0;i<replySize;i++) c->write(outboundRing->read());
|
||||||
|
//c->write((byte)0x00);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WifiNINA::loop() {
|
void WifiNINA::loop() {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user