Merge branch 'master' into ep0_direct

# Conflicts:
#	hw/bsp/same7x/boards/same70_qmtech/board.cmake
#	hw/bsp/same7x/boards/same70_xplained/board.cmake
#	hw/bsp/same7x/family.cmake

1 files changed, 2 insertions, 2 deletions

diff --git a/examples/device/audio_test_multi_rate/src/main.c b/examples/device/audio_test_multi_rate/src/main.c
index baeec870f..952176997 100644
--- a/examples/device/audio_test_multi_rate/src/main.c
+++ b/examples/device/audio_test_multi_rate/src/main.c
@@ -146,7 +146,7 @@ void tud_resume_cb(void) {
 // In a real application, this would be replaced with actual I2S receive callback.
 void audio_task(void) {
   static uint32_t start_ms = 0;
-  uint32_t curr_ms = board_millis();
+  uint32_t curr_ms = tusb_time_millis_api();
   if (start_ms == curr_ms) {
     return; // not enough time
   }
@@ -614,7 +614,7 @@ void led_blinking_task(void) {
   static bool led_state = false;
 
   // Blink every interval ms
-  if (board_millis() - start_ms < blink_interval_ms) {
+  if (tusb_time_millis_api() - start_ms < blink_interval_ms) {
     return; // not enough time
   }
   start_ms += blink_interval_ms;