diff options
| author | Dan Halbert <halbert@adafruit.com> | 2020-12-23 17:49:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-23 17:49:18 -0500 |
| commit | eda1f811a1ac1813f06754815cb62cb6c6f15ca8 (patch) | |
| tree | 2b6d386989248a4efa582a3e5c200bb76daad83b /ports | |
| parent | baa053b8b2bf4be381fcd44df5e8a4d94efdb57d (diff) | |
| parent | eb03e4ba596c038eb91e9abead220396dfa6f310 (diff) | |
Merge pull request #3872 from dhalbert/frequencyin-fix-6.0.x-to-6.0.x6.0.1
Backport #3867 (FrequencyIn fix) to 6.0.x
Diffstat (limited to 'ports')
| -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) { |