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

Keep Ethernet singleton "alive" until connection is established.

Browse Source
This commit is contained in:
Bruno Crivelari Sanches 2022-09-03 17:16:33 -03:00
parent f2eb64fd21
commit 34c3d10767
2 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
EthernetInterface.cpp
View File

@ -36,7 +36,15 @@ EthernetInterface * EthernetInterface::singleton=NULL;
void EthernetInterface::setup() void EthernetInterface::setup()
{ {
singleton=new EthernetInterface(); singleton=new EthernetInterface();
if (!singleton->connected) singleton=NULL;
DIAG(F("Ethernet begin OK."));
if (Ethernet.hardwareStatus() == EthernetNoHardware) {
DIAG(F("Ethernet shield not found"));
singleton=NULL;
return;
}
}; };
@ -61,37 +69,6 @@ EthernetInterface::EthernetInterface()
return; return;
} }
#endif #endif
DIAG(F("begin OK."));
if (Ethernet.hardwareStatus() == EthernetNoHardware) {
DIAG(F("Ethernet shield not found"));
return;
}
unsigned long startmilli = millis();
while ((millis() - startmilli) < 5500) // Loop to give time to check for cable connection
{
if (Ethernet.linkStatus() == LinkON)
break;
DIAG(F("Ethernet waiting for link (1sec) "));
delay(1000);
}
if (Ethernet.linkStatus() == LinkOFF) {
DIAG(F("Ethernet cable not connected"));
return;
}
connected=true;
IPAddress ip = Ethernet.localIP(); // reassign the obtained ip address
server = new EthernetServer(IP_PORT); // Ethernet Server listening on default port IP_PORT
server->begin();
LCD(4,F("IP: %d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
LCD(5,F("Port:%d"), IP_PORT);
outboundRing=new RingStream(OUTBOUND_RING_SIZE);
} }
/** /**
@ -100,7 +77,8 @@ EthernetInterface::EthernetInterface()
*/ */
void EthernetInterface::loop() void EthernetInterface::loop()
{ {
if (!singleton) return; if(!singleton || ((!singleton->connected) && (!singleton->checkLink())))
return;
switch (Ethernet.maintain()) switch (Ethernet.maintain())
{ {
@ -125,6 +103,28 @@ void EthernetInterface::loop()
} }
bool EthernetInterface::checkLink()
{
if (Ethernet.linkStatus() != LinkON)
return false;
DIAG(F("Ethernet cable connected"));
connected=true;
IPAddress ip = Ethernet.localIP(); // reassign the obtained ip address
server = new EthernetServer(IP_PORT); // Ethernet Server listening on default port IP_PORT
server->begin();
LCD(4,F("IP: %d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
LCD(5,F("Port:%d"), IP_PORT);
outboundRing=new RingStream(OUTBOUND_RING_SIZE);
return true;
}
void EthernetInterface::loop2() void EthernetInterface::loop2()
{ {
// get client from the server // get client from the server

3
EthernetInterface.h
View File

@ -60,6 +60,9 @@ class EthernetInterface {
bool connected; bool connected;
EthernetInterface(); EthernetInterface();
void loop2(); void loop2();
bool checkLink();
EthernetServer * server; EthernetServer * server;
EthernetClient clients[MAX_SOCK_NUM]; // accept up to MAX_SOCK_NUM client connections at the same time; This depends on the chipset used on the Shield EthernetClient clients[MAX_SOCK_NUM]; // accept up to MAX_SOCK_NUM client connections at the same time; This depends on the chipset used on the Shield
uint8_t buffer[MAX_ETH_BUFFER+1]; // buffer used by TCP for the recv uint8_t buffer[MAX_ETH_BUFFER+1]; // buffer used by TCP for the recv