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

tannewt · web-flow · commit eb65765d521f · 2020-12-23T12:14:16.000-08:00
FrequencyIn: do not raise in interrupt handler
diff --git 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) {

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,8 @@ void frequencyin_emergency_cancel_capture(uint8_t index) {`
`82`	`82`	`#ifdef SAM_D5X_E5X`
`83`	`83`	`NVIC_EnableIRQ(EIC_0_IRQn + self->channel);`
`84`	`84`	`#endif`
`85`		`- mp_raise_RuntimeError(translate("Frequency captured is above capability. Capture Paused."));`
	`85`	`+ // Frequency captured is above capability. Capture paused.`
	`86`	`+ // We can't raise an error here; we're in an interrupt handler.`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`void frequencyin_interrupt_handler(uint8_t index) {`