Browse Source

ESP32: i2s_init requires I2S_STEPPER_STREAM

Scott Lahteine 4 years ago
parent
commit
1f7c085527

+ 1 - 1
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() {
 

+ 1 - 1
Marlin/src/gcode/feature/password/M510-M512.cpp

@@ -58,7 +58,7 @@ void GcodeSuite::M510() {
     if (password.is_set && parser.ulongval('P') != password.value) {
       SERIAL_ECHOLNPGM(STR_WRONG_PASSWORD);
       return;
-     }
+    }
 
     if (parser.seenval('S')) {
       password.value_entry = parser.ulongval('S');

+ 4 - 6
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_STEPPER_STREAM
+#undef I2S_WS
+#undef I2S_BCK
+#undef I2S_DATA
 
 //
 // Limit Switches

+ 1 - 3
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