thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix (re-)defines in HAL_ESP32 (#13780)

Browse Source
This commit is contained in:
felixstorm
2019-04-22 00:14:38 +02:00
committed by Scott Lahteine
parent 44216749c6
commit 4a48b70c0b
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/src/HAL/HAL_ESP32/i2s.cpp
View File

@@ -21,7 +21,12 @@
*/
#ifdef ARDUINO_ARCH_ESP32
#include <Arduino.h> // replace that with the proper imports
// replace that with the proper imports, then cleanup workarounds in Marlin\src\HAL\HAL_ESP32\HAL.h
#include <Arduino.h>
// revert back to the correct definition
#undef DISABLED
#define DISABLED(V...) DO(DIS,&&,V)
#include "i2s.h"
#include "../../core/macros.h"
#include "driver/periph_ctrl.h"