Skip to content

Commit 3b971f2

Browse files
authored
Merge branch 'master' into patch-5
2 parents 46fafa2 + cd7f421 commit 3b971f2

File tree

3 files changed

+36
-6
lines changed

3 files changed

+36
-6
lines changed

Diff for: .github/workflows/lib.json

+33-5
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,44 @@
2323
]
2424
},
2525
{
26-
"source-url": "https://github.com/me-no-dev/ESPAsyncWebServer.git",
26+
"source-url": "https://github.com/ESP32Async/ESPAsyncWebServer.git",
2727
"required-libs": [
28-
{"source-url": "https://github.com/me-no-dev/AsyncTCP.git"}
28+
{"source-url": "https://github.com/ESP32Async/AsyncTCP.git"}
2929
],
3030
"exclude_targets": [],
3131
"sketch_path": [
32+
"~/Arduino/libraries/ESPAsyncWebServer/examples/Auth/Auth.ino",
33+
"~/Arduino/libraries/ESPAsyncWebServer/examples/CORS/CORS.ino",
3234
"~/Arduino/libraries/ESPAsyncWebServer/examples/CaptivePortal/CaptivePortal.ino",
33-
"~/Arduino/libraries/ESPAsyncWebServer/examples/ESP_AsyncFSBrowser/ESP_AsyncFSBrowser.ino",
34-
"~/Arduino/libraries/ESPAsyncWebServer/examples/regex_patterns/regex_patterns.ino",
35-
"~/Arduino/libraries/ESPAsyncWebServer/examples/simple_server/simple_server.ino"
35+
"~/Arduino/libraries/ESPAsyncWebServer/examples/CatchAllHandler/CatchAllHandler.ino",
36+
"~/Arduino/libraries/ESPAsyncWebServer/examples/ChunkResponse/ChunkResponse.ino",
37+
"~/Arduino/libraries/ESPAsyncWebServer/examples/ChunkRetryResponse/ChunkRetryResponse.ino",
38+
"~/Arduino/libraries/ESPAsyncWebServer/examples/EndBegin/EndBegin.ino",
39+
"~/Arduino/libraries/ESPAsyncWebServer/examples/Filters/Filters.ino",
40+
"~/Arduino/libraries/ESPAsyncWebServer/examples/FlashResponse/FlashResponse.ino",
41+
"~/Arduino/libraries/ESPAsyncWebServer/examples/HeaderManipulation/HeaderManipulation.ino",
42+
"~/Arduino/libraries/ESPAsyncWebServer/examples/Headers/Headers.ino",
43+
"~/Arduino/libraries/ESPAsyncWebServer/examples/Json/Json.ino",
44+
"~/Arduino/libraries/ESPAsyncWebServer/examples/Logging/Logging.ino",
45+
"~/Arduino/libraries/ESPAsyncWebServer/examples/MessagePack/MessagePack.ino",
46+
"~/Arduino/libraries/ESPAsyncWebServer/examples/Middleware/Middleware.ino",
47+
"~/Arduino/libraries/ESPAsyncWebServer/examples/Params/Params.ino",
48+
"~/Arduino/libraries/ESPAsyncWebServer/examples/PartitionDownloader/PartitionDownloader.ino",
49+
"~/Arduino/libraries/ESPAsyncWebServer/examples/PerfTests/PerfTests.ino",
50+
"~/Arduino/libraries/ESPAsyncWebServer/examples/RateLimit/RateLimit.ino",
51+
"~/Arduino/libraries/ESPAsyncWebServer/examples/Redirect/Redirect.ino",
52+
"~/Arduino/libraries/ESPAsyncWebServer/examples/RequestContinuation/RequestContinuation.ino",
53+
"~/Arduino/libraries/ESPAsyncWebServer/examples/RequestContinuationComplete/RequestContinuationComplete.ino",
54+
"~/Arduino/libraries/ESPAsyncWebServer/examples/ResumableDownload/ResumableDownload.ino",
55+
"~/Arduino/libraries/ESPAsyncWebServer/examples/Rewrite/Rewrite.ino",
56+
"~/Arduino/libraries/ESPAsyncWebServer/examples/ServerSentEvents/ServerSentEvents.ino",
57+
"~/Arduino/libraries/ESPAsyncWebServer/examples/ServerState/ServerState.ino",
58+
"~/Arduino/libraries/ESPAsyncWebServer/examples/SkipServerMiddleware/SkipServerMiddleware.ino",
59+
"~/Arduino/libraries/ESPAsyncWebServer/examples/SlowChunkResponse/SlowChunkResponse.ino",
60+
"~/Arduino/libraries/ESPAsyncWebServer/examples/StaticFile/StaticFile.ino",
61+
"~/Arduino/libraries/ESPAsyncWebServer/examples/Templates/Templates.ino",
62+
"~/Arduino/libraries/ESPAsyncWebServer/examples/Upload/Upload.ino",
63+
"~/Arduino/libraries/ESPAsyncWebServer/examples/WebSocket/WebSocket.ino"
3664
]
3765
},
3866
{

Diff for: cores/esp32/freertos_stats.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ void printRunningTasks(Print &printer) {
3131
#endif
3232
configRUN_TIME_COUNTER_TYPE ulTotalRunTime = 0;
3333
TaskStatus_t *pxTaskStatusArray = NULL;
34-
volatile UBaseType_t uxArraySize = 0, x = 0;
34+
volatile UBaseType_t uxArraySize = 0;
35+
uint32_t x = 0;
3536
const char *taskStates[] = {"Running", "Ready", "Blocked", "Suspended", "Deleted", "Invalid"};
3637

3738
// Take a snapshot of the number of tasks in case it changes while this function is executing.

Diff for: variants/esp32s3usbotg/pins_arduino.h

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define Pins_Arduino_h
33

44
#include <stdint.h>
5+
#include <stdbool.h>
56

67
#define USB_VID 0x303a
78
#define USB_PID 0x1001

0 commit comments

Comments
 (0)