andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix ESP32 "DISABLED" name conflict

pull/1/head
Scott Lahteine 5 years ago
parent
1eeef30097
commit
0f4d3e1bca
1 changed files with 3 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      Marlin/src/HAL/HAL_ESP32/web.cpp

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)

Write Preview
Loading…
Cancel
Save