diff options
| author | Scott Shawcroft <scott@adafruit.com> | 2020-12-23 12:14:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-23 12:14:16 -0800 |
| commit | eb65765d521f1f7015cead1c64b0670691bcf13b (patch) | |
| tree | 62d4eaf9904ccf2b3d8ff401321c5e1ae6fa5ae1 | |
| parent | 8b03951fee166b1eea06d114fc347982b7b186bf (diff) | |
| parent | 89079039adadac7c73fe03892ac2114dcc567429 (diff) | |
Merge pull request #3867 from dhalbert/frequencyin-fix-6.0.x
FrequencyIn: do not raise in interrupt handler
| -rw-r--r-- | ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c b/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c index 02d0482dc..f973db90b 100644 --- a/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c +++ b/ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c @@ -82,7 +82,8 @@ void frequencyin_emergency_cancel_capture(uint8_t index) { #ifdef SAM_D5X_E5X NVIC_EnableIRQ(EIC_0_IRQn + self->channel); #endif - mp_raise_RuntimeError(translate("Frequency captured is above capability. Capture Paused.")); + // Frequency captured is above capability. Capture paused. + // We can't raise an error here; we're in an interrupt handler. } void frequencyin_interrupt_handler(uint8_t index) { |