Fixups for ESP32

2019-03-13 05:25:54 -05:00
parent a5ea3e2f15
commit 4555ae448f
3 changed files with 23 additions and 12 deletions
--- a/Marlin/src/HAL/HAL_ESP32/HAL.h
+++ b/Marlin/src/HAL/HAL_ESP32/HAL.h
@ -55,9 +55,14 @@

 extern portMUX_TYPE spinlock;

-#define NUM_SERIAL 2
 #define MYSERIAL0 Serial
-#define MYSERIAL1 webSocketSerial
+
+#if ENABLED(WIFISUPPORT)
+  #define NUM_SERIAL 2
+  #define MYSERIAL1 webSocketSerial
+#else
+  #define NUM_SERIAL 1
+#endif

 #define CRITICAL_SECTION_START portENTER_CRITICAL(&spinlock)
 #define CRITICAL_SECTION_END   portEXIT_CRITICAL(&spinlock)
--- a/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp
+++ b/Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp
@ -26,8 +26,10 @@
 #if ENABLED(WIFISUPPORT)

 #include "WebSocketSerial.h"
-#include "wifi.h"

+extern WebSocketSerial webSocketSerial;
+
+#include "wifi.h"
 #include <AsyncTCP.h>
 #include <ESPAsyncWebServer.h>