diff --git a/.vscode/ipch/c0d54e76fe84c497/main.ipch b/.vscode/ipch/c0d54e76fe84c497/main.ipch new file mode 100644 index 0000000..df7c044 Binary files /dev/null and b/.vscode/ipch/c0d54e76fe84c497/main.ipch differ diff --git a/.vscode/ipch/c0d54e76fe84c497/mmap_address.bin b/.vscode/ipch/c0d54e76fe84c497/mmap_address.bin new file mode 100644 index 0000000..b9dd7b1 Binary files /dev/null and b/.vscode/ipch/c0d54e76fe84c497/mmap_address.bin differ diff --git a/.vscode/ipch/d5b4c78aa3dfd737/mmap_address.bin b/.vscode/ipch/d5b4c78aa3dfd737/mmap_address.bin new file mode 100644 index 0000000..1c8d2d9 Binary files /dev/null and b/.vscode/ipch/d5b4c78aa3dfd737/mmap_address.bin differ diff --git a/.vscode/settings.json b/.vscode/settings.json index 13f18c7..72b20e8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,6 @@ { "terminal.integrated.env.linux": { - "PATH": "/home/master/.platformio/penv/bin:/home/master/.platformio/penv:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl", + "PATH": "/home/master/.platformio/penv/bin:/home/master/.platformio/penv:/home/master/bin:/opt/google-cloud-sdk/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/sbin:/usr/sbin", "PLATFORMIO_CALLER": "vscode" } } \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index 464e324..46ed74f 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,5 +1,5 @@ -;[platformio] -;env_default = basic +[platformio] +env_default = basic_esp01 [common] framework = arduino @@ -11,7 +11,7 @@ lib_deps = Hash TaskScheduler SPIFFS - ArduinoJson + ArduinoJson@5.13.4 https://gitlab.com/wirelos/sprocket-lib.git#develop [env:basic] @@ -24,6 +24,16 @@ framework = ${common.framework} lib_deps = ${common.lib_deps} ESP8266mDNS +[env:basic_esp01] +platform = ${common.platform} +board = esp01 +framework = ${common.framework} +src_filter = +<*> - + +upload_speed = ${common.upload_speed} +monitor_baud = ${common.monitor_baud} +lib_deps = ${common.lib_deps} + ESP8266mDNS + [env:basic_esp32] src_filter = +<*> - + platform = ${common.platform} diff --git a/src/OtaTcpPlugin.cpp b/src/OtaTcpPlugin.cpp_ similarity index 100% rename from src/OtaTcpPlugin.cpp rename to src/OtaTcpPlugin.cpp_ diff --git a/src/examples/basic/config.h b/src/examples/basic/config.h index 051b345..ad108c5 100644 --- a/src/examples/basic/config.h +++ b/src/examples/basic/config.h @@ -11,11 +11,11 @@ #define STARTUP_DELAY 3000 // network config -#define SPROCKET_MODE 0 -#define AP_SSID "MyAP" -#define AP_PASSWORD "myApPwd" -#define STATION_SSID "Th1ngs4p" -#define STATION_PASSWORD "th3r31sn0sp00n" +#define SPROCKET_MODE 1 +#define AP_SSID "Th1ngs4p" +#define AP_PASSWORD "th3r31sn0sp00n" +#define STATION_SSID "tErAx1d" +#define STATION_PASSWORD "ramalamadingdong" #define HOSTNAME "standalone-node" #define CONNECT_TIMEOUT 10000 diff --git a/src/examples/basic/main.cpp b/src/examples/basic/main.cpp index 51acb6c..328644e 100644 --- a/src/examples/basic/main.cpp +++ b/src/examples/basic/main.cpp @@ -2,7 +2,15 @@ #include "WiFiNet.h" #include "Sprocket.h" -WiFiNet wifi( +using namespace std; +using namespace std::placeholders; + +WiFiNet *wifi; +Sprocket *sprocket; + +void setup() +{ + wifi = new WiFiNet( SPROCKET_MODE, STATION_SSID, STATION_PASSWORD, @@ -11,18 +19,16 @@ WiFiNet wifi( HOSTNAME, CONNECT_TIMEOUT); -Sprocket sprocket( - {STARTUP_DELAY, SERIAL_BAUD_RATE}); - -void setup() -{ - delay(3000); - wifi.connect(); - sprocket.activate(); + sprocket = new Sprocket( + {STARTUP_DELAY, SERIAL_BAUD_RATE}); + wifi->connect(); + sprocket->activate(); + } void loop() { - sprocket.loop(); + sprocket->loop(); yield(); -} \ No newline at end of file +} + diff --git a/src/examples/ota/main.cpp b/src/examples/ota/main.cpp index 3410309..63e28db 100644 --- a/src/examples/ota/main.cpp +++ b/src/examples/ota/main.cpp @@ -1,7 +1,7 @@ #include "config.h" #include "WiFiNet.h" #include "Sprocket.h" -#include "OtaTcpPlugin.h" +//#include "OtaTcpPlugin.h" WiFiNet wifi( SPROCKET_MODE, @@ -19,7 +19,7 @@ void setup() { delay(3000); wifi.connect(); - sprocket.addPlugin(new OtaTcpPlugin({8266, ""})); + //sprocket.addPlugin(new OtaTcpPlugin({8266, ""})); sprocket.activate(); }