Bläddra i källkod

ESP32: i2s_init requires I2S_STEPPER_STREAM

Scott Lahteine 3 år sedan
förälder
incheckning
1f7c085527

+ 1
- 1
Marlin/src/HAL/ESP32/HAL.cpp Visa fil

@@ -86,7 +86,7 @@ volatile int numPWMUsed = 0,
86 86
 
87 87
 #endif
88 88
 
89
-void HAL_init() { i2s_init(); }
89
+void HAL_init() { TERN_(I2S_STEPPER_STREAM, i2s_init()); }
90 90
 
91 91
 void HAL_init_board() {
92 92
 

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

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

+ 4
- 6
Marlin/src/pins/esp32/pins_MRR_ESPA.h Visa fil

@@ -42,12 +42,10 @@
42 42
 //
43 43
 // Disable I2S stepper stream
44 44
 //
45
-#ifdef I2S_STEPPER_STREAM
46
-  #undef I2S_STEPPER_STREAM
47
-#endif
48
-#define I2S_WS                                -1
49
-#define I2S_BCK                               -1
50
-#define I2S_DATA                              -1
45
+#undef I2S_STEPPER_STREAM
46
+#undef I2S_WS
47
+#undef I2S_BCK
48
+#undef I2S_DATA
51 49
 
52 50
 //
53 51
 // Limit Switches

+ 1
- 3
Marlin/src/pins/esp32/pins_MRR_ESPE.h Visa fil

@@ -52,12 +52,10 @@
52 52
 //
53 53
 #undef I2S_STEPPER_STREAM
54 54
 #define I2S_STEPPER_STREAM
55
-
56
-#undef LIN_ADVANCE                                // Currently, I2S stream does not work with linear advance
57
-
58 55
 #define I2S_WS                                26
59 56
 #define I2S_BCK                               25
60 57
 #define I2S_DATA                              27
58
+#undef LIN_ADVANCE                                // Currently, I2S stream does not work with linear advance
61 59
 
62 60
 //
63 61
 // Steppers

Laddar…
Avbryt
Spara