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

Fixups for ESP32

Browse source
This commit is contained in:
Scott Lahteine 2019-03-13 05:25:54 -05:00
parent a5ea3e2f15
commit 4555ae448f
3 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Marlin/src/HAL/HAL_ESP32/HAL.h
View file

@ -55,9 +55,14 @@
extern portMUX_TYPE spinlock; extern portMUX_TYPE spinlock;
#define NUM_SERIAL 2
#define MYSERIAL0 Serial #define MYSERIAL0 Serial
#if ENABLED(WIFISUPPORT)
#define NUM_SERIAL 2
#define MYSERIAL1 webSocketSerial #define MYSERIAL1 webSocketSerial
#else
#define NUM_SERIAL 1
#endif
#define CRITICAL_SECTION_START portENTER_CRITICAL(&spinlock) #define CRITICAL_SECTION_START portENTER_CRITICAL(&spinlock)
#define CRITICAL_SECTION_END portEXIT_CRITICAL(&spinlock) #define CRITICAL_SECTION_END portEXIT_CRITICAL(&spinlock)

4
Marlin/src/HAL/HAL_ESP32/WebSocketSerial.cpp
View file

@ -26,8 +26,10 @@
#if ENABLED(WIFISUPPORT) #if ENABLED(WIFISUPPORT)
#include "WebSocketSerial.h" #include "WebSocketSerial.h"
#include "wifi.h"
extern WebSocketSerial webSocketSerial;
#include "wifi.h"
#include <AsyncTCP.h> #include <AsyncTCP.h>
#include <ESPAsyncWebServer.h> #include <ESPAsyncWebServer.h>

4
Marlin/src/pins/pins_ESP32.h
View file

@ -24,6 +24,10 @@
* Espressif ESP32 (Tensilica Xtensa LX6) pin assignments * Espressif ESP32 (Tensilica Xtensa LX6) pin assignments
*/ */
#ifndef ARDUINO_ARCH_ESP32
"Oops! Select an ESP32 board in 'Tools > Board.'"
#endif
#define BOARD_NAME "Espressif ESP32" #define BOARD_NAME "Espressif ESP32"
// //