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

looptimer more diag in EthernetInterface

Browse Source
This commit is contained in:
Harald Barth 2024-08-09 09:16:56 +02:00
parent e328ea5c5d
commit 690c629e6d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
EthernetInterface.cpp
View File

@ -30,6 +30,8 @@
#include "WiThrottle.h" #include "WiThrottle.h"
#include "DCCTimer.h" #include "DCCTimer.h"
extern void looptimer(unsigned long timeout, const FSH* message);
EthernetInterface * EthernetInterface::singleton=NULL; EthernetInterface * EthernetInterface::singleton=NULL;
/** /**
* @brief Setup Ethernet Connection * @brief Setup Ethernet Connection
@ -125,6 +127,7 @@ void EthernetInterface::loop()
//nothing happened //nothing happened
break; break;
} }
looptimer(8000, F("Ethloop after maintain"));
singleton->loop2(); singleton->loop2();
} }
@ -207,13 +210,14 @@ void EthernetInterface::loop2() {
// read bytes from a client // read bytes from a client
int count = clients[socket].read(buffer, MAX_ETH_BUFFER); int count = clients[socket].read(buffer, MAX_ETH_BUFFER);
buffer[count] = '\0'; // terminate the string properly buffer[count] = '\0'; // terminate the string properly
if (Diag::ETHERNET) DIAG(F(",count=%d:%e"), socket,buffer); if (Diag::ETHERNET) DIAG(F(",count=%d:%e"), count, buffer);
// execute with data going directly back // execute with data going directly back
CommandDistributor::parse(socket,buffer,outboundRing); CommandDistributor::parse(socket,buffer,outboundRing);
return; // limit the amount of processing that takes place within 1 loop() cycle. return; // limit the amount of processing that takes place within 1 loop() cycle.
} }
} }
} }
looptimer(8000, F("Ethloop2 after incoming"));
// stop any clients which disconnect // stop any clients which disconnect
for (int socket = 0; socket<MAX_SOCK_NUM; socket++) { for (int socket = 0; socket<MAX_SOCK_NUM; socket++) {
@ -223,9 +227,11 @@ void EthernetInterface::loop2() {
if (Diag::ETHERNET) DIAG(F("Ethernet: disconnect %d "), socket); if (Diag::ETHERNET) DIAG(F("Ethernet: disconnect %d "), socket);
} }
} }
looptimer(8000, F("Ethloop after disconnectcheck"));
WiThrottle::loop(outboundRing); WiThrottle::loop(outboundRing);
looptimer(8000, F("Ethloop after Withrottleloop"));
// handle at most 1 outbound transmission // handle at most 1 outbound transmission
int socketOut=outboundRing->read(); int socketOut=outboundRing->read();
if (socketOut >= MAX_SOCK_NUM) { if (socketOut >= MAX_SOCK_NUM) {
@ -236,5 +242,7 @@ void EthernetInterface::loop2() {
for(;count>0;count--) clients[socketOut].write(outboundRing->read()); for(;count>0;count--) clients[socketOut].write(outboundRing->read());
clients[socketOut].flush(); //maybe clients[socketOut].flush(); //maybe
} }
looptimer(8000, F("Ethloop after outbound"));
} }
#endif #endif