ESP32: i2s_init requires I2S_STEPPER_STREAM

4 years ago · 1f7c085527
4 changed files with 7 additions and 11 deletions
--- a/Marlin/src/HAL/ESP32/HAL.cpp
+++ b/Marlin/src/HAL/ESP32/HAL.cpp
@ -86,7 +86,7 @@ volatile int numPWMUsed = 0,

 #endif

-void HAL_init() { i2s_init(); }
+void HAL_init() { TERN_(I2S_STEPPER_STREAM, i2s_init()); }

 void HAL_init_board() {

--- a/Marlin/src/pins/esp32/pins_MRR_ESPA.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPA.h
@ -42,12 +42,10 @@
 //
 // Disable I2S stepper stream
 //
-#ifdef I2S_STEPPER_STREAM
 #undef I2S_STEPPER_STREAM
-#endif
-#define I2S_WS                                -1
-#define I2S_BCK                               -1
-#define I2S_DATA                              -1
+#undef I2S_WS
+#undef I2S_BCK
+#undef I2S_DATA

 //
 // Limit Switches
--- a/Marlin/src/pins/esp32/pins_MRR_ESPE.h
+++ b/Marlin/src/pins/esp32/pins_MRR_ESPE.h
@ -52,12 +52,10 @@
 //
 #undef I2S_STEPPER_STREAM
 #define I2S_STEPPER_STREAM
-
-#undef LIN_ADVANCE                                // Currently, I2S stream does not work with linear advance
-
 #define I2S_WS                                26
 #define I2S_BCK                               25
 #define I2S_DATA                              27
+#undef LIN_ADVANCE                                // Currently, I2S stream does not work with linear advance

 //
 // Steppers