Th3maz1ng/ESP8266_swiss_army_board
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed fixed some warnings

Browse Source
This commit is contained in:
Th3maz1ng 2022-03-30 12:00:13 +02:00
parent e732cf48aa
commit e5d250556f
5 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/CFGParameterValue.cpp
View File

@ -1,11 +1,11 @@
#include "CFGParameterValue.h" #include "CFGParameterValue.h"
CFGParameterValue::CFGParameterValue():DictionaryInterface(),_parameter(NULL), _value(NULL), _quotedParameter(false), _quotedValue(false) CFGParameterValue::CFGParameterValue() : DictionaryInterface()
{ {
} }
CFGParameterValue::CFGParameterValue(const char *parameter, const char *value, boolean quotedParameter, boolean quotedValue):_quotedParameter(quotedParameter), _quotedValue(quotedValue) CFGParameterValue::CFGParameterValue(const char *parameter, const char *value, boolean quotedParameter, boolean quotedValue) : DictionaryInterface(), _quotedParameter(quotedParameter), _quotedValue(quotedValue)
{ {
_parameter = (char *) malloc((strlen(parameter) * sizeof(char)) + 1); //+1 for the string terminating character _parameter = (char *) malloc((strlen(parameter) * sizeof(char)) + 1); //+1 for the string terminating character
_value = (char *) malloc((strlen(value) * sizeof(char)) + 1); //+1 for the string terminating character _value = (char *) malloc((strlen(value) * sizeof(char)) + 1); //+1 for the string terminating character
@ -14,7 +14,7 @@ CFGParameterValue::CFGParameterValue(const char *parameter, const char *value, b
strcpy(_value, value); strcpy(_value, value);
} }
CFGParameterValue::CFGParameterValue(const char *parameter, const char *value):CFGParameterValue() CFGParameterValue::CFGParameterValue(const char *parameter, const char *value) : CFGParameterValue()
{ {
_parameter = (char *) malloc((strlen(parameter) * sizeof(char)) + 1); //+1 for the string terminating character _parameter = (char *) malloc((strlen(parameter) * sizeof(char)) + 1); //+1 for the string terminating character
_value = (char *) malloc((strlen(value) * sizeof(char)) + 1); //+1 for the string terminating character _value = (char *) malloc((strlen(value) * sizeof(char)) + 1); //+1 for the string terminating character
@ -23,7 +23,7 @@ CFGParameterValue::CFGParameterValue(const char *parameter, const char *value):C
strcpy(_value, value); strcpy(_value, value);
} }
CFGParameterValue::CFGParameterValue(const CFGParameterValue &Object) CFGParameterValue::CFGParameterValue(const CFGParameterValue &Object) : DictionaryInterface()
{ {
_parameter = (char *) malloc((strlen(Object._parameter) * sizeof(char)) + 1); //+1 for the string terminating character _parameter = (char *) malloc((strlen(Object._parameter) * sizeof(char)) + 1); //+1 for the string terminating character
_value = (char *) malloc((strlen(Object._value) * sizeof(char)) + 1); //+1 for the string terminating character _value = (char *) malloc((strlen(Object._value) * sizeof(char)) + 1); //+1 for the string terminating character

10
src/app/CFGParameterValue.h
View File

@ -29,18 +29,18 @@ public:
const char *getParameter() const{return _parameter == NULL ? "" : _parameter;} const char *getParameter() const{return _parameter == NULL ? "" : _parameter;}
bool isQuotedParameter()const{return _quotedParameter;} bool isQuotedParameter()const{return _quotedParameter;}
bool isQuotedValue()const{return _quotedValue;} bool isQuotedValue()const{return _quotedValue;}
virtual const char *toString() virtual const char *toString()
{ {
return _value; return _value;
} }
void setValue(const char *value, bool isQuoted); void setValue(const char *value, bool isQuoted);
protected: protected:
private: private:
char *_parameter; char *_parameter = NULL;
char *_value; char *_value = NULL;
bool _quotedParameter; bool _quotedParameter = false;
bool _quotedValue; bool _quotedValue = false;
}; };

6
src/app/HttpClient.cpp
View File

@ -7,11 +7,9 @@
* End of HttpClientHelper * End of HttpClientHelper
*/ */
HttpClient::HttpClient(const char *address, uint16_t port, uint32_t timeout) : WiFiClient(), _connectionStatus(NO_ATTEMPT), _resource(NULL), _pAddress(address), _port(0), _keepAlive(false), _maxRetries(-1), _retries(0), _isIp(false), _httpCode(HTTP_CODE::UNDEFINED_CODE), _httpCodeParsed(false) HttpClient::HttpClient(const char *address, uint16_t port, uint32_t timeout) : WiFiClient(), _pAddress(address), _port(port)
{ {
_port = port;
setTimeout(timeout); setTimeout(timeout);
connectByHostOrIp(); connectByHostOrIp();
} }
@ -24,7 +22,7 @@ HttpClient::HttpClient(const char *address, const char *resource, uint16_t port,
} }
} }
HttpClient::HttpClient(const HttpClient &object) HttpClient::HttpClient(const HttpClient &object) : WiFiClient()
{ {
if(object._resource != NULL) if(object._resource != NULL)
{ {

16
src/app/HttpClient.h
View File

@ -49,16 +49,16 @@ class HttpClient : public WiFiClient, public HttpConstants
void sendHeader(HttpMIMEType contentType = HttpMIMEType::UNKNOWN_MIME, uint64_t contentLength = 0, Dictionary<DictionaryHelper::StringEntity> *headerData = NULL, HttpVersion httpVersion = HttpVersion::HTTP_1_1); void sendHeader(HttpMIMEType contentType = HttpMIMEType::UNKNOWN_MIME, uint64_t contentLength = 0, Dictionary<DictionaryHelper::StringEntity> *headerData = NULL, HttpVersion httpVersion = HttpVersion::HTTP_1_1);
uint64_t computeBodyLength(Dictionary<DictionaryHelper::StringEntity> *data); uint64_t computeBodyLength(Dictionary<DictionaryHelper::StringEntity> *data);
ConnectionStatus _connectionStatus; ConnectionStatus _connectionStatus = NO_ATTEMPT;
char *_resource; char *_resource = NULL;
const char *_pAddress; const char *_pAddress;
uint16_t _port; uint16_t _port;
boolean _keepAlive; boolean _keepAlive = false;
int16_t _maxRetries; int16_t _maxRetries = -1;
uint16_t _retries; uint16_t _retries = 0;
boolean _isIp; boolean _isIp = false;
HTTP_CODE _httpCode; HTTP_CODE _httpCode = HTTP_CODE::UNDEFINED_CODE;
boolean _httpCodeParsed; boolean _httpCodeParsed = false;
}; };
#endif //HTTPCLIENT_H #endif //HTTPCLIENT_H

10
src/app/ScreenManager.cpp
View File

@ -3,10 +3,10 @@
ScreenManager::ScreenManager(Adafruit_SSD1306 &display, SDCardManager *sdCardManager) : _displayRef(display), _error(OK) ScreenManager::ScreenManager(Adafruit_SSD1306 &display, SDCardManager *sdCardManager) : _displayRef(display), _error(OK)
, _displayColorInverted(false), _displayDimmed(false), _enabled(true), _refreshRateHz(1), _refreshInterval(1000), _timeRef(0),_forceRefresh(false) , _displayColorInverted(false), _displayDimmed(false), _enabled(true), _refreshRateHz(1), _refreshInterval(1000), _timeRef(0),_forceRefresh(false)
, _currentView(NO_CURRENT_VIEW), _tail(NULL) , _currentView(NO_CURRENT_VIEW), _tail(NULL)
, _viewNotFound{&(displayError), (ErrorInfo *)malloc(sizeof(ErrorInfo)), RESERVED_VIEW_UID, NULL} , _viewNotFound{&(displayError), (ErrorInfo *)malloc(sizeof(ErrorInfo)), RESERVED_VIEW_UID, NULL, NULL}
, _viewFuncUndefined{&(displayError), (ErrorInfo *)malloc(sizeof(ErrorInfo)), RESERVED_VIEW_UID, NULL} , _viewFuncUndefined{&(displayError), (ErrorInfo *)malloc(sizeof(ErrorInfo)), RESERVED_VIEW_UID, NULL, NULL}
, _currentViewUndefined{&(displayError), (ErrorInfo *)malloc(sizeof(ErrorInfo)), RESERVED_VIEW_UID, NULL} , _currentViewUndefined{&(displayError), (ErrorInfo *)malloc(sizeof(ErrorInfo)), RESERVED_VIEW_UID, NULL, NULL}
, _viewFunctionFailedToExecute{&(displayError), (ErrorInfo *)malloc(sizeof(ErrorInfo)), RESERVED_VIEW_UID, NULL} , _viewFunctionFailedToExecute{&(displayError), (ErrorInfo *)malloc(sizeof(ErrorInfo)), RESERVED_VIEW_UID, NULL, NULL}
,_sdCardManager(sdCardManager) ,_sdCardManager(sdCardManager)
{ {
_viewLinkedList = (ViewLinkedList) createEmptyList(); _viewLinkedList = (ViewLinkedList) createEmptyList();
@ -72,7 +72,7 @@ void ScreenManager::setDefault()
boolean ScreenManager::addView(boolean (*viewLogicFunction)(Adafruit_SSD1306&, void*), void *pData, const unsigned char UID) boolean ScreenManager::addView(boolean (*viewLogicFunction)(Adafruit_SSD1306&, void*), void *pData, const unsigned char UID)
{ {
ViewLink viewLink ={viewLogicFunction, pData, UID, NULL, NULL}; ViewLink viewLink = {viewLogicFunction, pData, UID, NULL, NULL};
return addNewLinkAtTheEnd(&_viewLinkedList, viewLink); return addNewLinkAtTheEnd(&_viewLinkedList, viewLink);
} }