GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-14 15:05:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed FTP client connection logic with accept(); updated service config format. (#1082)
Some checks failed
build-ci / build (push) Failing after 1h34m10s
Details

Browse Source
This commit is contained in:
E2D 2025-03-16 17:02:39 +08:00 committed by GitHub
parent 429007b349
commit d0bde79aec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
esp3d/src/modules/ftp/FtpServer.cpp
View File

@ -260,7 +260,7 @@ void FtpServer::handle() {
} else if (cmdStage == FTP_Client) { // Ftp server idle } else if (cmdStage == FTP_Client) { // Ftp server idle
if (ftpServer->hasClient()) { if (ftpServer->hasClient()) {
client.stop(); client.stop();
client = ftpServer->available(); client = ftpServer->accept();
} }
if (client.connected()) { // A client connected if (client.connected()) { // A client connected
clientConnected(); clientConnected();
@ -1051,7 +1051,7 @@ int FtpServer::dataConnect(bool out150) {
while (!data.connected() && count-- > 0) { while (!data.connected() && count-- > 0) {
if (dataServer->hasClient()) { if (dataServer->hasClient()) {
data.stop(); data.stop();
data = dataServer->available(); data = dataServer->accept();
} }
delay(1); delay(1);
} }

2
esp3d/src/modules/update/update_service.cpp
View File

@ -70,7 +70,7 @@ const uint16_t IPKeysPos[] = {ESP_STA_IP_VALUE, ESP_STA_GATEWAY_VALUE,
ESP_AP_IP_VALUE, ESP_ETH_STA_IP_VALUE, ESP_ETH_STA_GATEWAY_VALUE, ESP_ETH_STA_MASK_VALUE, ESP_ETH_STA_DNS_VALUE}; ESP_AP_IP_VALUE, ESP_ETH_STA_IP_VALUE, ESP_ETH_STA_GATEWAY_VALUE, ESP_ETH_STA_MASK_VALUE, ESP_ETH_STA_DNS_VALUE};
const char* ServintKeysVal[] = { const char* ServintKeysVal[] = {
"Serial_Bridge_Baud" "Serial_Bridge_Baud",
"HTTP_Port", "HTTP_Port",
"TELNET_Port", "TELNET_Port",
"SENSOR_INTERVAL", "SENSOR_INTERVAL",