DashyFox/Ethernet_W5500
1
0
Fork 0
mirror of https://github.com/Show-maket/EthernetMaket.git synced 2026-09-22 12:59:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: DashyFox:old-state
Branches Tags
DashyFox:main DashyFox:old-state DashyFox:neuroFix-stateMashine DashyFox:vanilla-server DashyFox:todo-ReworkStateMachine
...
pull from: DashyFox:vanilla-server
Branches Tags
DashyFox:old-state DashyFox:neuroFix-stateMashine DashyFox:vanilla-server DashyFox:main DashyFox:todo-ReworkStateMachine

2 Commits
old-state ... vanilla-se

Author SHA1 Message Date
DashyFox
231b43d8bd tmp fix 2024-12-11 14:42:13 +03:00
DashyFox
a4d01ea360 fix state 2024-12-11 13:45:56 +03:00
1 changed files with 64 additions and 53 deletions
Expand all files Collapse all files

85
src/EthernetOverride/TCP.cpp
View File

@ -108,28 +108,30 @@ void EthernetMaketClient::close(){
} }
void EthernetMaketClient::tick_(){ void EthernetMaketClient::tick_(){
// todo Переделать на нативные статусы. Избавиться от костылей
if(_sock != MAX_SOCK_NUM && connectStatus!=CONNECT_CONNECTED && connectStatus!=CONNECT_STOP_WAITING&&connectStatus!=CONNECT_CONNECTING){ if(_sock != MAX_SOCK_NUM && connectStatus!=CONNECT_CONNECTED && connectStatus!=CONNECT_STOP_WAITING&&connectStatus!=CONNECT_CONNECTING){
Serial.print("tick_() sock = "); Serial.print(_sock); Serial.print("tick_() sock = "); Serial.print(_sock);
uint8_t s = w5500.readSnSR(_sock); uint8_t s = w5500.readSnSR(_sock);
String state = ""; String state = "";
switch (s) { switch (s) {
case 0x00: state = "CLOSED"; connectStatus = CONNECT_STOP_WAITING; break; //! костыли ^~^
case 0x13: state = "INIT"; break; case SnSR::CLOSED : state = "CLOSED"; connectStatus = CONNECT_STOP_WAITING; break;
case 0x14: state = "LISTEN"; break; case SnSR::INIT : state = "INIT"; break;
case 0x15: state = "SYNSENT"; break; case SnSR::LISTEN : state = "LISTEN"; break;
case 0x16: state = "SYNRECV"; break; case SnSR::SYNSENT : state = "SYNSENT"; break;
case 0x17: state = "ESTABLISHED"; connectStatus = CONNECT_CONNECTED; break; case SnSR::SYNRECV : state = "SYNRECV"; break;
case 0x18: state = "FIN_WAIT"; break; case SnSR::ESTABLISHED : state = "ESTABLISHED"; connectStatus = CONNECT_CONNECTED; break;
case 0x1A: state = "CLOSING"; break; case SnSR::FIN_WAIT : state = "FIN_WAIT"; /* goto STOP_START_LABEL; */ break;
case 0x1B: state = "TIME_WAIT"; break; case SnSR::CLOSING : state = "CLOSING"; break;
case 0x1C: state = "CLOSE_WAIT"; connectStatus = CONNECT_STOP_START; break; case SnSR::TIME_WAIT : state = "TIME_WAIT"; break;
case 0x1D: state = "LAST_ACK"; break; case SnSR::CLOSE_WAIT : state = "CLOSE_WAIT"; connectStatus = CONNECT_STOP_START; break;
case 0x22: state = "UDP"; break; case SnSR::LAST_ACK : state = "LAST_ACK"; break;
case 0x32: state = "IPRAW"; break; case SnSR::UDP : state = "UDP"; break;
case 0x42: state = "MACRAW"; break; case SnSR::IPRAW : state = "IPRAW"; break;
case 0x5F: state = "PPPOE"; break; case SnSR::MACRAW : state = "MACRAW"; break;
default: state = "UNKNOWN"; break; case SnSR::PPPOE : state = "PPPOE"; break;
default : state = "UNKNOWN"; break;
} }
String connectStatusStr = ""; String connectStatusStr = "";
switch (connectStatus) { switch (connectStatus) {
@ -151,34 +153,35 @@ void EthernetMaketClient::tick_(){
} }
//todo [] Пересмотреть стейт машину перевести на нативные статусы //todo [] Пересмотреть стейт машину перевести на нативные статусы
SWITCHLOOP:
switch (connectStatus) switch (connectStatus)
{ {
case CONNECT_START: case CONNECT_START:
{
Serial.println("CONNECT_START"); Serial.println("CONNECT_START");
startConnectionTime = millis(); startConnectionTime = millis();
connectStatus = CONNECT_CONNECTING; connectStatus = CONNECT_CONNECTING;
close(); close();
Serial.println("CONNECT_CONNECTING..."); Serial.println("CONNECT_CONNECTING...");
{
for (int i = 0; i < MAX_SOCK_NUM; i++) { for (int i = 0; i < MAX_SOCK_NUM; i++) {
uint8_t s = w5500.readSnSR(i); uint8_t s = w5500.readSnSR(i);
String state = ""; String state = "";
switch (s) { switch (s) {
case 0x00: state = "CLOSED"; break; case SnSR::CLOSED : state = "CLOSED"; break;
case 0x13: state = "INIT"; break; case SnSR::INIT : state = "INIT"; break;
case 0x14: state = "LISTEN"; break; case SnSR::LISTEN : state = "LISTEN"; break;
case 0x15: state = "SYNSENT"; break; case SnSR::SYNSENT : state = "SYNSENT"; break;
case 0x16: state = "SYNRECV"; break; case SnSR::SYNRECV : state = "SYNRECV"; break;
case 0x17: state = "ESTABLISHED"; break; case SnSR::ESTABLISHED : state = "ESTABLISHED"; break;
case 0x18: state = "FIN_WAIT"; break; case SnSR::FIN_WAIT : state = "FIN_WAIT"; break;
case 0x1A: state = "CLOSING"; break; case SnSR::CLOSING : state = "CLOSING"; break;
case 0x1B: state = "TIME_WAIT"; break; case SnSR::TIME_WAIT : state = "TIME_WAIT"; break;
case 0x1C: state = "CLOSE_WAIT"; break; case SnSR::CLOSE_WAIT : state = "CLOSE_WAIT"; break;
case 0x1D: state = "LAST_ACK"; break; case SnSR::LAST_ACK : state = "LAST_ACK"; break;
case 0x22: state = "UDP"; break; case SnSR::UDP : state = "UDP"; break;
case 0x32: state = "IPRAW"; break; case SnSR::IPRAW : state = "IPRAW"; break;
case 0x42: state = "MACRAW"; break; case SnSR::MACRAW : state = "MACRAW"; break;
case 0x5F: state = "PPPOE"; break; case SnSR::PPPOE : state = "PPPOE"; break;
default: state = "UNKNOWN"; break; default: state = "UNKNOWN"; break;
} }
@ -187,12 +190,14 @@ void EthernetMaketClient::tick_(){
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 +207,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 +227,7 @@ void EthernetMaketClient::tick_(){
{ {
Serial.println("Client disconnected"); Serial.println("Client disconnected");
connectStatus = CONNECT_STOP_START; connectStatus = CONNECT_STOP_START;
goto SWITCHLOOP;
} }
// Закрытие соединения по таймеру неактивности // Закрытие соединения по таймеру неактивности
@ -230,17 +235,20 @@ 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;
case CONNECT_STOP_START: case CONNECT_STOP_START:
disconnect();
STOP_START_LABEL:
Serial.println("CONNECT_STOP_START"); Serial.println("CONNECT_STOP_START");
dstIP = IPAddress(0,0,0,0); dstIP = IPAddress(0,0,0,0);
dstPort = 0; dstPort = 0;
disconnect();
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,7 +265,10 @@ 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;
} }
// //! Костыль, блокирует на время ожидания стопа подобно while(millis() - stopStartTime < stopTimeout)
goto SWITCHLOOP;
break; break;
case CONNECT_IDLE: case CONNECT_IDLE: