SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix ESP32 "DISABLED" name conflict

Browse source
This commit is contained in:
Scott Lahteine 2019-08-29 18:16:50 -05:00
parent 1eeef30097
commit 0f4d3e1bca
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Marlin/src/HAL/HAL_ESP32/web.cpp
View file

@ -22,12 +22,13 @@
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
#include <SPIFFS.h>
#undef DISABLED // esp32-hal-gpio.h
#include "../../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"
#if ENABLED(WEBSUPPORT) #if ENABLED(WEBSUPPORT)
#include <SPIFFS.h>
#include "wifi.h" #include "wifi.h"
AsyncEventSource events("/events"); // event source (Server-Sent events) AsyncEventSource events("/events"); // event source (Server-Sent events)