Minor updates
This commit is contained in:
parent
d41cebfee6
commit
bd3d17c5c2
@ -36,5 +36,3 @@ double SDCardManager::getSize(const SizeUnit sizeUnit)
|
|||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ boolean task_blink(void *pData)
|
|||||||
boolean task_batt_sensing(void *pData)
|
boolean task_batt_sensing(void *pData)
|
||||||
{
|
{
|
||||||
View1Packet *p = (View1Packet *) pData;
|
View1Packet *p = (View1Packet *) pData;
|
||||||
Serial.println(F("BATT SENSING..."));
|
//Serial.println(F("BATT SENSING..."));
|
||||||
p->powerInfo = p->sab->getPowerManager().getPowerInfo();
|
p->powerInfo = p->sab->getPowerManager().getPowerInfo();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -19,17 +19,23 @@ class FTPServer : public TCPServer<T>
|
|||||||
_dataServer(_dataPort)
|
_dataServer(_dataPort)
|
||||||
{
|
{
|
||||||
if(login != NULL)
|
if(login != NULL)
|
||||||
|
{
|
||||||
|
if(strlen(login) > 0)
|
||||||
{
|
{
|
||||||
_login = (char *)malloc((sizeof(char) * strlen(login)) + 1);
|
_login = (char *)malloc((sizeof(char) * strlen(login)) + 1);
|
||||||
strcpy(_login, login);
|
strcpy(_login, login);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(password != NULL)
|
if(password != NULL)
|
||||||
|
{
|
||||||
|
if(strlen(password) > 0)
|
||||||
{
|
{
|
||||||
_password = (char *)malloc((sizeof(char) * strlen(password)) + 1);
|
_password = (char *)malloc((sizeof(char) * strlen(password)) + 1);
|
||||||
strcpy(_password, password);
|
strcpy(_password, password);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void setCustomDataPort(unsigned int port)
|
void setCustomDataPort(unsigned int port)
|
||||||
{
|
{
|
||||||
|
@ -143,11 +143,8 @@ class TCPServer
|
|||||||
_currentClient->_clientState = TCPClient::DISCARDED;
|
_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)
|
if(_currentClient->_clientState == TCPClient::ClientState::DISCARDED)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user