Skip to content

Commit eda2461

Browse files
committed
Merge branch 'feature/esp32s3' into 'master'
esp32s3: Add support for the new platform ESP32-S3 See merge request app-frameworks/esp-rainmaker!262
2 parents 33e7b0e + cee95aa commit eda2461

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed

.gitlab-ci.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,24 @@ before_script:
4646
- echo Building switch app - Started
4747
- ls
4848
- cd $CI_PROJECT_DIR/examples/switch
49-
- echo Running idf.py
49+
- echo Building for esp32
5050
- idf.py build
51+
- idf.py set-target esp32
5152
- echo Running make
5253
- rm -rf build/ sdkconfig
54+
- echo Building for esp32s2
55+
- idf.py set-target esp32s2
56+
- idf.py build
57+
- rm -rf build/ sdkconfig
58+
- echo Building for esp32c3
59+
- idf.py set-target esp32c3
60+
- idf.py build
61+
- rm -rf build/ sdkconfig
62+
- echo Building for esp32s3
63+
- idf.py set-target esp32s3
64+
- idf.py build
65+
- rm -rf build/ sdkconfig
66+
- echo Running make
5367
- make defconfig
5468
- make $MAKEFLAGS
5569
- echo Building switch app - Done

components/ws2812_led/Kconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ menu "WS2812 RGB LED"
22

33
config WS2812_LED_ENABLE
44
bool "Enable RGB LED"
5-
default y if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3
6-
default n
5+
default n if IDF_TARGET_ESP32
6+
default y
77
help
88
Disable the WS2812 RGB LED.
99

1010
config WS2812_LED_GPIO
1111
int "WS2812 LED GPIO"
1212
default 8 if IDF_TARGET_ESP32C3
13+
default 48 if IDF_TARGET_ESP32S3
1314
default 18
1415
depends on WS2812_LED_ENABLE
1516
help

examples/common/app_wifi/Kconfig.projbuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ menu "ESP RainMaker App Wi-Fi Provisioning"
1717
config APP_WIFI_PROV_TRANSPORT_BLE
1818
bool "BLE"
1919
select BT_ENABLED
20-
depends on IDF_TARGET_ESP32 || IDF_TARGET_ESP32C3
20+
depends on !IDF_TARGET_ESP32S2
2121
endchoice
2222

2323
config APP_WIFI_PROV_TRANSPORT

0 commit comments

Comments
 (0)