Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 531ddf9

Browse files
SooDragonSooDragon
authoredMar 25, 2025··
Merge branch 'master' into master
2 parents 4b4a5ac + cd7f421 commit 531ddf9

File tree

6 files changed

+51
-8
lines changed

6 files changed

+51
-8
lines changed
 

‎.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
{

‎boards.txt

+6
Original file line numberDiff line numberDiff line change
@@ -940,6 +940,9 @@ esp32s3.menu.PartitionScheme.app5M_fat24M_32MB.upload.maximum_size=4718592
940940
esp32s3.menu.PartitionScheme.app5M_little24M_32MB=32M Flash (4.8MB APP/22MB LittleFS)
941941
esp32s3.menu.PartitionScheme.app5M_little24M_32MB.build.partitions=large_littlefs_32MB
942942
esp32s3.menu.PartitionScheme.app5M_little24M_32MB.upload.maximum_size=4718592
943+
esp32s3.menu.PartitionScheme.app13M_data7M_32MB=32M Flash (13MB APP/6.75MB SPIFFS)
944+
esp32s3.menu.PartitionScheme.app13M_data7M_32MB.build.partitions=default_32MB
945+
esp32s3.menu.PartitionScheme.app13M_data7M_32MB.upload.maximum_size=13107200
943946
esp32s3.menu.PartitionScheme.esp_sr_16=ESP SR 16M (3MB APP/7MB SPIFFS/2.9MB MODEL)
944947
esp32s3.menu.PartitionScheme.esp_sr_16.upload.maximum_size=3145728
945948
esp32s3.menu.PartitionScheme.esp_sr_16.upload.extra_flags=0xD10000 {build.path}/srmodels.bin
@@ -2148,6 +2151,9 @@ esp32s3-octal.menu.PartitionScheme.app5M_fat24M_32MB.upload.maximum_size=4718592
21482151
esp32s3-octal.menu.PartitionScheme.app5M_little24M_32MB=32M Flash (4.8MB APP/22MB LittleFS)
21492152
esp32s3-octal.menu.PartitionScheme.app5M_little24M_32MB.build.partitions=large_littlefs_32MB
21502153
esp32s3-octal.menu.PartitionScheme.app5M_little24M_32MB.upload.maximum_size=4718592
2154+
esp32s3-octal.menu.PartitionScheme.app13M_data7M_32MB=32M Flash (13MB APP/6.75MB SPIFFS)
2155+
esp32s3-octal.menu.PartitionScheme.app13M_data7M_32MB.build.partitions=default_32MB
2156+
esp32s3-octal.menu.PartitionScheme.app13M_data7M_32MB.upload.maximum_size=13107200
21512157

21522158
esp32s3-octal.menu.CPUFreq.240=240MHz (WiFi)
21532159
esp32s3-octal.menu.CPUFreq.240.build.f_cpu=240000000L

‎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.

‎libraries/ESP32/examples/RMT/RMTReadXJT/RMTReadXJT.ino

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
// limitations under the License.
1414

1515
/**
16-
* @brief This example demonstrates usage of RMT for receiving XJT D12 data
16+
* @brief This example demonstrates usage of RMT for receiving XJT D16 data
1717
*
1818
* The output is the RMT data read and processed
1919
*
2020
*/
2121

2222
//
2323
// Note: This example uses a FrSKY device communication
24-
// using XJT D12 protocol
24+
// using XJT D16 protocol
2525
//
2626
// ; 0 bit = 6us low/10us high
2727
// ; 1 bit = 14us low/10us high

‎tools/partitions/default_32MB.csv

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Name, Type, SubType, Offset, Size, Flags
2+
nvs, data, nvs, 0x9000, 0x5000,
3+
otadata, data, ota, 0xe000, 0x2000,
4+
app0, app, ota_0, 0x10000, 0xC80000,
5+
app1, app, ota_1, 0xC90000,0xC80000,
6+
spiffs, data, spiffs, 0x1910000,0x6C0000,
7+
coredump, data, coredump,0x1FF0000,0x10000,

‎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)
Please sign in to comment.