Use Arduino.h include wrapper (#13877)
This commit is contained in:
@ -30,19 +30,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
// these are going to be re-defined in Arduino.h
|
||||
#undef DISABLED
|
||||
#undef M_PI
|
||||
#undef _BV
|
||||
|
||||
#include <Arduino.h>
|
||||
|
||||
// revert back to the correct (old) definition
|
||||
#undef DISABLED
|
||||
#define DISABLED(V...) DO(DIS,&&,V)
|
||||
// re-define in case Arduino.h has been skipped due to earlier inclusion (i.e. in Marlin\src\HAL\HAL_ESP32\i2s.cpp)
|
||||
#define _BV(b) (1UL << (b))
|
||||
|
||||
#include "../shared/Marduino.h"
|
||||
#include "../shared/math_32bit.h"
|
||||
#include "../shared/HAL_SPI.h"
|
||||
|
||||
|
@ -21,13 +21,9 @@
|
||||
*/
|
||||
#ifdef ARDUINO_ARCH_ESP32
|
||||
|
||||
// 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 "../shared/Marduino.h"
|
||||
#include "../../core/macros.h"
|
||||
#include "driver/periph_ctrl.h"
|
||||
#include "rom/lldesc.h"
|
||||
|
@ -21,6 +21,8 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
// current value of the outputs provided over i2s
|
||||
extern uint32_t i2s_port_data;
|
||||
|
||||
|
Reference in New Issue
Block a user