Skip to content

Commit f97e3c8

Browse files
authored
Merge branch 'espressif:master' into master
2 parents 57caca2 + 6f25eba commit f97e3c8

File tree

200 files changed

+13015
-347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+13015
-347
lines changed

.github/workflows/upload_component.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ jobs:
5656
components/extended_vfs;
5757
components/gprof;
5858
components/i2c_bus;
59+
components/iot_eth;
5960
components/ir/ir_learn;
6061
components/keyboard_button;
6162
components/knob;
@@ -67,6 +68,7 @@ jobs:
6768
components/motor/servo;
6869
components/openai;
6970
components/sensors/adc/mcp3201;
71+
components/sensors/battery_fuel_gauge/adc_battery_estimation;
7072
components/sensors/battery_fuel_gauge/max17048;
7173
components/sensors/power_measure;
7274
components/sensors/gesture/apds9960;
@@ -87,13 +89,16 @@ jobs:
8789
components/touch/touch_button;
8890
components/touch/touch_button_sensor;
8991
components/touch/touch_proximity_sensor;
92+
components/touch/touch_slider_sensor;
9093
components/usb/esp_msc_ota;
9194
components/usb/esp_tinyuf2;
9295
components/usb/iot_usbh;
9396
components/usb/iot_usbh_cdc;
9497
components/usb/iot_usbh_modem;
9598
components/usb/usb_device_uac;
9699
components/usb/usb_device_uvc;
100+
components/usb/iot_usbh_rndis;
101+
components/usb/iot_usbh_ecm;
97102
components/usb/usb_stream;
98103
components/utilities/adc_tp_calibration;
99104
components/utilities/xz;

.gitlab/ci/build.yml

Lines changed: 76 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ build_example_ai_esp_dl_human_activity_recognition:
6969
IMAGE: espressif/idf:release-v5.3
7070
EXAMPLE_DIR: examples/ai/esp_dl/human_activity_recognition
7171

72+
build_example_ai_esp_dl_touchpad_digit_recognition:
73+
extends:
74+
- .build_examples_template
75+
- .rules:build:example_ai_esp_dl_touchpad_digit_recognition
76+
variables:
77+
IMAGE: espressif/idf:release-v5.3
78+
EXAMPLE_DIR: examples/ai/esp_dl/touchpad_digit_recognition
79+
7280
build_example_audio_wav_player:
7381
extends:
7482
- .build_examples_template
@@ -736,6 +744,18 @@ build_example_touch_button_sensor:
736744
variables:
737745
EXAMPLE_DIR: examples/touch/touch_button_sensor
738746

747+
build_example_touch_slider_sensor:
748+
extends:
749+
- .build_examples_template
750+
- .rules:build:example_touch_touch_slider_sensor
751+
parallel:
752+
matrix:
753+
- IMAGE: espressif/idf:release-v4.4
754+
- IMAGE: espressif/idf:release-v5.1
755+
- IMAGE: espressif/idf:release-v5.4
756+
variables:
757+
EXAMPLE_DIR: examples/touch/touch_slider_sensor
758+
739759
build_example_touch_touch_proximity:
740760
extends:
741761
- .build_examples_template
@@ -946,6 +966,14 @@ build_example_usb_host_usb_hub_dual_camera:
946966
variables:
947967
EXAMPLE_DIR: examples/usb/host/usb_hub_dual_camera
948968

969+
build_example_usb_host_usb_ecm_4g_module:
970+
extends:
971+
- .build_examples_template
972+
- .rules:build:example_usb_host_usb_ecm_4g_module
973+
- .build_idf_version_greater_equal_v5_0
974+
variables:
975+
EXAMPLE_DIR: examples/usb/host/usb_ecm_4g_module
976+
949977
build_example_usb_host_usb_msc_ota:
950978
extends:
951979
- .build_examples_template
@@ -957,6 +985,14 @@ build_example_usb_host_usb_msc_ota:
957985
variables:
958986
EXAMPLE_DIR: examples/usb/host/usb_msc_ota
959987

