Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ESP32 I2S initialization order #21019

Merged
merged 2 commits into from
Feb 7, 2021
Merged

Fix ESP32 I2S initialization order #21019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4930483
Fix ESP32 I2S initialization order
Feb 7, 2021
dce2c07
Merge branch 'bugfix-2.0.x' into esp32-i2sconflict
thinkyhead Feb 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions Marlin/src/HAL/ESP32/HAL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/ESP32/HAL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

//
Expand Down