From 80c1be919f46aa02205d4fad2d48d571566925e6 Mon Sep 17 00:00:00 2001 From: Simon Jouet Date: Sun, 7 Feb 2021 22:56:39 +0000 Subject: [PATCH] Fix ESP32 I2S init placement (#21019) --- Marlin/src/HAL/ESP32/HAL.cpp | 6 ++++-- Marlin/src/HAL/ESP32/HAL.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Marlin/src/HAL/ESP32/HAL.cpp b/Marlin/src/HAL/ESP32/HAL.cpp index 6ff1446b1c..fb5f531b22 100644 --- a/Marlin/src/HAL/ESP32/HAL.cpp +++ b/Marlin/src/HAL/ESP32/HAL.cpp @@ -90,8 +90,6 @@ volatile int numPWMUsed = 0, #endif -void HAL_init() { TERN_(I2S_STEPPER_STREAM, i2s_init()); } - void HAL_init_board() { #if ENABLED(ESP3D_WIFISUPPORT) @@ -126,6 +124,10 @@ void HAL_init_board() { #endif #endif + // Initialize the i2s peripheral only if the I2S stepper stream is enabled. + // The following initialization is performed after Serial1 and Serial2 are defined as + // their native pins might conflict with the i2s stream even when they are remapped. + TERN_(I2S_STEPPER_STREAM, i2s_init()); } void HAL_idletask() { diff --git a/Marlin/src/HAL/ESP32/HAL.h b/Marlin/src/HAL/ESP32/HAL.h index 3dc27c6493..4d1db571d0 100644 --- a/Marlin/src/HAL/ESP32/HAL.h +++ b/Marlin/src/HAL/ESP32/HAL.h @@ -139,7 +139,7 @@ void HAL_adc_start_conversion(const uint8_t adc_pin); #define HAL_IDLETASK 1 #define BOARD_INIT() HAL_init_board(); void HAL_idletask(); -void HAL_init(); +inline void HAL_init() {} void HAL_init_board(); //