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

crashes

Browse Source
This commit is contained in:
travis-farmer 2023-11-03 13:40:48 -04:00
parent 741771c4fe
commit 050fed6e9a
No known key found for this signature in database
GPG Key ID: 0BC296791D14CB35
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Wifi_NINA.cpp
View File

@ -184,7 +184,7 @@ bool WifiNINA::setup(const char *SSid,
strMac += String(mac[i], HEX); strMac += String(mac[i], HEX);
} }
DIAG(F("MAC address: %x:%x:%x:%x:%X;%x"), mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); DIAG(F("MAC address: %x:%x:%x:%x:%x:%x"), mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
strMac.remove(0,9); strMac.remove(0,9);
strMac.replace(":",""); strMac.replace(":","");
@ -200,7 +200,7 @@ bool WifiNINA::setup(const char *SSid,
channel) == WL_AP_LISTENING) { channel) == WL_AP_LISTENING) {
DIAG(F("Wifi AP SSID %s PASS %s"),strSSID.c_str(),havePassword ? password : strPass.c_str()); DIAG(F("Wifi AP SSID %s PASS %s"),strSSID.c_str(),havePassword ? password : strPass.c_str());
ip = WiFi.localIP(); ip = WiFi.localIP();
DIAG(F("Wifi AP IP %s"),ip); DIAG(F("Wifi AP IP %d.%d.%d.%d"),ip[0], ip[1], ip[2], ip[3]);
wifiUp = true; wifiUp = true;
APmode = true; APmode = true;
} else { } else {
@ -370,14 +370,14 @@ const char *wlerror[] = {
} }
}*/ }*/
WiFiClient * clients[MAX_CLIENTS]; // nulled in setup WiFiClient clients[MAX_CLIENTS]; // nulled in setup
void WifiNINA::checkForNewClient() { void WifiNINA::checkForNewClient() {
auto newClient=server->available(); auto newClient=server->available();
if (!newClient) return; if (!newClient) return;
for (byte clientId=0; clientId<MAX_CLIENTS; clientId++){ for (byte clientId=0; clientId<MAX_CLIENTS; clientId++){
if (!clients[clientId]) { if (!clients[clientId]) {
clients[clientId]=&newClient; // use this slot clients[clientId]=newClient; // use this slot
DIAG(F("New client connected to slot %d"),clientId); //TJF: brought in for debugging. DIAG(F("New client connected to slot %d"),clientId); //TJF: brought in for debugging.
return; return;
} }
@ -387,11 +387,11 @@ void WifiNINA::checkForNewClient() {
void WifiNINA::checkForLostClients() { void WifiNINA::checkForLostClients() {
for (byte clientId=0; clientId<MAX_CLIENTS; clientId++){ for (byte clientId=0; clientId<MAX_CLIENTS; clientId++){
auto c=clients[clientId]; auto c=clients[clientId];
if(c && !c->connected()) { if(c && !c.connected()) {
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. //delete c; //TJF: this causes a crash when client drops.. commenting out for now.
clients[clientId]=nullptr; //clients[clientId]=NULL; // TJF: what to do... what to do...
} }
} }
} }
@ -401,11 +401,11 @@ void WifiNINA::checkForClientInput() {
for (byte clientId=0; clientId<MAX_CLIENTS; clientId++){ for (byte clientId=0; clientId<MAX_CLIENTS; clientId++){
auto c=clients[clientId]; auto c=clients[clientId];
if(c) { if(c) {
auto len=c->available(); auto len=c.available();
if (len) { if (len) {
// read data from client // read data from client
byte cmd[len+1]; byte cmd[len+1];
for(int i=0; i<len; i++) cmd[i]=c->read(); for(int i=0; i<len; i++) cmd[i]=c.read();
cmd[len]=0; cmd[len]=0;
CommandDistributor::parse(clientId,cmd,outboundRing); CommandDistributor::parse(clientId,cmd,outboundRing);
} }
@ -431,7 +431,7 @@ void WifiNINA::checkForClientOutput() {
DIAG(F("send message")); //TJF: only for diag 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: 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? //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());
} }
void WifiNINA::loop() { void WifiNINA::loop() {