DashyFox/Ethernet_W5500
1
0
Fork 0
mirror of https://github.com/Show-maket/EthernetMaket.git synced 2026-09-21 04:19:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
DashyFox
2025-01-13 14:41:47 +03:00
parent a9f75262a5
commit 90916ab856
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/EthernetOverride/TCP.cpp
View File

@ -109,7 +109,6 @@ void EthernetMaketClient::close(){
void EthernetMaketClient::tick_(){ void EthernetMaketClient::tick_(){
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);
uint8_t s = w5500.readSnSR(_sock); uint8_t s = w5500.readSnSR(_sock);
String state = ""; String state = "";
@ -119,7 +118,7 @@ void EthernetMaketClient::tick_(){
case 0x14: state = "LISTEN"; break; case 0x14: state = "LISTEN"; break;
case 0x15: state = "SYNSENT"; break; case 0x15: state = "SYNSENT"; break;
case 0x16: state = "SYNRECV"; break; case 0x16: state = "SYNRECV"; break;
case 0x17: state = "ESTABLISHED"; connectStatus = CONNECT_CONNECTED; break; case 0x17: state = "ESTABLISHED"; connectStatus = CONNECT_CONNECTED; goto switchLabel; break;
case 0x18: state = "FIN_WAIT"; break; case 0x18: state = "FIN_WAIT"; break;
case 0x1A: state = "CLOSING"; break; case 0x1A: state = "CLOSING"; break;
case 0x1B: state = "TIME_WAIT"; break; case 0x1B: state = "TIME_WAIT"; break;
@ -143,6 +142,7 @@ void EthernetMaketClient::tick_(){
case CONNECT_STOP_WAITING: connectStatusStr = "CONNECT_STOP_WAITING"; break; case CONNECT_STOP_WAITING: connectStatusStr = "CONNECT_STOP_WAITING"; break;
default: connectStatusStr = "UNKNOWN"; break; default: connectStatusStr = "UNKNOWN"; break;
} }
Serial.print("tick_() sock = "); Serial.print(_sock);
Serial.print(" state = "); Serial.print(" state = ");
Serial.print(state); Serial.print(state);
Serial.print(" connectStatus = "); Serial.print(" connectStatus = ");
@ -151,6 +151,7 @@ void EthernetMaketClient::tick_(){
} }
//todo [] Пересмотреть стейт машину перевести на нативные статусы //todo [] Пересмотреть стейт машину перевести на нативные статусы
switchLabel:
switch (connectStatus) switch (connectStatus)
{ {
case CONNECT_START: case CONNECT_START:
@ -230,6 +231,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 switchLabel;
} }
break; break;

5
todo
View File

@ -1,3 +1,4 @@
[] Проверить и отладить UDP 8 статических клиентов для управления таймингами и сессией
[] 8 статических клиентов для управления таймингами и сессией параметры клиентской сессии: