mirror of
https://github.com/Show-maket/EthernetMaket.git
synced 2025-05-04 15:20:18 +00:00
fix state
This commit is contained in:
parent
a9f75262a5
commit
a4d01ea360
@ -151,15 +151,16 @@ 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 = "";
|
||||||
@ -187,12 +188,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 +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;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user