Merge branch 'feat/component_upgrade_for_release2' into 'master'

feat: release official version of some components Closes AEG-1685 See merge request ae_group/esp-iot-solution!1066
espressif · Oct 28, 2024 · a4fdf46 · a4fdf46
2 parents e567cbb + 4c185ba
commit a4fdf46
Show file tree

Hide file tree

Showing 59 changed files with 8,687 additions and 8,107 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,7 @@ examples/**/build
 
 # Example online download files
 examples/usb/device/usb_dual_uvc_device/**/*.avi
+components/avi_player/test_apps/**/*.avi
 
 # Doc build artifacts
 docs/**/_build/

diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
@@ -820,6 +820,21 @@ build_example_utilities_xz_decompress_file:
   variables:
     EXAMPLE_DIR: examples/utilities/xz_decompress_file
 
+build_components_audio_pwm_audio_test_apps:
+  extends:
+    - .build_examples_template
+    - .rules:build:component_audio_pwm_audio_test_apps
+    - .build_idf_active_release_version
+  variables:
+    EXAMPLE_DIR: components/audio/pwm_audio/test_apps
+
+build_components_avi_player_test_apps:
+  extends:
+    - .build_examples_template
+    - .rules:build:components_avi_player_test_apps
+    - .build_idf_active_release_version
+  variables:
+    EXAMPLE_DIR: components/avi_player/test_apps
 
 build_components_bluetooth_ble_hci_test_apps:
   extends:
@@ -1242,11 +1257,18 @@ build_components_usb_usb_device_uac:
     - .rules:build:components_usb_usb_device_uac
   parallel:
     matrix:
-      - IMAGE: espressif/idf:release-v4.4
       - IMAGE: espressif/idf:release-v5.0
   variables:
     EXAMPLE_DIR: components/usb/usb_device_uac
 
+build_components_usb_usb_device_uvc:
+  extends:
+    - .build_examples_template
+    - .rules:build:components_usb_usb_device_uvc
+    - .build_idf_active_release_version
+  variables:
+    EXAMPLE_DIR: components/usb/usb_device_uvc
+
 build_components_led_lightbulb_driver_test_apps:
   extends:
     - .build_examples_template

diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
@@ -315,6 +315,7 @@
 
   - "components/audio/dac_audio/include/dac_audio.h"
   - "components/audio/pwm_audio/include/pwm_audio.h"
+  - "components/avi_player/include/avi_player.h"
   - "components/bluetooth/ble_conn_mgr/include/esp_ble_conn_mgr.h"
   - "components/bluetooth/ble_conn_mgr/include/esp_ble_conn_mgr.h"
   - "components/bluetooth/ble_hci/include/ble_hci.h"
@@ -1428,7 +1429,7 @@
     - <<: *if-dev-push
       changes: *patterns-components_audio_dac_audio
 
-.rules:build:component_audio_pwm_audio_test:
+.rules:build:component_audio_pwm_audio_test_apps:
   rules:
     - <<: *if-protected
     - <<: *if-label-build
@@ -1439,6 +1440,17 @@
     - <<: *if-dev-push
       changes: *patterns-components_audio_pwm_audio
 
+.rules:build:components_avi_player_test_apps:
+  rules:
+    - <<: *if-protected
+    - <<: *if-label-build
+    - <<: *if-label-target_test
+    - <<: *if-trigger-job
+    - <<: *if-dev-push
+      changes: *patterns-build_system
+    - <<: *if-dev-push
+      changes: *patterns-components_avi_player
+
 .rules:build:components_bluetooth_ble_hci_test_apps:
   rules:
     - <<: *if-protected
@@ -2101,6 +2113,17 @@
     - <<: *if-dev-push
       changes: *patterns-components_usb_usb_device_uac
 
+.rules:build:components_usb_usb_device_uvc:
+  rules:
+    - <<: *if-protected
+    - <<: *if-label-build
+    - <<: *if-label-target_test
+    - <<: *if-trigger-job
+    - <<: *if-dev-push
+      changes: *patterns-build_system
+    - <<: *if-dev-push
+      changes: *patterns-components_usb_usb_device_uvc
+
 .rules:build:components_sensors_humiture_aht20_test_apps:
   rules:
     - <<: *if-protected

diff --git a/components/.build-rules.yml b/components/.build-rules.yml
@@ -1,3 +1,11 @@
+components/audio/pwm_audio/test_apps:
+  enable:
+    - if: INCLUDE_DEFAULT == 1
+
+components/avi_player/test_apps:
+  enable:
+    - if: IDF_TARGET in ["esp32s3", "esp32p4"]
+
 components/touch/touch_proximity_sensor/test_apps:
   enable:
     - if: IDF_TARGET in ["esp32s3"]
