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

Compare commits

base: Th3maz1ng:cabfdfcfb39ec31d2fd06941905af3e15494ce32
Branches Tags
Th3maz1ng:master
..
compare: Th3maz1ng:ae973dd8ed0d65ebe66e703c64f3ab06bcdf147e
Branches Tags
Th3maz1ng:master

No commits in common. "cabfdfcfb39ec31d2fd06941905af3e15494ce32" and "ae973dd8ed0d65ebe66e703c64f3ab06bcdf147e" have entirely different histories.
cabfdfcfb3 ... ae973dd8ed

4 changed files with 9 additions and 16 deletions
Show Stats Expand all files Collapse all files

15
.vscode/tasks.json vendored
View File

@ -6,9 +6,9 @@
{ {
"label": "Build", "label": "Build",
"type": "shell", "type": "shell",
"command": "arduino-cli compile -v --warnings all -b esp8266:esp8266:nodemcuv2:xtal=80,vt=flash,exception=disabled,stacksmash=enabled,ssl=basic,mmu=3232,non32xfer=fast,eesz=4M,led=2,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=921600 -e \"`pwd`/src/app\"", "command": "arduino-cli compile -v --warnings all -b esp8266:esp8266:nodemcuv2:xtal=80,vt=flash,exception=disabled,stacksmash=enabled,ssl=basic,mmu=3232,non32xfer=fast,eesz=4M,led=2,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=921600 \"`pwd`/src/app\"",
"windows":{ "windows":{
"command": "arduino-cli compile -v --warnings all -b esp8266:esp8266:nodemcuv2:xtal=80,vt=flash,exception=disabled,stacksmash=enabled,ssl=basic,mmu=3232,non32xfer=fast,eesz=4M,led=2,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=921600 -e ((pwd).path + '/src/app')" "command": "arduino-cli compile -v --warnings all -b esp8266:esp8266:nodemcuv2:xtal=80,vt=flash,exception=disabled,stacksmash=enabled,ssl=basic,mmu=3232,non32xfer=fast,eesz=4M,led=2,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=921600 ((pwd).path + '/src/app')"
}, },
"group": "build", "group": "build",
"presentation": { "presentation": {
@ -23,9 +23,9 @@
{ {
"label": "Flash", "label": "Flash",
"type": "shell", "type": "shell",
"command": "arduino-cli upload -v -b esp8266:esp8266:nodemcuv2:xtal=80,vt=flash,exception=disabled,stacksmash=enabled,ssl=basic,mmu=3232,non32xfer=fast,eesz=4M,led=2,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=921600 \"`pwd`/src/app\" -p ${input:com_port}", "command": "arduino-cli upload -v -b esp8266:esp8266:nodemcuv2:xtal=80,vt=flash,exception=disabled,stacksmash=enabled,ssl=basic,mmu=3232,non32xfer=fast,eesz=4M,led=2,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=921600 \"`pwd`/src/app\" -p COM27",
"windows":{ "windows":{
"command": "arduino-cli upload -v -b esp8266:esp8266:nodemcuv2:xtal=80,vt=flash,exception=disabled,stacksmash=enabled,ssl=basic,mmu=3232,non32xfer=fast,eesz=4M,led=2,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=921600 ((pwd).path + '/src/app') -p ${input:com_port}" "command": "arduino-cli upload -v -b esp8266:esp8266:nodemcuv2:xtal=80,vt=flash,exception=disabled,stacksmash=enabled,ssl=basic,mmu=3232,non32xfer=fast,eesz=4M,led=2,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=921600 ((pwd).path + '/src/app') -p COM27"
}, },
"group": "build", "group": "build",
"presentation": { "presentation": {
@ -44,12 +44,5 @@
"dependsOrder": "sequence", "dependsOrder": "sequence",
"dependsOn":["Build", "Flash"] "dependsOn":["Build", "Flash"]
} }
],
"inputs": [
{
"id":"com_port",
"type":"promptString",
"description": "target serial port : COMXX"
}
] ]
} }

4
src/app/Dictionary.h
View File

@ -229,7 +229,7 @@ public:
return NULL; return NULL;
} }
unsigned int count() const unsigned int count()
{ {
unsigned int counter(0); unsigned int counter(0);
if(isListEmpty(_head->_next))return counter; if(isListEmpty(_head->_next))return counter;
@ -321,7 +321,7 @@ protected:
return true; return true;
} }
boolean isListEmpty(Dictionary *node) const {return node == NULL;} boolean isListEmpty(Dictionary *node) {return node == NULL;}
char *_parameter; char *_parameter;
T *_value; T *_value;

2
src/app/TaskSchedulerManager.cpp
View File

@ -239,7 +239,7 @@ void TaskSchedulerManager::run()
} }
} }
unsigned int TaskSchedulerManager::taskCount() const unsigned int TaskSchedulerManager::taskCount()
{ {
return _taskDataDictio.count(); return _taskDataDictio.count();
} }

4
src/app/TaskSchedulerManager.h
View File

@ -26,7 +26,7 @@ namespace TaskSchedulerManagerHelper
static Schedule *scheduleBuilder(); static Schedule *scheduleBuilder();
Schedule *setMillis(uint32_t millis); Schedule *setMillis(uint32_t millis);
Schedule *setSeconds(uint32_t seconds); Schedule *setSeconds(uint32_t seconds);
Schedule *setMinutes(uint32_t minutes); Schedule *setMinutes(uint32_t minutes);
Schedule *setHours(uint16_t hours); Schedule *setHours(uint16_t hours);
Schedule *setDateTime(DateTime &dateTime); Schedule *setDateTime(DateTime &dateTime);
Schedule *setDays(uint8_t days); Schedule *setDays(uint8_t days);
@ -75,7 +75,7 @@ class TaskSchedulerManager
TaskSchedulerManagerHelper::Schedule *getTask(const char *name); TaskSchedulerManagerHelper::Schedule *getTask(const char *name);
TaskSchedulerManagerHelper::Schedule *getTask(uint16_t id); TaskSchedulerManagerHelper::Schedule *getTask(uint16_t id);
void run(); void run();
unsigned int taskCount() const; unsigned int taskCount();
uint16_t findFreeTaskId(); uint16_t findFreeTaskId();
protected: protected:
TaskSchedulerManager(); TaskSchedulerManager();