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

Fix ESP32 I2S init placement (#21019)

Browse source
This commit is contained in:
Simon Jouet 2021-02-07 22:56:39 +00:00 committed by GitHub
parent 5233e66762
commit af4e8b171c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -90,8 +90,6 @@ volatile int numPWMUsed = 0,
#endif #endif
void HAL_init() { TERN_(I2S_STEPPER_STREAM, i2s_init()); }
void HAL_init_board() { void HAL_init_board() {
#if ENABLED(ESP3D_WIFISUPPORT) #if ENABLED(ESP3D_WIFISUPPORT)
@ -126,6 +124,10 @@ void HAL_init_board() {
#endif #endif
#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() { void HAL_idletask() {

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

@ -139,7 +139,7 @@ void HAL_adc_start_conversion(const uint8_t adc_pin);
#define HAL_IDLETASK 1 #define HAL_IDLETASK 1
#define BOARD_INIT() HAL_init_board(); #define BOARD_INIT() HAL_init_board();
void HAL_idletask(); void HAL_idletask();
void HAL_init(); inline void HAL_init() {}
void HAL_init_board(); void HAL_init_board();
// //