Merge pull request adafruit#916 from dhalbert/pdmin_hack_fix

tannewt · web-flow · commit 4e4d795da546 · 2018-06-08T14:03:53.000-07:00
Check for PDMIn DMA getting stuck.
diff --git a/ports/atmel-samd/common-hal/audiobusio/PDMIn.c b/ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -392,7 +392,18 @@ uint32_t common_hal_audiobusio_pdmin_record_to_buffer(audiobusio_pdmin_obj_t* se
             break;
         }
         // Wait for the next buffer to fill
+        uint32_t wait_counts = 0;
+        #ifdef SAMD21
+          #define MAX_WAIT_COUNTS 1000
+        #endif
+        #ifdef SAMD51
+          #define MAX_WAIT_COUNTS 6000
+        #endif
         while (!event_interrupt_active(event_channel)) {
+            if (wait_counts++ > MAX_WAIT_COUNTS) {
+                // Buffer has stopped filling; DMA may have missed an I2S trigger event.
+                break;
+            }
             #ifdef MICROPY_VM_HOOK_LOOP
                 MICROPY_VM_HOOK_LOOP
             #endif
