feedc0de/ESPAsyncWebServer
1
0
Fork 0
forked from me-no-dev/ESPAsyncWebServer
Code Pull Requests Activity

Some small adjustments for ESP32

Browse Source 
- bump version
- remove compilation warnings
- do not require SPIFFS
This commit is contained in:
me-no-dev
2017-09-09 09:04:47 +03:00
parent e4950444c4
commit 3e6690396a
5 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library.json
View File

@@ -12,6 +12,8 @@
"type": "git", "type": "git",
"url": "https://github.com/me-no-dev/ESPAsyncWebServer.git" "url": "https://github.com/me-no-dev/ESPAsyncWebServer.git"
}, },
"version": "1.1.0",
"license": "LGPL-3.0",
"frameworks": "arduino", "frameworks": "arduino",
"platforms":"espressif", "platforms":"espressif",
"dependencies": "dependencies":

1
src/AsyncWebSocket.cpp
View File

@@ -307,6 +307,7 @@ AsyncWebSocketBasicMessage::AsyncWebSocketBasicMessage(uint8_t opcode, bool mask
,_sent(0) ,_sent(0)
,_ack(0) ,_ack(0)
,_acked(0) ,_acked(0)
,_data(NULL)
{ {
_opcode = opcode & 0x07; _opcode = opcode & 0x07;
_mask = mask; _mask = mask;

2
src/AsyncWebSocket.h
View File

@@ -94,11 +94,11 @@ class AsyncWebSocketMessage {
class AsyncWebSocketBasicMessage: public AsyncWebSocketMessage { class AsyncWebSocketBasicMessage: public AsyncWebSocketMessage {
private: private:
uint8_t * _data;
size_t _len; size_t _len;
size_t _sent; size_t _sent;
size_t _ack; size_t _ack;
size_t _acked; size_t _acked;
uint8_t * _data;
public: public:
AsyncWebSocketBasicMessage(const char * data, size_t len, uint8_t opcode=WS_TEXT, bool mask=false); AsyncWebSocketBasicMessage(const char * data, size_t len, uint8_t opcode=WS_TEXT, bool mask=false);
AsyncWebSocketBasicMessage(uint8_t opcode=WS_TEXT, bool mask=false); AsyncWebSocketBasicMessage(uint8_t opcode=WS_TEXT, bool mask=false);

4
src/SPIFFSEditor.cpp
View File

@@ -334,7 +334,11 @@ static bool isExcluded(fs::FS _fs, const char *filename) {
// WEB HANDLER IMPLEMENTATION // WEB HANDLER IMPLEMENTATION
#ifdef ESP32
SPIFFSEditor::SPIFFSEditor(const fs::FS& fs, const String& username, const String& password)
#else
SPIFFSEditor::SPIFFSEditor(const String& username, const String& password, const fs::FS& fs) SPIFFSEditor::SPIFFSEditor(const String& username, const String& password, const fs::FS& fs)
#endif
:_fs(fs) :_fs(fs)
,_username(username) ,_username(username)
,_password(password) ,_password(password)

8
src/SPIFFSEditor.h
View File

@@ -2,10 +2,6 @@
#define SPIFFSEditor_H_ #define SPIFFSEditor_H_
#include <ESPAsyncWebServer.h> #include <ESPAsyncWebServer.h>
#ifdef ESP32
#include "SPIFFS.h"
#endif
#define EXCLUDELIST "/.exclude.files" #define EXCLUDELIST "/.exclude.files"
class SPIFFSEditor: public AsyncWebHandler { class SPIFFSEditor: public AsyncWebHandler {
@@ -16,7 +12,11 @@ class SPIFFSEditor: public AsyncWebHandler {
bool _authenticated; bool _authenticated;
uint32_t _startTime; uint32_t _startTime;
public: public:
#ifdef ESP32
SPIFFSEditor(const fs::FS& fs, const String& username=String(), const String& password=String());
#else
SPIFFSEditor(const String& username=String(), const String& password=String(), const fs::FS& fs=SPIFFS); SPIFFSEditor(const String& username=String(), const String& password=String(), const fs::FS& fs=SPIFFS);
#endif
virtual bool canHandle(AsyncWebServerRequest *request) override final; virtual bool canHandle(AsyncWebServerRequest *request) override final;
virtual void handleRequest(AsyncWebServerRequest *request) override final; virtual void handleRequest(AsyncWebServerRequest *request) override final;
virtual void handleUpload(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) override final; virtual void handleUpload(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) override final;