From bd3d17c5c2d391dc8c241033f903adc7f036c22f Mon Sep 17 00:00:00 2001 From: anschrammh Date: Wed, 16 Oct 2019 19:27:43 +0200 Subject: [PATCH] Minor updates --- src/app/SDCardManager.cpp | 2 -- src/app/tasks.cpp | 2 +- src/software_test/tcpServer_test/FTPServer.h | 14 ++++++++++---- src/software_test/tcpServer_test/TCPServer.h | 9 +++------ 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/app/SDCardManager.cpp b/src/app/SDCardManager.cpp index c84ced1..706fe90 100644 --- a/src/app/SDCardManager.cpp +++ b/src/app/SDCardManager.cpp @@ -36,5 +36,3 @@ double SDCardManager::getSize(const SizeUnit sizeUnit) return result; } - - diff --git a/src/app/tasks.cpp b/src/app/tasks.cpp index 04d68c8..812ce98 100644 --- a/src/app/tasks.cpp +++ b/src/app/tasks.cpp @@ -25,7 +25,7 @@ boolean task_blink(void *pData) boolean task_batt_sensing(void *pData) { View1Packet *p = (View1Packet *) pData; - Serial.println(F("BATT SENSING...")); + //Serial.println(F("BATT SENSING...")); p->powerInfo = p->sab->getPowerManager().getPowerInfo(); return true; diff --git a/src/software_test/tcpServer_test/FTPServer.h b/src/software_test/tcpServer_test/FTPServer.h index 8e75088..e6ad880 100644 --- a/src/software_test/tcpServer_test/FTPServer.h +++ b/src/software_test/tcpServer_test/FTPServer.h @@ -20,14 +20,20 @@ class FTPServer : public TCPServer { if(login != NULL) { - _login = (char *)malloc((sizeof(char) * strlen(login)) + 1); - strcpy(_login, login); + if(strlen(login) > 0) + { + _login = (char *)malloc((sizeof(char) * strlen(login)) + 1); + strcpy(_login, login); + } } if(password != NULL) { - _password = (char *)malloc((sizeof(char) * strlen(password)) + 1); - strcpy(_password, password); + if(strlen(password) > 0) + { + _password = (char *)malloc((sizeof(char) * strlen(password)) + 1); + strcpy(_password, password); + } } } diff --git a/src/software_test/tcpServer_test/TCPServer.h b/src/software_test/tcpServer_test/TCPServer.h index f65b5ce..9b88f26 100644 --- a/src/software_test/tcpServer_test/TCPServer.h +++ b/src/software_test/tcpServer_test/TCPServer.h @@ -143,12 +143,9 @@ class TCPServer _currentClient->_clientState = TCPClient::DISCARDED; } - if(_currentClient->_dataSize > 0) - { - _currentClient->_newDataAvailable = false; - } - processClientData(_currentClient);//We process the actual data - + processClientData(_currentClient);//We process the actual data + _currentClient->_newDataAvailable = false; + if(_currentClient->_clientState == TCPClient::ClientState::DISCARDED) { _currentClient->closeConnection();