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

client hotfix

Browse Source
This commit is contained in:
DashyFox 2024-11-20 16:45:02 +03:00
parent 18f4d1372a
commit ad8859af9a
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
examples/Client/Client.ino
View File

@ -36,6 +36,11 @@ void onSend(){
Serial.println("Sending Successfully"); Serial.println("Sending Successfully");
} }
// #define TEST_1
#define TEST_2
void setup() void setup()
{ {
Serial.begin(115200); Serial.begin(115200);
@ -54,8 +59,10 @@ void setup()
client.setOnSendSuccess(onSend); client.setOnSendSuccess(onSend);
} }
#ifdef TEST_2
//* for many packets
bool dataReady = false; bool dataReady = false;
#endif
void loop() void loop()
{ {
@ -74,10 +81,27 @@ void loop()
Serial.println("connectNonBlock"); Serial.println("connectNonBlock");
client.startConnection(serverIP, SERVER_PORT); client.startConnection(serverIP, SERVER_PORT);
#ifdef TEST_1
//* for single packets
client.dataWrite((uint8_t *)&packetCounter, sizeof(packetCounter));
Serial.print("Sending packet: ");
for (size_t j = 0; j < sizeof(packetCounter); j++)
{
Serial.print(((uint8_t *)&packetCounter)[j], HEX);
Serial.print(" ");
}
Serial.println();
packetCounter++;
#endif
#ifdef TEST_2
//* for many packets
dataReady = true; dataReady = true;
#endif
} }
if(dataReady && client.isConnected()) #ifdef TEST_2
//* for many packets
if(dataReady && client.isConnected()) //* check connection
{ {
for (size_t i = 0; i < 3; i++) for (size_t i = 0; i < 3; i++)
{ {
@ -95,4 +119,5 @@ void loop()
} }
dataReady = false; dataReady = false;
} }
#endif
} }

11
src/EthernetOverride/TCP.cpp
View File

@ -263,17 +263,21 @@ bool EthernetMaketClient::dataWrite(){
} }
lastActivityTime = millis(); lastActivityTime = millis();
} }
if(ret){
onSendSuccess();
}
return ret; return ret;
} }
bool EthernetMaketClient::dataWrite(uint8_t* data, uint16_t dataSize, bool override) { void EthernetMaketClient::dataWrite(uint8_t* data, uint16_t dataSize, bool override) {
if (this->dataSize == 0 || override) { if (this->dataSize == 0 || override) {
this->dataPtr = data; this->dataPtr = data;
this->dataSize = dataSize; this->dataSize = dataSize;
return dataWrite(); if(isConnected()){
dataWrite();
}
} else { } else {
Serial.println("Data buffer is not empty. Write operation is ignored."); Serial.println("Data buffer is not empty. Write operation is ignored.");
return false;
} }
} }
@ -324,6 +328,5 @@ void EthernetMaketClient::startConnection(IPAddress ip, uint16_t port, bool nonB
dstIP = ip; dstIP = ip;
dstPort = port; dstPort = port;
isNonBlocking = nonBlock; isNonBlocking = nonBlock;
connectNonBlock(dstIP, dstPort);
connectStatus = CONNECT_START; connectStatus = CONNECT_START;
}; };

2
src/EthernetOverride/TCP.h
View File

@ -38,7 +38,7 @@ public:
ConnectionStatusSimple connectNonBlock(IPAddress ip, uint16_t port); ConnectionStatusSimple connectNonBlock(IPAddress ip, uint16_t port);
void startConnection(IPAddress ip, uint16_t port, bool nonBlock = true); void startConnection(IPAddress ip, uint16_t port, bool nonBlock = true);
bool dataWrite(uint8_t* data, uint16_t dataSize, bool override = false); void dataWrite(uint8_t* data, uint16_t dataSize, bool override = false);
// bool send(uint8_t* data, uint16_t dataSize, IPAddress ip, uint16_t port); // bool send(uint8_t* data, uint16_t dataSize, IPAddress ip, uint16_t port);
void disconnect(); void disconnect();