988+
build_example_usb_host_usb_rndis_4g_module:
989+
extends:
990+
- .build_examples_template
991+
- .rules:build:example_usb_host_usb_rndis_4g_module
992+
- .build_idf_version_greater_equal_v5_0
993+
variables:
994+
EXAMPLE_DIR: examples/usb/host/usb_rndis_4g_module
995+
960996
build_example_usb_otg_usb_host_device_mode_manual_switch:
961997
extends:
962998
- .build_examples_template
@@ -1417,6 +1453,16 @@ build_components_sensors_adc_mcp3201_test_apps:
14171453
variables:
14181454
EXAMPLE_DIR: components/sensors/adc/mcp3201/test_apps
14191455

1456+
build_components_sensors_battery_fuel_gauge_adc_battery_estimation_test_apps:
1457+
extends:
1458+
- .build_examples_template
1459+
- .rules:build:components_sensors_battery_fuel_gauge_adc_battery_estimation_test_apps
1460+
parallel:
1461+
matrix:
1462+
- IMAGE: espressif/idf:release-v5.4
1463+
variables:
1464+
EXAMPLE_DIR: components/sensors/battery_fuel_gauge/adc_battery_estimation/test_apps
1465+
14201466
build_components_sensors_battery_fuel_gauge_max17048_test_apps:
14211467
extends:
14221468
- .build_examples_template
@@ -1567,6 +1613,16 @@ build_components_touch_touch_button_sensor_test_apps:
15671613
variables:
15681614
EXAMPLE_DIR: components/touch/touch_button_sensor/test_apps
15691615

1616+
build_components_touch_touch_slider_sensor_test_apps:
1617+
extends:
1618+
- .build_examples_template
1619+
- .rules:build:components_touch_touch_slider_sensor_test_apps
1620+
parallel:
1621+
matrix:
1622+
- IMAGE: espressif/idf:release-v5.3
1623+
variables:
1624+
EXAMPLE_DIR: components/touch/touch_slider_sensor/test_apps
1625+
15701626
build_components_usb_esp_msc_ota_test_apps:
15711627
extends:
15721628
- .build_examples_template
@@ -1575,15 +1631,22 @@ build_components_usb_esp_msc_ota_test_apps:
15751631
IMAGE: espressif/idf:release-v5.1
15761632
EXAMPLE_DIR: components/usb/esp_msc_ota/test_apps
15771633

1634+
build_components_usb_iot_usbh_rndis_test_apps:
1635+
extends:
1636+
- .build_examples_template
1637+
- .rules:build:components_usb_iot_usbh_rndis_test_apps
1638+
- .build_idf_version_greater_equal_v5_0
1639+
variables:
1640+
EXAMPLE_DIR: components/usb/iot_usbh_rndis/test_apps
1641+
15781642
build_components_usb_usb_stream_test_apps:
15791643
extends:
15801644
- .build_examples_template
15811645
- .rules:build:components_usb_usb_stream_test
15821646
parallel:
15831647
matrix:
1584-
- IMAGE: espressif/idf:release-v4.4
15851648
- IMAGE: espressif/idf:release-v5.0
1586-
- IMAGE: espressif/idf:latest
1649+
- IMAGE: espressif/idf:release-v5.4
15871650
variables:
15881651
EXAMPLE_DIR: components/usb/usb_stream/test_apps
15891652

@@ -1609,6 +1672,17 @@ build_components_usb_iot_usbh_cdc_test_apps:
16091672
variables:
16101673
EXAMPLE_DIR: components/usb/iot_usbh_cdc/test_apps
16111674

1675+
build_components_usb_iot_usbh_modem_test_apps:
1676+
extends:
1677+
- .build_examples_template
1678+
- .rules:build:components_usb_iot_usbh_modem_test
1679+
parallel:
1680+
matrix:
1681+
- IMAGE: espressif/idf:release-v4.4
1682+
- IMAGE: espressif/idf:release-v5.3
1683+
variables:
1684+
EXAMPLE_DIR: components/usb/iot_usbh_modem/test_apps
1685+
16121686
build_components_usb_usb_device_uac:
16131687
extends:
16141688
- .build_examples_template

0 commit comments

Comments
 (0)