Skip to content

Commit 028830b

Browse files
me-no-devme-no-dev
committed
Initial S3 Support
1 parent 5a8939e commit 028830b

9 files changed

+2218
-54
lines changed

‎.travis.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ source ./tools/install-esp-idf.sh
2121
if [ $? -ne 0 ]; then exit 1; fi
2222

2323
if [ -z $TARGETS ]; then
24-
TARGETS="esp32c3 esp32s2 esp32"
24+
TARGETS="esp32s3 esp32c3 esp32s2 esp32"
2525
fi
2626

2727
echo $(git -C $AR_COMPS/arduino describe --all --long) > version.txt

‎components/arduino_tinyusb/CMakeLists.txt

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,19 @@ if(CONFIG_TINYUSB_ENABLED)
44

55
### variables ###
66
#################
7-
set(compile_options
8-
"-DCFG_TUSB_MCU=OPT_MCU_ESP32S2"
9-
"-DCFG_TUSB_DEBUG=${CONFIG_TINYUSB_DEBUG_LEVEL}"
10-
"-Wno-type-limits" # needed for the vanila tinyusb with turned off classes
11-
)
7+
# if(IDF_TARGET STREQUAL "esp32s2")
8+
set(compile_options
9+
"-DCFG_TUSB_MCU=OPT_MCU_ESP32S2"
10+
"-DCFG_TUSB_DEBUG=${CONFIG_TINYUSB_DEBUG_LEVEL}"
11+
"-Wno-type-limits" # needed for the vanila tinyusb with turned off classes
12+
)
13+
# elseif(IDF_TARGET STREQUAL "esp32s3")
14+
# set(compile_options
15+
# "-DCFG_TUSB_MCU=OPT_MCU_ESP32S2"
16+
# "-DCFG_TUSB_DEBUG=${CONFIG_TINYUSB_DEBUG_LEVEL}"
17+
# "-Wno-type-limits" # needed for the vanila tinyusb with turned off classes
18+
# )
19+
# endif()
1220
idf_component_get_property(FREERTOS_ORIG_INCLUDE_PATH freertos
1321
ORIG_INCLUDE_PATH)
1422
set(includes_private

‎components/arduino_tinyusb/Kconfig.projbuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ menu "Arduino TinyUSB"
33
config TINYUSB_ENABLED
44
bool "Enable TinyUSB driver"
55
default y
6-
depends on IDF_TARGET_ESP32S2
6+
depends on IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
77
select FREERTOS_SUPPORT_STATIC_ALLOCATION
88
select FREERTOS_USE_AUTHENTIC_INCLUDE_PATHS
99
help

‎sdkconfig.esp32

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
8585
# CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set
8686
CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y
8787
CONFIG_ESPTOOLPY_FLASHMODE="dio"
88-
# CONFIG_ESPTOOLPY_FLASHFREQ_120M is not set
8988
# CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set
9089
CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
9190
# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
@@ -437,6 +436,13 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
437436
#
438437
# CONFIG_GPIO_ESP32_SUPPORT_SWITCH_SLP_PULL is not set
439438
# end of GPIO Configuration
439+
440+
#
441+
# GDMA Configuration
442+
#
443+
# CONFIG_GDMA_CTRL_FUNC_IN_IRAM is not set
444+
# CONFIG_GDMA_ISR_IRAM_SAFE is not set
445+
# end of GDMA Configuration
440446
# end of Driver configurations
441447

442448
#
@@ -817,6 +823,7 @@ CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
817823
# CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set
818824
# CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set
819825
# CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
826+
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
820827
# end of Wi-Fi
821828

822829
#
@@ -1028,6 +1035,7 @@ CONFIG_LWIP_GARP_TMR_INTERVAL=60
10281035
CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
10291036
# CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set
10301037
# CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set
1038+
CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID=y
10311039
CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y
10321040
CONFIG_LWIP_DHCP_OPTIONS_LEN=128
10331041

@@ -1116,6 +1124,7 @@ CONFIG_LWIP_MAX_RAW_PCBS=16
11161124
#
11171125
CONFIG_LWIP_SNTP_MAX_SERVERS=3
11181126
CONFIG_LWIP_DHCP_GET_NTP_SRV=y
1127+
CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
11191128
CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
11201129
# end of SNTP
11211130

@@ -1150,7 +1159,6 @@ CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
11501159
# CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set
11511160
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
11521161
# CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
1153-
# CONFIG_MBEDTLS_DYNAMIC_BUFFER is not set
11541162
# CONFIG_MBEDTLS_DEBUG is not set
11551163

11561164
#
@@ -1514,8 +1522,10 @@ CONFIG_OV5640_SUPPORT=y
15141522
CONFIG_GC2145_SUPPORT=y
15151523
CONFIG_GC032A_SUPPORT=y
15161524
CONFIG_GC0308_SUPPORT=y
1525+
CONFIG_BF3005_SUPPORT=y
15171526
# CONFIG_SCCB_HARDWARE_I2C_PORT0 is not set
15181527
CONFIG_SCCB_HARDWARE_I2C_PORT1=y
1528+
CONFIG_SCCB_CLK_FREQ=100000
15191529
# CONFIG_GC_SENSOR_WINDOWING_MODE is not set
15201530
CONFIG_GC_SENSOR_SUBSAMPLE_MODE=y
15211531
CONFIG_CAMERA_CORE0=y

‎sdkconfig.esp32c3

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
9595
# CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set
9696
CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y
9797
CONFIG_ESPTOOLPY_FLASHMODE="dio"
98-
# CONFIG_ESPTOOLPY_FLASHFREQ_120M is not set
9998
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
10099
# CONFIG_ESPTOOLPY_FLASHFREQ_40M is not set
101100
# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
@@ -566,6 +565,13 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
566565
#
567566
# CONFIG_UART_ISR_IN_IRAM is not set
568567
# end of UART configuration
568+
569+
#
570+
# GDMA Configuration
571+
#
572+
# CONFIG_GDMA_CTRL_FUNC_IN_IRAM is not set
573+
# CONFIG_GDMA_ISR_IRAM_SAFE is not set
574+
# end of GDMA Configuration
569575
# end of Driver configurations
570576

571577
#
@@ -787,6 +793,8 @@ CONFIG_ESP_CONSOLE_UART_DEFAULT=y
787793
# CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG is not set
788794
# CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
789795
# CONFIG_ESP_CONSOLE_NONE is not set
796+
# CONFIG_ESP_CONSOLE_SECONDARY_NONE is not set
797+
CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG=y
790798
CONFIG_ESP_CONSOLE_UART=y
791799
CONFIG_ESP_CONSOLE_UART_NUM=0
792800
CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
@@ -841,6 +849,7 @@ CONFIG_ESP_WIFI_FTM_RESPONDER_SUPPORT=y
841849
# CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set
842850
# CONFIG_ESP_WIFI_GCMP_SUPPORT is not set
843851
# CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
852+
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
844853
# end of Wi-Fi
845854

846855
#
@@ -1047,6 +1056,7 @@ CONFIG_LWIP_GARP_TMR_INTERVAL=60
10471056
CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
10481057
CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
10491058
# CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set
1059+
CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID=y
10501060
# CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set
10511061
CONFIG_LWIP_DHCP_OPTIONS_LEN=128
10521062

@@ -1133,6 +1143,7 @@ CONFIG_LWIP_MAX_RAW_PCBS=16
11331143
#
11341144
CONFIG_LWIP_SNTP_MAX_SERVERS=3
11351145
CONFIG_LWIP_DHCP_GET_NTP_SRV=y
1146+
CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
11361147
CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
11371148
# end of SNTP
11381149

‎sdkconfig.esp32s2

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
9595
# CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set
9696
CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y
9797
CONFIG_ESPTOOLPY_FLASHMODE="dio"
98-
# CONFIG_ESPTOOLPY_FLASHFREQ_120M is not set
9998
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
10099
# CONFIG_ESPTOOLPY_FLASHFREQ_40M is not set
101100
# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
@@ -342,6 +341,13 @@ CONFIG_ADC_DISABLE_DAC=y
342341
#
343342
# CONFIG_UART_ISR_IN_IRAM is not set
344343
# end of UART configuration
344+
345+
#
346+
# GDMA Configuration
347+
#
348+
# CONFIG_GDMA_CTRL_FUNC_IN_IRAM is not set
349+
# CONFIG_GDMA_ISR_IRAM_SAFE is not set
350+
# end of GDMA Configuration
345351
# end of Driver configurations
346352

347353
#
@@ -575,6 +581,7 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y
575581
# CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set
576582
CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20
577583
CONFIG_ESP_PHY_MAX_TX_POWER=20
584+
# CONFIG_ESP_PHY_ENABLE_USB is not set
578585
# end of PHY
579586

580587
#
@@ -671,6 +678,7 @@ CONFIG_ESP_WIFI_FTM_RESPONDER_SUPPORT=y
671678
# CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set
672679
# CONFIG_ESP_WIFI_EXTERNAL_COEXIST_ENABLE is not set
673680
# CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
681+
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
674682
# end of Wi-Fi
675683

676684
#
@@ -879,6 +887,7 @@ CONFIG_LWIP_GARP_TMR_INTERVAL=60
879887
CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
880888
# CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set
881889
# CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set
890+
CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID=y
882891
CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y
883892
CONFIG_LWIP_DHCP_OPTIONS_LEN=128
884893

@@ -966,6 +975,7 @@ CONFIG_LWIP_MAX_RAW_PCBS=16
966975
#
967976
CONFIG_LWIP_SNTP_MAX_SERVERS=3
968977
CONFIG_LWIP_DHCP_GET_NTP_SRV=y
978+
CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
969979
CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
970980
# end of SNTP
971981

@@ -1000,7 +1010,6 @@ CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
10001010
# CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set
10011011
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
10021012
# CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
1003-
# CONFIG_MBEDTLS_DYNAMIC_BUFFER is not set
10041013
# CONFIG_MBEDTLS_DEBUG is not set
10051014

10061015
#
@@ -1368,8 +1377,10 @@ CONFIG_OV5640_SUPPORT=y
13681377
CONFIG_GC2145_SUPPORT=y
13691378
CONFIG_GC032A_SUPPORT=y
13701379
CONFIG_GC0308_SUPPORT=y
1380+
CONFIG_BF3005_SUPPORT=y
13711381
# CONFIG_SCCB_HARDWARE_I2C_PORT0 is not set
13721382
CONFIG_SCCB_HARDWARE_I2C_PORT1=y
1383+
CONFIG_SCCB_CLK_FREQ=100000
13731384
# CONFIG_GC_SENSOR_WINDOWING_MODE is not set
13741385
CONFIG_GC_SENSOR_SUBSAMPLE_MODE=y
13751386
CONFIG_CAMERA_CORE0=y

0 commit comments

Comments
 (0)