1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-30 03:26:13 +01:00

Ethernet restructure

This commit is contained in:
Harald Barth 2022-11-04 16:08:43 +01:00
parent f939ea0768
commit be2f3b0db7
4 changed files with 76 additions and 38 deletions

View File

@ -1,6 +1,7 @@
/* /*
* © 2022 Bruno Sanches
* © 2021 Fred Decker * © 2021 Fred Decker
* © 2020-2021 Harald Barth * © 2020-2022 Harald Barth
* © 2020-2021 Chris Harlow * © 2020-2021 Chris Harlow
* © 2020 Gregor Baues * © 2020 Gregor Baues
* All rights reserved. * All rights reserved.
@ -36,8 +37,13 @@ EthernetInterface * EthernetInterface::singleton=NULL;
*/ */
void EthernetInterface::setup() void EthernetInterface::setup()
{ {
singleton=new EthernetInterface(); if (singleton!=NULL) {
if (!singleton->connected) singleton=NULL; DIAG(F("Prog Error!"));
return;
}
if ((singleton=new EthernetInterface()))
return;
DIAG(F("Ethernet not initialized"));
}; };
@ -62,37 +68,34 @@ EthernetInterface::EthernetInterface()
return; return;
} }
#endif #endif
DIAG(F("begin OK."));
if (Ethernet.hardwareStatus() == EthernetNoHardware) { if (Ethernet.hardwareStatus() == EthernetNoHardware) {
DIAG(F("Ethernet shield not found")); DIAG(F("Ethernet shield not found"));
return; return;
} }
unsigned long startmilli = millis(); unsigned long startmilli = millis();
while ((millis() - startmilli) < 5500) // Loop to give time to check for cable connection while ((millis() - startmilli) < 5500) { // Loop to give time to check for cable connection
{
if (Ethernet.linkStatus() == LinkON) if (Ethernet.linkStatus() == LinkON)
break; break;
DIAG(F("Ethernet waiting for link (1sec) ")); DIAG(F("Ethernet waiting for link (1sec) "));
delay(1000); delay(1000);
} }
// now we either do have link of we have a W5100
// where we do not know if we have link. That's
// the reason to now run checkLink.
// CheckLinks sets up outboundRing if it does
// not exist yet as well.
checkLink();
}
if (Ethernet.linkStatus() == LinkOFF) { /**
DIAG(F("Ethernet cable not connected")); * @brief Cleanup any resources
return; *
} * @return none
*/
connected=true; EthernetInterface::~EthernetInterface() {
delete server;
IPAddress ip = Ethernet.localIP(); // reassign the obtained ip address delete outboundRing;
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);
} }
/** /**
@ -101,33 +104,66 @@ EthernetInterface::EthernetInterface()
*/ */
void EthernetInterface::loop() void EthernetInterface::loop()
{ {
if (!singleton) return; if (!singleton || (!singleton->checkLink()))
return;
switch (Ethernet.maintain()) switch (Ethernet.maintain()) {
{
case 1: case 1:
//renewed fail //renewed fail
DIAG(F("Ethernet Error: renewed fail")); DIAG(F("Ethernet Error: renewed fail"));
singleton=NULL; singleton=NULL;
return; return;
case 3: case 3:
//rebind fail //rebind fail
DIAG(F("Ethernet Error: rebind fail")); DIAG(F("Ethernet Error: rebind fail"));
singleton=NULL; singleton=NULL;
return; return;
default: default:
//nothing happened //nothing happened
break; break;
} }
singleton->loop2(); singleton->loop2();
} }
void EthernetInterface::loop2() /**
{ * @brief Checks ethernet link cable status and detects when it connects / disconnects
*
* @return true when cable is connected, false otherwise
*/
bool EthernetInterface::checkLink() {
if (Ethernet.linkStatus() != LinkOFF) { // check for not linkOFF instead of linkON as the W5100 does return LinkUnknown
//if we are not connected yet, setup a new server
if(!connected) {
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);
// only create a outboundRing it none exists, this may happen if the cable
// gets disconnected and connected again
if(!outboundRing)
outboundRing=new RingStream(OUTBOUND_RING_SIZE);
}
return true;
} else { // connected
DIAG(F("Ethernet cable disconnected"));
connected=false;
//clean up any client
for (byte socket = 0; socket < MAX_SOCK_NUM; socket++) {
if(clients[socket].connected())
clients[socket].stop();
}
// tear down server
delete server;
server = nullptr;
LCD(4,F("IP: None"));
}
return false;
}
void EthernetInterface::loop2() {
// get client from the server // get client from the server
EthernetClient client = server->accept(); EthernetClient client = server->accept();

View File

@ -59,12 +59,13 @@ class EthernetInterface {
static EthernetInterface * singleton; static EthernetInterface * singleton;
bool connected; bool connected;
EthernetInterface(); 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
RingStream * outboundRing; RingStream * outboundRing;
}; };
#endif #endif

View File

@ -1 +1 @@
#define GITHUB_SHA "devel-202210311845Z" #define GITHUB_SHA "devel-202211041507Z"

View File

@ -5,6 +5,7 @@
#define VERSION "4.2.4" #define VERSION "4.2.4"
// Ethernet start improvement and link detection
// 4.2.4 ESP32 experimental BT support // 4.2.4 ESP32 experimental BT support
// More DC configurations possible and lower frequency // More DC configurations possible and lower frequency
// Handle decoders that do not ack at write better // Handle decoders that do not ack at write better