Skip to content

Commit 583c9d3

Browse files
committed
asyncweb: move to mathieucarbou/AsyncTCP
1 parent 90583f2 commit 583c9d3

File tree

5 files changed

+16
-12
lines changed

5 files changed

+16
-12
lines changed

.github/workflows/build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
fqbn: esp32:esp32:esp32cam
2222
libraries: |
2323
- source-path: ./
24-
- source-url: https://github.com/me-no-dev/AsyncTCP.git
25-
version: 58cbe1fabe78977e3140391c01c03f0cb51e347c
26-
- source-url: https://github.com/me-no-dev/ESPAsyncWebServer.git
27-
version: 7f3753454b1f176c4b6d6bcd1587a135d95ca63c
24+
- name: Async TCP
25+
- name: ESP Async WebServer
26+
# https://github.com/mathieucarbou/AsyncTCP
27+
# https://github.com/mathieucarbou/ESPAsyncWebServer
2828
- name: Build docs
2929
run: docs/build.sh
3030
- name: Deploy docs

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ISC License
22

3-
Copyright (c) 2020-2024, Junxiao Shi
3+
Copyright (c) 2020-2025, Junxiao Shi
44

55
Permission to use, copy, modify, and/or distribute this software for any
66
purpose with or without fee is hereby granted, provided that the above

examples/AsyncCam/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# AsyncCam: camera on ESPAsyncWebServer
22

33
This example runs on ESP32-CAM board.
4-
It demonstrates how to use esp32cam library with [ESPAsyncWebServer](https://github.com/me-no-dev/ESPAsyncWebServer) library.
5-
The HTTP server supports both JPEG still image and MJPEG stream, and allows changing camera resolution on the fly.
4+
It demonstrates how to use esp32cam library with [ESPAsyncWebServer](https://github.com/mathieucarbou/ESPAsyncWebServer) library.
5+
The HTTP server supports both ~~JPEG still image~~ and MJPEG stream, and allows changing camera resolution on the fly.
66
To use this example, modify WiFi SSID+password, then upload to ESP32.

examples/AsyncCam/handlers.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ rewriteFrontpage(const String& var) {
8686
void
8787
addRequestHandlers() {
8888
server.on("/", HTTP_GET, [](AsyncWebServerRequest* request) {
89-
request->send_P(200, "text/html", reinterpret_cast<const uint8_t*>(FRONTPAGE),
90-
sizeof(FRONTPAGE), rewriteFrontpage);
89+
request->send(200, "text/html", reinterpret_cast<const uint8_t*>(FRONTPAGE), sizeof(FRONTPAGE),
90+
rewriteFrontpage);
9191
});
9292

9393
server.on("/robots.txt", HTTP_GET, [](AsyncWebServerRequest* request) {

src/esp32cam-asyncweb.h

+7-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include "esp32cam.h"
55

66
#include <ESPAsyncWebServer.h>
7-
#include <freertos/queue.h>
8-
#include <freertos/task.h>
7+
#include <freertos/FreeRTOS.h>
8+
#include <freertos/idf_additions.h>
99

1010
#ifdef ESP32CAM_ASYNCWEB_LOGGER
1111
#define ESP32CAM_ASYNCWEB_LOG(fmt, ...) \
@@ -22,7 +22,7 @@
2222
namespace esp32cam {
2323
/**
2424
* @brief esp32cam integration with ESPAsyncWebServer library.
25-
* @sa https://github.com/me-no-dev/ESPAsyncWebServer
25+
* @sa https://github.com/mathieucarbou/ESPAsyncWebServer
2626
*/
2727
namespace asyncweb {
2828

@@ -103,6 +103,10 @@ class StillResponse : public AsyncAbstractResponse {
103103
*
104104
* To perform authentication or other operations before image capture, create another HTTP handler
105105
* to do these, and then call this function.
106+
*
107+
* @bug
108+
* This handler is currently broken: ESPAsyncWebServer expects request->send(response) to be
109+
* called before this function returns; otherwise it will generate 501 response.
106110
*/
107111
inline void
108112
handleStill(AsyncWebServerRequest* request) {

0 commit comments

Comments
 (0)