From 28cdcf666d5feb4510fda069b1087514f85f3ebc Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Thu, 5 Jul 2018 16:05:04 +0200 Subject: [PATCH] Play nice with regular web server on esp32 Include the regular web server first and then the Async in your sketch --- src/ESPAsyncWebServer.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ESPAsyncWebServer.h b/src/ESPAsyncWebServer.h index c916fc5..0cf7314 100644 --- a/src/ESPAsyncWebServer.h +++ b/src/ESPAsyncWebServer.h @@ -51,6 +51,7 @@ class AsyncStaticWebHandler; class AsyncCallbackWebHandler; class AsyncResponseStream; +#ifndef WEBSERVER_H typedef enum { HTTP_GET = 0b00000001, HTTP_POST = 0b00000010, @@ -61,6 +62,8 @@ typedef enum { HTTP_OPTIONS = 0b01000000, HTTP_ANY = 0b01111111, } WebRequestMethod; +#endif + typedef uint8_t WebRequestMethodComposite; typedef std::function ArDisconnectHandler;