Merge branch 'fix/fix_uac_device_mic' into 'master'

fix(uac_device): update mic descriptor

Closes AEGHB-1146

See merge request ae_group/esp-iot-solution!1333

Author: YanKE01

components/usb/usb_device_uac/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ChangeLog
 
+## v1.2.1 (2025-8-4)
+
+* Fix build issue and audio path for MIC-only configuration.
+
 ## v1.2.0 (2025-3-31)
 
 * Supports integration into other TinyUSB projects.

components/usb/usb_device_uac/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.2.0"
+version: "1.2.1"
 targets:
   - esp32s2
   - esp32s3

components/usb/usb_device_uac/test_apps/sdkconfig.defaults

@@ -0,0 +1,3 @@
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_FREERTOS_HZ=1000
+CONFIG_ESP_TASK_WDT_EN=n

components/usb/usb_device_uac/tusb_uac/uac_descriptors.h

@@ -47,6 +47,8 @@ enum {
 
 // Unit numbers are arbitrary selected
 #define UAC2_ENTITY_CLOCK                0x04
+
+#if SPEAK_CHANNEL_NUM && MIC_CHANNEL_NUM
 // Speaker path
 #define UAC2_ENTITY_SPK_INPUT_TERMINAL   0x01
 #define UAC2_ENTITY_SPK_FEATURE_UNIT     0x02
@@ -55,11 +57,23 @@ enum {
 #define UAC2_ENTITY_MIC_INPUT_TERMINAL   0x11
 #define UAC2_ENTITY_MIC_FEATURE_TERMINAL 0x12
 #define UAC2_ENTITY_MIC_OUTPUT_TERMINAL  0x13
+#else
+// Speaker path
+#define UAC2_ENTITY_SPK_INPUT_TERMINAL   0x01
+#define UAC2_ENTITY_SPK_FEATURE_UNIT     0x02
+#define UAC2_ENTITY_SPK_OUTPUT_TERMINAL  0x03
+// Microphone path
+#define UAC2_ENTITY_MIC_INPUT_TERMINAL   0x01
+#define UAC2_ENTITY_MIC_FEATURE_TERMINAL 0x02
+#define UAC2_ENTITY_MIC_OUTPUT_TERMINAL  0x03
+#endif
 
 #if SPEAK_CHANNEL_NUM && MIC_CHANNEL_NUM
 #define NUM_INTERFACES 3
 #elif SPEAK_CHANNEL_NUM || MIC_CHANNEL_NUM
 #define NUM_INTERFACES 2
+#else
+#error "SPEAK_CHANNEL_NUM and MIC_CHANNEL_NUM cannot both be 0"
 #endif
 
 #if SPEAK_CHANNEL_NUM && MIC_CHANNEL_NUM

components/usb/usb_device_uac/usb_device_uac.c

@@ -509,8 +509,12 @@ esp_err_t uac_device_init(uac_device_config_t *config)
     s_uac_device->spk_itf_num = config->spk_itf_num;
     s_uac_device->mic_itf_num = config->mic_itf_num;
 #else
+#if SPEAK_CHANNEL_NUM
     s_uac_device->spk_itf_num = ITF_NUM_AUDIO_STREAMING_SPK;
+#endif
+#if MIC_CHANNEL_NUM
     s_uac_device->mic_itf_num = ITF_NUM_AUDIO_STREAMING_MIC;
+#endif
 #endif
 
     BaseType_t ret_val;