bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

ESP3d integration for ESP32 (#16515)

Browse Source
This commit is contained in:
Luc
2020-01-11 00:15:05 +01:00
committed by Scott Lahteine
parent e9a97127f7
commit d854c8fa5f
145 changed files with 1189 additions and 768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/src/HAL/HAL_ESP32/HAL.h
View File

@ -36,7 +36,14 @@
#include "timers.h"
#include "WebSocketSerial.h"
#if ENABLED(WIFISUPPORT)
#include "WebSocketSerial.h"
#endif
#if ENABLED(ESP3D_WIFISUPPORT)
#include "esp3dlib.h"
#endif
#include "FlushableHardwareSerial.h"
// ------------------------
@ -47,8 +54,12 @@ extern portMUX_TYPE spinlock;
#define MYSERIAL0 flushableSerial
#if ENABLED(WIFISUPPORT)
#define MYSERIAL1 webSocketSerial
#if EITHER(WIFISUPPORT, ESP3D_WIFISUPPORT)
#if ENABLED(ESP3D_WIFISUPPORT)
#define MYSERIAL1 Serial2Socket
#else
#define MYSERIAL1 webSocketSerial
#endif
#define NUM_SERIAL 2
#else
#define NUM_SERIAL 1
@ -60,7 +71,6 @@ extern portMUX_TYPE spinlock;
#define ENABLE_ISRS() if (spinlock.owner != portMUX_FREE_VAL) portEXIT_CRITICAL(&spinlock)
#define DISABLE_ISRS() portENTER_CRITICAL(&spinlock)
// Fix bug in pgm_read_ptr
#undef pgm_read_ptr
#define pgm_read_ptr(addr) (*(addr))