Skip to content

Commit a2ffd10

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents a9da3e7 + 40e383f commit a2ffd10

File tree

764 files changed

+45282
-5221
lines changed

Some content is hidden

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

764 files changed

+45282
-5221
lines changed

.github/workflows/upload_component.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
uses: espressif/upload-components-ci-action@v1
1717
with:
1818
directories: >
19+
components/audio/adc_mic;
1920
components/audio/pwm_audio;
2021
components/avi_player;
2122
components/bluetooth/ble_conn_mgr;
@@ -44,6 +45,7 @@ jobs:
4445
components/display/lcd/esp_lcd_st77916;
4546
components/display/lcd/esp_lcd_st77922;
4647
components/display/lcd/esp_lcd_usb_display;
48+
components/display/lcd_touch/esp_lcd_touch_ili2118;
4749
components/display/lcd_touch/esp_lcd_touch_spd2010;
4850
components/display/lcd_touch/esp_lcd_touch_st7123;
4951
components/display/tools/esp_lv_decoder;
@@ -54,6 +56,7 @@ jobs:
5456
components/extended_vfs;
5557
components/gprof;
5658
components/i2c_bus;
59+
components/iot_eth;
5760
components/ir/ir_learn;
5861
components/keyboard_button;
5962
components/knob;
@@ -81,15 +84,21 @@ jobs:
8184
components/sensors/radar/at581x;
8285
components/sensors/sensor_hub;
8386
components/spi_bus;
87+
components/storage/eeprom/at24c02;
88+
components/touch/touch_button;
89+
components/touch/touch_button_sensor;
8490
components/touch/touch_proximity_sensor;
91+
components/touch/touch_slider_sensor;
8592
components/usb/esp_msc_ota;
8693
components/usb/esp_tinyuf2;
8794
components/usb/iot_usbh;
8895
components/usb/iot_usbh_cdc;
8996
components/usb/iot_usbh_modem;
9097
components/usb/usb_device_uac;
9198
components/usb/usb_device_uvc;
99+
components/usb/iot_usbh_rndis;
92100
components/usb/usb_stream;
101+
components/utilities/adc_tp_calibration;
93102
components/utilities/xz;
94103
components/zero_detection;
95104
tools/cmake_utilities;

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ GPATH
1919
# eclipse setting
2020
.settings
2121

22+
# clangd cache directory files
23+
.cache
24+
2225
# MacOS directory files
2326
.DS_Store
2427

@@ -117,3 +120,6 @@ XUNIT_RESULT.xml
117120
#launchpad
118121
binaries/
119122
output.json
123+
124+
#components cache
125+
**/dist/

.gitlab-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ stages:
44
- target_test
55
- build_docs
66
- deploy
7+
- post_deploy
78

89
workflow:
910
rules:

0 commit comments

Comments
 (0)