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 potential I2S buffer overwrite #25113

Merged
merged 4 commits into from
Jan 17, 2023
Merged

Fix potential I2S buffer overwrite #25113

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5acd17
Fix potential I2S buffer overwrite
HoverClub Dec 19, 2022
5286615
ws
thinkyhead Dec 31, 2022
8cd5901
Merge branch 'MarlinFirmware:bugfix-2.1.x' into bugfix-2.1.x
HoverClub Dec 31, 2022
64bc142
Merge branch 'bugfix-2.1.x' into pr/25113
thinkyhead Jan 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 15 additions & 17 deletions Marlin/src/HAL/ESP32/i2s.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,30 +149,28 @@ void stepperTask(void *parameter) {
dma.rw_pos = 0;

while (dma.rw_pos < DMA_SAMPLE_COUNT) {
// Fill with the port data post pulse_phase until the next step
if (nextMainISR && TERN1(LIN_ADVANCE, nextAdvanceISR))
i2s_push_sample();

// i2s_push_sample() is also called from Stepper::pulse_phase_isr() and Stepper::advance_isr()
// in a rare case where both are called, we need to double decrement the counters
const uint8_t push_count = 1 + (!nextMainISR && TERN0(LIN_ADVANCE, !nextAdvanceISR));

if (!nextMainISR) {
Stepper::pulse_phase_isr();
nextMainISR = Stepper::block_phase_isr();
}
#if ENABLED(LIN_ADVANCE)
if (!nextAdvanceISR) {
else if (!nextAdvanceISR) {
Stepper::advance_isr();
nextAdvanceISR = Stepper::la_interval;
}
else if (nextAdvanceISR == Stepper::LA_ADV_NEVER)
nextAdvanceISR = Stepper::la_interval;
#endif
else
i2s_push_sample();

if (!nextMainISR) {
Stepper::pulse_phase_isr();
nextMainISR = Stepper::block_phase_isr();
}
nextMainISR--;

nextMainISR -= push_count;
TERN_(LIN_ADVANCE, nextAdvanceISR -= push_count);
#if ENABLED(LIN_ADVANCE)
if (nextAdvanceISR == Stepper::LA_ADV_NEVER)
nextAdvanceISR = Stepper::la_interval;

if (nextAdvanceISR && nextAdvanceISR != Stepper::LA_ADV_NEVER)
nextAdvanceISR--;
#endif
}
}
}
Expand Down