zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

ESP32: i2s_init requires I2S_STEPPER_STREAM

Browse source
This commit is contained in:
Scott Lahteine 2020-10-20 22:36:22 -05:00
parent 35d75c354e
commit e32bdf6a93
4 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/HAL/ESP32/HAL.cpp
View file

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

2
Marlin/src/gcode/feature/password/M510-M512.cpp
View file

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

10
Marlin/src/pins/esp32/pins_MRR_ESPA.h
View file

@ -42,12 +42,10 @@
// //
// Disable I2S stepper stream // Disable I2S stepper stream
// //
#ifdef I2S_STEPPER_STREAM #undef I2S_STEPPER_STREAM
#undef I2S_STEPPER_STREAM #undef I2S_WS
#endif #undef I2S_BCK
#define I2S_WS -1 #undef I2S_DATA
#define I2S_BCK -1
#define I2S_DATA -1
// //
// Limit Switches // Limit Switches

4
Marlin/src/pins/esp32/pins_MRR_ESPE.h
View file

@ -52,12 +52,10 @@
// //
#undef I2S_STEPPER_STREAM #undef I2S_STEPPER_STREAM
#define 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_WS 26
#define I2S_BCK 25 #define I2S_BCK 25
#define I2S_DATA 27 #define I2S_DATA 27
#undef LIN_ADVANCE // Currently, I2S stream does not work with linear advance
// //
// Steppers // Steppers