djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3872 from dhalbert/frequencyin-fix-6.0.x-to-6.0.x

Browse Source 
Backport #3867 (FrequencyIn fix) to 6.0.x
This commit is contained in:
Dan Halbert 2020-12-23 17:49:18 -05:00 committed by GitHub
commit eda1f811a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
View File

@ -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) {