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

LCD and link warning

Browse Source
This commit is contained in:
Asbelos 2024-08-20 19:51:45 +01:00
parent edb02a00ce
commit 4d84eccac3
1 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
EthernetInterface.cpp
View File

@ -49,6 +49,7 @@ void EthernetInterface::setup()
byte mac[6]; byte mac[6];
DCCTimer::getSimulatedMacAddress(mac); DCCTimer::getSimulatedMacAddress(mac);
DIAG(F("Ethernet begin")); DIAG(F("Ethernet begin"));
#ifdef IP_ADDRESS #ifdef IP_ADDRESS
static IPAddress myIP(IP_ADDRESS); static IPAddress myIP(IP_ADDRESS);
Ethernet.begin(mac, myIP); Ethernet.begin(mac, myIP);
@ -66,8 +67,21 @@ void EthernetInterface::setup()
} }
server = new EthernetServer(IP_PORT); // Ethernet Server listening on default port IP_PORT server = new EthernetServer(IP_PORT); // Ethernet Server listening on default port IP_PORT
server->begin(); server->begin();
LCD(4,F("IP: %d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]); #ifdef LCD_DRIVER
LCD(5,F("Port:%d"), IP_PORT); const byte lcdData[]={LCD_DRIVER};
const bool wideDisplay=lcdData[1]>=24; // data[1] is cols.
#else
const bool wideDisplay=true;
#endif
if (wideDisplay) {
// OLEDS or just usb diag is ok on one line.
LCD(4,F("IP %d.%d.%d.%d:%d"), ip[0], ip[1], ip[2], ip[3], IP_PORT);
}
else { // LCDs generally too narrow, so take 2 lines
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); outboundRing=new RingStream(OUTBOUND_RING_SIZE);
connected=true; connected=true;
} }
@ -80,7 +94,22 @@ void EthernetInterface::setup()
void EthernetInterface::loop() void EthernetInterface::loop()
{ {
if (!connected) return; if (!connected) return;
//DIAG(F("maintain"));
static bool warnedAboutLink=false;
if (Ethernet.linkStatus() == LinkOFF){
if (warnedAboutLink) return;
DIAG(F("Ethernet link OFF"));
warnedAboutLink=true;
return;
}
// link status must be ok here
if (warnedAboutLink) {
DIAG(F("Ethernet link RESTORED"));
warnedAboutLink=false;
}
//
switch (Ethernet.maintain()) { switch (Ethernet.maintain()) {
case 1: case 1:
//renewed fail //renewed fail
@ -97,8 +126,7 @@ void EthernetInterface::loop()
//DIAG(F("maintained")); //DIAG(F("maintained"));
break; break;
} }
// looptimer(8000, F("Ethloop after maintain"));
// get client from the server // get client from the server
auto client = server->accept(); auto client = server->accept();
@ -146,10 +174,7 @@ void EthernetInterface::loop()
if (Diag::ETHERNET) DIAG(F("Ethernet: disconnect %d "), socket); if (Diag::ETHERNET) DIAG(F("Ethernet: disconnect %d "), socket);
} }
//looptimer(8000, F("Ethloop2 after incoming"));
WiThrottle::loop(outboundRing); WiThrottle::loop(outboundRing);
//looptimer(8000, F("Ethloop after Withrottleloop"));
// handle at most 1 outbound transmission // handle at most 1 outbound transmission
auto socketOut=outboundRing->read(); auto socketOut=outboundRing->read();
@ -174,6 +199,5 @@ void EthernetInterface::loop()
clients[socketOut].write(tmpbuf,count); clients[socketOut].write(tmpbuf,count);
} }
//looptimer(8000, F("Ethloop after outbound"));
} }
#endif #endif