Merge remote-tracking branch 'tinyusb/master' into fix-stm32-usbc

5 files changed, 61 insertions, 2 deletions

diff --git a/examples/device/audio_test_freertos/CMakeLists.txt b/examples/device/audio_test_freertos/CMakeLists.txt
index 71d65eccc..a39e56822 100644
--- a/examples/device/audio_test_freertos/CMakeLists.txt
+++ b/examples/device/audio_test_freertos/CMakeLists.txt
@@ -2,6 +2,11 @@ cmake_minimum_required(VERSION 3.20)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../../hw/bsp/family_support.cmake)
 
+# Need to set Espressif defaults before project() is called
+if(FAMILY STREQUAL "espressif")
+  list(APPEND SDKCONFIG_DEFAULTS "${CMAKE_CURRENT_LIST_DIR}/sdkconfig.defaults")
+endif()
+
 project(audio_test_freertos C CXX ASM)
 
 # Checks this example is valid for the family and initializes the project
diff --git a/examples/device/audio_test_freertos/sdkconfig.defaults b/examples/device/audio_test_freertos/sdkconfig.defaults
index 83871619e..6e7a1cf52 100644
--- a/examples/device/audio_test_freertos/sdkconfig.defaults
+++ b/examples/device/audio_test_freertos/sdkconfig.defaults
@@ -1,3 +1,6 @@
 CONFIG_IDF_CMAKE=y
+# 1000 Hz tick: the UAC iso IN endpoint must be serviced every 1 ms frame;
+# ESP-IDF's default 100 Hz starves the audio task -> host capture fails (arecord EIO).
+CONFIG_FREERTOS_HZ=1000
 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
diff --git a/examples/device/audio_test_freertos/skip.txt b/examples/device/audio_test_freertos/skip.txt
index 386a0cdfb..660bacd25 100644
--- a/examples/device/audio_test_freertos/skip.txt
+++ b/examples/device/audio_test_freertos/skip.txt
@@ -2,6 +2,7 @@ mcu:CH32F20X
 mcu:CH32V103
 mcu:CH32V20X
 mcu:CH32V307
+mcu:CH583
 mcu:CXD56
 mcu:F1C100S
 mcu:GD32VF103
diff --git a/examples/device/audio_test_freertos/src/plot_audio_samples.py b/examples/device/audio_test_freertos/src/plot_audio_samples.py
index b6d8e824b..b6a916be4 100755
--- a/examples/device/audio_test_freertos/src/plot_audio_samples.py
+++ b/examples/device/audio_test_freertos/src/plot_audio_samples.py
@@ -4,6 +4,52 @@ import matplotlib.pyplot as plt
 import numpy as np
 import platform
 
+
+def find_windows_input_device(name_hint, channels, preferred_apis=None):
+    """Pick a Windows input device index from query_devices() output."""
+    preferred_apis = preferred_apis or []
+    name_hint = name_hint.lower()
+    candidates = []
+
+    for index in range(len(sd.query_devices())):
+        device_info = sd.query_devices(index)
+        max_input_channels = int(device_info.get('max_input_channels', 0))
+
+        if max_input_channels < channels:
+            continue
+
+        device_name = str(device_info.get('name', '')).lower()
+        if name_hint not in device_name:
+            continue
+
+        score = 0
+
+        # Prefer exact channel matches (for example 1ch source over a 4ch source).
+        if max_input_channels == channels:
+            score += 100
+        else:
+            score += 10
+
+        hostapi_index = int(device_info.get('hostapi', -1))
+        api_name = ''
+        if hostapi_index >= 0:
+            hostapi_info = sd.query_hostapis(hostapi_index)
+            api_name = str(hostapi_info.get('name', '')).lower()
+
+        for priority, api_hint in enumerate(preferred_apis):
+            if api_hint in api_name:
+                score += 50 - priority
+                break
+
+        candidates.append((score, index))
+
+    if not candidates:
+        raise ValueError(
+            'No input device matching hint="{}" with at least {} channels'.format(name_hint, channels)
+        )
+
+    return max(candidates, key=lambda item: item[0])[1]
+
 if __name__ == '__main__':
 
     # If you got "ValueError: No input device matching", that is because your PC name example device
@@ -14,8 +60,8 @@ if __name__ == '__main__':
     duration = 3    # Duration of recording
 
     if platform.system() == 'Windows':
-        # MME is needed since there are more than one MicNode device APIs (at least in Windows)
-        device = 'Microphone (MicNode), Windows WASAPI'
+        # Match by substring to support names like "Microphone (2- MicNode)".
+        device = find_windows_input_device('micnode', channels=1, preferred_apis=['wasapi', 'mme', 'wdm-ks'])
     elif platform.system() == 'Darwin':
         device = 'MicNode'
     else:
diff --git a/examples/device/audio_test_freertos/src/usb_descriptors.c b/examples/device/audio_test_freertos/src/usb_descriptors.c
index ad161939e..37ebf84d3 100644
--- a/examples/device/audio_test_freertos/src/usb_descriptors.c
+++ b/examples/device/audio_test_freertos/src/usb_descriptors.c
@@ -91,6 +91,10 @@ enum
   // nRF5x ISO can only be endpoint 8
   #define EPNUM_AUDIO   0x08
 
+#elif TU_CHECK_MCU(OPT_MCU_MAX32650, OPT_MCU_MAX32666, OPT_MCU_MAX32690, OPT_MCU_MAX78002)
+  // Put audio iso on EP>=8 so the 2048/4096-byte FIFOs can back double packet buffering
+  #define EPNUM_AUDIO   0x0A
+
 #else
   #define EPNUM_AUDIO   0x01
 #endif