Merge branch 'next' into 'master'

Next

See merge request wirelos/sprocket-plugin-web!1
This commit is contained in:
0x1d
2020-02-21 13:54:29 +00:00
4 changed files with 12 additions and 13 deletions

3
.gitignore vendored
View File

@@ -1,5 +1,4 @@
.pioenvs .pio
.piolibdeps
.vscode/.browse.c_cpp.db* .vscode/.browse.c_cpp.db*
.vscode/c_cpp_properties.json .vscode/c_cpp_properties.json
.vscode/launch.json .vscode/launch.json

View File

@@ -1,7 +1,7 @@
{ {
// See http://go.microsoft.com/fwlink/?LinkId=827846 // See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format // for the documentation about the extensions.json format
"recommendations": [ "recommendations": [
"platformio.platformio-ide" "platformio.platformio-ide"
] ]
} }

View File

@@ -8,7 +8,7 @@ lib_deps =
Hash Hash
TaskScheduler TaskScheduler
SPIFFS SPIFFS
ArduinoJson ArduinoJson@5.13.4
ESPAsyncTCP ESPAsyncTCP
ESP8266mDNS ESP8266mDNS
ESP Async WebServer ESP Async WebServer

View File

@@ -4,11 +4,11 @@
#include <Arduino.h> #include <Arduino.h>
#include <ESPAsyncWebServer.h> #include <ESPAsyncWebServer.h>
#include <AsyncWebSocket.h> #include <AsyncWebSocket.h>
#ifdef ESP32 //#ifdef ESP32
#include <AsyncTCP.h> //#include <AsyncTCP.h>
#elif defined(ESP8266) //#elif defined(ESP8266)
#include <ESPAsyncTCP.h> #include <ESPAsyncTCP.h>
#endif //#endif
class WebUtils class WebUtils
{ {