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

Compare commits

base: Th3maz1ng:5225520669e4667a8c6d6e0efd1a94b7d8fde6bc
Branches Tags
Th3maz1ng:master
...
compare: Th3maz1ng:5076864bc2eab29832457f94c59cb6ae43c6bb31
Branches Tags
Th3maz1ng:master

2 Commits
5225520669 ... 5076864bc2

Author SHA1 Message Date
anschrammh
5076864bc2 Updated the version history file 2020-12-08 21:54:41 +01:00
anschrammh
5fd0675044 Removed useless INIT state that was the same as the LINE_BREAK state and added the - character as allowed for parameters and values 2020-12-08 21:54:11 +01:00
2 changed files with 8 additions and 24 deletions
Show Stats Expand all files Collapse all files

30
src/app/CFGFileParser.cpp
View File

@ -1,6 +1,6 @@
#include "CFGFileParser.h"
CFGFileParser::CFGFileParser(SDCardManager &sdCardManager, const char *file):AbstractParser(file), _state(INIT), _type(PARAMETER), _quotedParameter(false), _quotedValue(false), _sdCardManager(sdCardManager)
CFGFileParser::CFGFileParser(SDCardManager &sdCardManager, const char *file):AbstractParser(file), _state(LINE_BREAK), _type(PARAMETER), _quotedParameter(false), _quotedValue(false), _sdCardManager(sdCardManager)
{
}
@ -22,7 +22,7 @@ void *CFGFileParser::parseFile()
return NULL;
}
_state = INIT;
_state = LINE_BREAK;
while(file.available())
{
readChar = (char)file.read();
@ -30,24 +30,6 @@ void *CFGFileParser::parseFile()
//Do work
switch(_state)
{
case INIT:
if(readChar == '#') _state = COMMENT_SECTION;
else if((readChar >= 65 && readChar <= 90) || (readChar >= 97 && readChar <= 122) || (readChar >= 48 && readChar <= 57))
{
_state = PARAM_SECTION;
parsedParameter = addChar(parsedParameter, readChar);
if(parsedParameter == NULL)
_state = ERROR;
//printf("%c",readChar);
}
else if(readChar == '\'')
{
_state = OPENING_QUOTE;
_type = PARAMETER;
}
else
_state = ERROR;
break;
case COMMENT_SECTION:
if(readChar == '\r' || readChar == '\n') _state = LINE_BREAK;
break;
@ -55,7 +37,7 @@ void *CFGFileParser::parseFile()
if(readChar == '#')
_state = COMMENT_SECTION;
else if(readChar == '\r' || readChar == '\n') _state = LINE_BREAK;
else if((readChar >= 65 && readChar <= 90) || (readChar >= 97 && readChar <= 122) || (readChar >= 48 && readChar <= 57))
else if((readChar >= 65 && readChar <= 90) || (readChar >= 97 && readChar <= 122) || (readChar >= 48 && readChar <= 57) || readChar == '-' || readChar == '_')
{
_state = PARAM_SECTION;
//printf("%c",readChar);
@ -89,7 +71,7 @@ void *CFGFileParser::parseFile()
}
}
else if(readChar == ' ') _state = PARAM_SECTION;
else if((readChar >= 65 && readChar <= 90) || (readChar >= 97 && readChar <= 122) || readChar == '_' || (readChar >= 48 && readChar <= 57))
else if((readChar >= 65 && readChar <= 90) || (readChar >= 97 && readChar <= 122) || readChar == '_' || readChar == '-' || (readChar >= 48 && readChar <= 57))
{
if(_type == PARAMETER)
{
@ -117,7 +99,7 @@ void *CFGFileParser::parseFile()
else
_quotedValue = true;
}
else if((readChar >= 65 && readChar <= 90) || (readChar >= 97 && readChar <= 122) || readChar == ' ' || readChar == '_' || (readChar >= 48 && readChar <= 57))
else if((readChar >= 65 && readChar <= 90) || (readChar >= 97 && readChar <= 122) || readChar == ' ' || readChar == '_' || readChar == '-' || (readChar >= 48 && readChar <= 57))
{
//printf("%c",readChar);
if(_type == PARAMETER)
@ -140,7 +122,7 @@ void *CFGFileParser::parseFile()
_type = VALUE;
if(readChar == '\'')_state = OPENING_QUOTE;
else if(readChar == ' ') _state = PARAM_SECTION;
else if((readChar >= 65 && readChar <= 90) || (readChar >= 97 && readChar <= 122) || (readChar >= 48 && readChar <= 57))
else if((readChar >= 65 && readChar <= 90) || (readChar >= 97 && readChar <= 122) || (readChar >= 48 && readChar <= 57) || readChar == '-' || readChar == '_')
{
_state = PARAM_SECTION;

2
src/app/versions.h
View File

@ -35,5 +35,7 @@
#define SOFT_VERSION "1.6.3" //Added a new api call to get nearby wifi access points
#define SOFT_VERSION "1.6.4" //Added the forceRefresh() method to the ScreenManager Object
#define SOFT_VERSION "1.6.5" //Removed the sd card mount and unmount api calls, replaced with the sdCardAction api call which takes a parameter (does the same thing)
#define SOFT_VERSION "1.6.6" //Removed useless INIT state that was like the LINE_BREAK state and added '-' as an allowed PARAM and VALUE character
#endif //VERSIONS_H