diff --git a/platformio.ini b/platformio.ini index 1564c02..ae1f806 100644 --- a/platformio.ini +++ b/platformio.ini @@ -8,8 +8,8 @@ ; Please visit documentation for the other options and examples ; http://docs.platformio.org/page/projectconf.html -;[platformio] -;env_default = mesh +[platformio] +env_default = basic_esp32 [common] framework = arduino @@ -36,10 +36,21 @@ lib_deps = ;upload_port = 192.168.1.168 [env:basic] -src_filter = +<*> - + platform = ${common.platform} board = ${common.board} +src_filter = +<*> - + upload_speed = ${common.upload_speed} monitor_baud = ${common.monitor_baud} framework = ${common.framework} +lib_deps = ${common.lib_deps} + + +[env:basic_esp32] +platform = espressif32 +board = esp32dev +framework = ${common.framework} +build_flags = -std=c++14 +src_filter = +<*> - + +upload_speed = ${common.upload_speed} +monitor_baud = ${common.monitor_baud} lib_deps = ${common.lib_deps} \ No newline at end of file diff --git a/src/Network.h b/src/Network.h index f40d4ed..6bd037a 100644 --- a/src/Network.h +++ b/src/Network.h @@ -3,6 +3,7 @@ #include #include +#include typedef std::function msgReceived_cb; diff --git a/src/Sprocket.h b/src/Sprocket.h index 1f34a7a..bf378fc 100644 --- a/src/Sprocket.h +++ b/src/Sprocket.h @@ -5,8 +5,8 @@ #define _TASK_STD_FUNCTION #define _TASK_PRIORITY -#include #include +#include #include #include "FS.h" #ifdef ESP32 @@ -19,9 +19,6 @@ using namespace std; using namespace std::placeholders; -// FIXME move to some global fnc lib -#define ARRAY_LENGTH(array) sizeof(array)/sizeof(array[0]) - class Sprocket : public Mediator { protected: // TODO move scheduler out of Sprocket diff --git a/src/utils/misc.h b/src/utils/misc.h index be28f4e..0fe7e91 100644 --- a/src/utils/misc.h +++ b/src/utils/misc.h @@ -1,5 +1,5 @@ -#ifndef __ARRAY_UTILS__ -#define __ARRAY_UTILS__ +#ifndef __MISC_UTILS__ +#define __MISC_UTILS__ #define ARRAY_LENGTH(array) sizeof(array)/sizeof(array[0])