Browse Source

Fix ESP32 "DISABLED" name conflict

Scott Lahteine 6 years ago
parent
commit
0f4d3e1bca
1 changed files with 3 additions and 2 deletions
  1. 3
    2
      Marlin/src/HAL/HAL_ESP32/web.cpp

+ 3
- 2
Marlin/src/HAL/HAL_ESP32/web.cpp View File

22
 
22
 
23
 #ifdef ARDUINO_ARCH_ESP32
23
 #ifdef ARDUINO_ARCH_ESP32
24
 
24
 
25
+#include <SPIFFS.h>
26
+#undef DISABLED  // esp32-hal-gpio.h
27
+
25
 #include "../../inc/MarlinConfigPre.h"
28
 #include "../../inc/MarlinConfigPre.h"
26
 
29
 
27
 #if ENABLED(WEBSUPPORT)
30
 #if ENABLED(WEBSUPPORT)
28
 
31
 
29
-#include <SPIFFS.h>
30
-
31
 #include "wifi.h"
32
 #include "wifi.h"
32
 
33
 
33
 AsyncEventSource events("/events"); // event source (Server-Sent events)
34
 AsyncEventSource events("/events"); // event source (Server-Sent events)

Loading…
Cancel
Save