DashyFox/Ethernet_W5500
1
0
Fork 0
mirror of https://github.com/Show-maket/EthernetMaket.git synced 2025-05-04 15:20:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix state

Browse Source
This commit is contained in:
DashyFox 2024-12-11 13:45:56 +03:00
parent a9f75262a5
commit a4d01ea360
1 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/EthernetOverride/TCP.cpp
View File

@ -151,48 +151,51 @@ void EthernetMaketClient::tick_(){
} }
//todo [] Пересмотреть стейт машину перевести на нативные статусы //todo [] Пересмотреть стейт машину перевести на нативные статусы
SWITCHLOOP:
switch (connectStatus) switch (connectStatus)
{ {
case CONNECT_START: case CONNECT_START:
Serial.println("CONNECT_START");
startConnectionTime = millis();
connectStatus = CONNECT_CONNECTING;
close();
Serial.println("CONNECT_CONNECTING...");
{ {
for (int i = 0; i < MAX_SOCK_NUM; i++) { Serial.println("CONNECT_START");
uint8_t s = w5500.readSnSR(i); startConnectionTime = millis();
String state = ""; connectStatus = CONNECT_CONNECTING;
switch (s) { close();
case 0x00: state = "CLOSED"; break; Serial.println("CONNECT_CONNECTING...");
case 0x13: state = "INIT"; break; for (int i = 0; i < MAX_SOCK_NUM; i++) {
case 0x14: state = "LISTEN"; break; uint8_t s = w5500.readSnSR(i);
case 0x15: state = "SYNSENT"; break; String state = "";
case 0x16: state = "SYNRECV"; break; switch (s) {
case 0x17: state = "ESTABLISHED"; break; case 0x00: state = "CLOSED"; break;
case 0x18: state = "FIN_WAIT"; break; case 0x13: state = "INIT"; break;
case 0x1A: state = "CLOSING"; break; case 0x14: state = "LISTEN"; break;
case 0x1B: state = "TIME_WAIT"; break; case 0x15: state = "SYNSENT"; break;
case 0x1C: state = "CLOSE_WAIT"; break; case 0x16: state = "SYNRECV"; break;
case 0x1D: state = "LAST_ACK"; break; case 0x17: state = "ESTABLISHED"; break;
case 0x22: state = "UDP"; break; case 0x18: state = "FIN_WAIT"; break;
case 0x32: state = "IPRAW"; break; case 0x1A: state = "CLOSING"; break;
case 0x42: state = "MACRAW"; break; case 0x1B: state = "TIME_WAIT"; break;
case 0x5F: state = "PPPOE"; break; case 0x1C: state = "CLOSE_WAIT"; break;
default: state = "UNKNOWN"; break; case 0x1D: state = "LAST_ACK"; break;
} case 0x22: state = "UDP"; break;
case 0x32: state = "IPRAW"; break;
case 0x42: state = "MACRAW"; break;
case 0x5F: state = "PPPOE"; break;
default: state = "UNKNOWN"; break;
}
Serial.print("SOCK <- "); Serial.print("SOCK <- ");
Serial.print(i); Serial.print(i);
Serial.print(" State: "); Serial.print(" State: ");
Serial.println(state); Serial.println(state);
}
goto SWITCHLOOP;
} }
}
break; break;
case CONNECT_CONNECTING: case CONNECT_CONNECTING:
if (millis() - startConnectionTime >= connectionTimeout) if (millis() - startConnectionTime >= connectionTimeout)
{ {
connectStatus = CONNECT_FAIL; connectStatus = CONNECT_FAIL;
goto SWITCHLOOP;
break; break;
} }
break; break;
@ -202,16 +205,15 @@ void EthernetMaketClient::tick_(){
Serial.println(isNonBlocking ? "non-blocking mode" : "blocking mode"); Serial.println(isNonBlocking ? "non-blocking mode" : "blocking mode");
Serial.println("\n"); Serial.println("\n");
connectStatus = CONNECT_STOP_START; connectStatus = CONNECT_STOP_START;
goto SWITCHLOOP;
break; break;
case CONNECT_SUCCESS: case CONNECT_SUCCESS:
Serial.println("CONNECT_SUCCESS"); Serial.println("CONNECT_SUCCESS");
Serial.print("Connected to server in "); Serial.print("Connected to server in ");
Serial.println(isNonBlocking ? "non-blocking mode" : "blocking mode"); Serial.println(isNonBlocking ? "non-blocking mode" : "blocking mode");
lastActivityTime = millis(); activityUpdate();
connectStatus = CONNECT_CONNECTED; connectStatus = CONNECT_CONNECTED;
goto SWITCHLOOP;
lastActivityTime = millis(); // Обновляем время последней активности
break; break;
case CONNECT_CONNECTED: case CONNECT_CONNECTED:
@ -223,6 +225,7 @@ void EthernetMaketClient::tick_(){
{ {
Serial.println("Client disconnected"); Serial.println("Client disconnected");
connectStatus = CONNECT_STOP_START; connectStatus = CONNECT_STOP_START;
goto SWITCHLOOP;
} }
// Закрытие соединения по таймеру неактивности // Закрытие соединения по таймеру неактивности
@ -230,6 +233,7 @@ void EthernetMaketClient::tick_(){
{ {
Serial.println("Connection closed due to inactivity"); Serial.println("Connection closed due to inactivity");
connectStatus = CONNECT_STOP_START; connectStatus = CONNECT_STOP_START;
goto SWITCHLOOP;
} }
break; break;
@ -241,6 +245,7 @@ void EthernetMaketClient::tick_(){
stopStartTime = millis(); stopStartTime = millis();
connectStatus = CONNECT_STOP_WAITING; connectStatus = CONNECT_STOP_WAITING;
Serial.println("CONNECT_STOP_WAITING"); Serial.println("CONNECT_STOP_WAITING");
goto SWITCHLOOP;
break; break;
case CONNECT_STOP_WAITING: case CONNECT_STOP_WAITING:
@ -257,6 +262,7 @@ void EthernetMaketClient::tick_(){
} }
if(connectStatus == CONNECT_IDLE) { if(connectStatus == CONNECT_IDLE) {
Serial.println("CONNECT_IDLE\n\n"); Serial.println("CONNECT_IDLE\n\n");
goto SWITCHLOOP;
} }
break; break;