Skip to content

[1.1.x] Simplify AVR preemptive interrupt handling#10501

Merged
thinkyhead merged 1 commit intoMarlinFirmware:bugfix-1.1.xfrom
thinkyhead:bf1_proper_avr_interrupts
Apr 24, 2018
Merged

[1.1.x] Simplify AVR preemptive interrupt handling#10501
thinkyhead merged 1 commit intoMarlinFirmware:bugfix-1.1.xfrom
thinkyhead:bf1_proper_avr_interrupts

Conversation

@thinkyhead
Copy link
Member

@thinkyhead thinkyhead commented Apr 23, 2018

Clean up preemptive interrupt emulation for AVR.

  • Remove check of in_temp_isr, intended to prevent a possible reentry.
  • Disable and re-enable the Temperature ISR from within the ISR function.

Based on #10496 by @ejtagle

@thinkyhead thinkyhead added PR: Improvement T: Development Makefiles, PlatformIO, Python scripts, etc. labels Apr 23, 2018
@thinkyhead thinkyhead force-pushed the bf1_proper_avr_interrupts branch from 7a4d8b3 to e94b518 Compare April 23, 2018 23:39
@thinkyhead thinkyhead changed the title [2.0.x] Simplify AVR preemptive interrupt handling [1.1.x] Simplify AVR preemptive interrupt handling Apr 23, 2018
@thinkyhead thinkyhead force-pushed the bf1_proper_avr_interrupts branch 3 times, most recently from 03ce270 to 8bd9ae8 Compare April 24, 2018 00:00
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
@thinkyhead thinkyhead force-pushed the bf1_proper_avr_interrupts branch from 8bd9ae8 to f2e4536 Compare April 24, 2018 00:03
@thinkyhead thinkyhead merged commit 51004e0 into MarlinFirmware:bugfix-1.1.x Apr 24, 2018
@thinkyhead thinkyhead deleted the bf1_proper_avr_interrupts branch April 24, 2018 01:47
@ejtagle
Copy link
Contributor

ejtagle commented Apr 24, 2018

@thinkyhead

#if DISABLED(LIN_ADVANCE)
  // Disable Timer0 ISRs and enable global ISR again to capture UART events (incoming chars)
  DISABLE_TEMPERATURE_INTERRUPT();
  DISABLE_STEPPER_DRIVER_INTERRUPT();
  sei();
#endif

Is not needed, as the isr prologue is already doing exactly this ;)

@thinkyhead
Copy link
Member Author

Darn it. Thought I got that one. Thanks!

thinkyhead added a commit that referenced this pull request Apr 24, 2018
thinkyhead added a commit that referenced this pull request Sep 22, 2018
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
thinkyhead added a commit that referenced this pull request Sep 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

PR: Improvement T: Development Makefiles, PlatformIO, Python scripts, etc.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants