Skip to content
This repository was archived by the owner on Mar 5, 2026. It is now read-only.

Commit 3e66903

Browse files
committed
Some small adjustments for ESP32
- bump version - remove compilation warnings - do not require SPIFFS
1 parent e495044 commit 3e66903

5 files changed

Lines changed: 12 additions & 5 deletions

File tree

library.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
"type": "git",
1313
"url": "https://github.com/me-no-dev/ESPAsyncWebServer.git"
1414
},
15+
"version": "1.1.0",
16+
"license": "LGPL-3.0",
1517
"frameworks": "arduino",
1618
"platforms":"espressif",
1719
"dependencies":

src/AsyncWebSocket.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,7 @@ AsyncWebSocketBasicMessage::AsyncWebSocketBasicMessage(uint8_t opcode, bool mask
307307
,_sent(0)
308308
,_ack(0)
309309
,_acked(0)
310+
,_data(NULL)
310311
{
311312
_opcode = opcode & 0x07;
312313
_mask = mask;

src/AsyncWebSocket.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ class AsyncWebSocketMessage {
9494

9595
class AsyncWebSocketBasicMessage: public AsyncWebSocketMessage {
9696
private:
97-
uint8_t * _data;
9897
size_t _len;
9998
size_t _sent;
10099
size_t _ack;
101100
size_t _acked;
101+
uint8_t * _data;
102102
public:
103103
AsyncWebSocketBasicMessage(const char * data, size_t len, uint8_t opcode=WS_TEXT, bool mask=false);
104104
AsyncWebSocketBasicMessage(uint8_t opcode=WS_TEXT, bool mask=false);

src/SPIFFSEditor.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,11 @@ static bool isExcluded(fs::FS _fs, const char *filename) {
334334

335335
// WEB HANDLER IMPLEMENTATION
336336

337+
#ifdef ESP32
338+
SPIFFSEditor::SPIFFSEditor(const fs::FS& fs, const String& username, const String& password)
339+
#else
337340
SPIFFSEditor::SPIFFSEditor(const String& username, const String& password, const fs::FS& fs)
341+
#endif
338342
:_fs(fs)
339343
,_username(username)
340344
,_password(password)

src/SPIFFSEditor.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
#define SPIFFSEditor_H_
33
#include <ESPAsyncWebServer.h>
44

5-
#ifdef ESP32
6-
#include "SPIFFS.h"
7-
#endif
8-
95
#define EXCLUDELIST "/.exclude.files"
106

117
class SPIFFSEditor: public AsyncWebHandler {
@@ -16,7 +12,11 @@ class SPIFFSEditor: public AsyncWebHandler {
1612
bool _authenticated;
1713
uint32_t _startTime;
1814
public:
15+
#ifdef ESP32
16+
SPIFFSEditor(const fs::FS& fs, const String& username=String(), const String& password=String());
17+
#else
1918
SPIFFSEditor(const String& username=String(), const String& password=String(), const fs::FS& fs=SPIFFS);
19+
#endif
2020
virtual bool canHandle(AsyncWebServerRequest *request) override final;
2121
virtual void handleRequest(AsyncWebServerRequest *request) override final;
2222
virtual void handleUpload(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) override final;

0 commit comments

Comments
 (0)