@@ -146,6 +154,10 @@ components/usb/usb_device_uac/test_apps:
   enable:
     - if: SOC_USB_OTG_SUPPORTED == 1 and IDF_VERSION_MAJOR >= 5
 
+components/usb/usb_device_uvc/test_apps:
+  enable:
+    - if: SOC_USB_OTG_SUPPORTED == 1 and IDF_VERSION_MAJOR >= 5
+
 components/sensors/power_monitor/ina236/test_apps:
   enable:
     - if:  INCLUDE_DEFAULT == 1

diff --git a/components/audio/pwm_audio/CHANGELOG.md b/components/audio/pwm_audio/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v1.1.2 - 2024-08-15
+
+### Enhancements:
+
+* Add test-apps.
+
 ## v1.1.1 - 2023-03-20
 
 ### Bug Fixes:

diff --git a/components/audio/pwm_audio/idf_component.yml b/components/audio/pwm_audio/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.1.1"
+version: "1.1.2"
 description: PWM audio output driver for ESP32 series Socs
 url: https://github.com/espressif/esp-iot-solution/tree/master/components/audio/pwm_audio
 repository: https://github.com/espressif/esp-iot-solution.git

diff --git a/components/audio/pwm_audio/pwm_audio.c b/components/audio/pwm_audio/pwm_audio.c
@@ -475,12 +475,28 @@ esp_err_t pwm_audio_init(const pwm_audio_config_t *cfg)
     /**
      * Get the address of LEDC register to reduce the addressing time
      */
-    g_ledc_left_duty_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].channel[handle->ledc_channel[CHANNEL_LEFT_INDEX].channel].duty.val;
-    g_ledc_left_conf0_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].channel[handle->ledc_channel[CHANNEL_LEFT_INDEX].channel].conf0.val;
-    g_ledc_left_conf1_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].channel[handle->ledc_channel[CHANNEL_LEFT_INDEX].channel].conf1.val;
-    g_ledc_right_duty_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].channel[handle->ledc_channel[CHANNEL_RIGHT_INDEX].channel].duty.val;
-    g_ledc_right_conf0_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].channel[handle->ledc_channel[CHANNEL_RIGHT_INDEX].channel].conf0.val;
-    g_ledc_right_conf1_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].channel[handle->ledc_channel[CHANNEL_RIGHT_INDEX].channel].conf1.val;
+#if defined (CONFIG_IDF_TARGET_ESP32P4) || defined (CONFIG_IDF_TARGET_ESP32C5) || defined (CONFIG_IDF_TARGET_ESP32C61)
+    g_ledc_left_duty_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].
+                           channel[handle->ledc_channel[CHANNEL_LEFT_INDEX].channel].duty_init.val;
+#else
+    g_ledc_left_duty_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].
+                           channel[handle->ledc_channel[CHANNEL_LEFT_INDEX].channel].duty.val;
+#endif
+    g_ledc_left_conf0_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].
+                            channel[handle->ledc_channel[CHANNEL_LEFT_INDEX].channel].conf0.val;
+    g_ledc_left_conf1_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].
+                            channel[handle->ledc_channel[CHANNEL_LEFT_INDEX].channel].conf1.val;
+#if defined (CONFIG_IDF_TARGET_ESP32P4) || defined (CONFIG_IDF_TARGET_ESP32C5) || defined (CONFIG_IDF_TARGET_ESP32C61)
+    g_ledc_right_duty_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].
+                            channel[handle->ledc_channel[CHANNEL_RIGHT_INDEX].channel].duty_init.val;
+#else
+    g_ledc_right_duty_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].
+                            channel[handle->ledc_channel[CHANNEL_RIGHT_INDEX].channel].duty.val;
+#endif
+    g_ledc_right_conf0_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].
+                             channel[handle->ledc_channel[CHANNEL_RIGHT_INDEX].channel].conf0.val;
+    g_ledc_right_conf1_val = &LEDC.channel_group[handle->ledc_timer.speed_mode].
+                             channel[handle->ledc_channel[CHANNEL_RIGHT_INDEX].channel].conf1.val;
 
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
     gptimer_config_t timer_config = {

diff --git a/components/audio/pwm_audio/test/CMakeLists.txt b/components/audio/pwm_audio/test/CMakeLists.txt