Skip to content

Commit ade6ee8

Browse files
committed
Move to idf 5.1.5
Update littlefs from 1.6.0 to v1.14.8 Update USB definition struct due to new API
1 parent 2d42348 commit ade6ee8

File tree

4 files changed

+93
-20
lines changed

4 files changed

+93
-20
lines changed

hardware/ESP32S3_HMI43V3/sdkconfig

Lines changed: 90 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated file. DO NOT EDIT.
3-
# Espressif IoT Development Framework (ESP-IDF) 5.1.2 Project Configuration
3+
# Espressif IoT Development Framework (ESP-IDF) 5.1.5 Project Configuration
44
#
55
CONFIG_SOC_MPU_MIN_REGION_SIZE=0x20000000
66
CONFIG_SOC_MPU_REGIONS_MAX_NUM=8
@@ -83,7 +83,7 @@ CONFIG_SOC_CPU_INTR_NUM=32
8383
CONFIG_SOC_CPU_HAS_FPU=y
8484
CONFIG_SOC_CPU_BREAKPOINTS_NUM=2
8585
CONFIG_SOC_CPU_WATCHPOINTS_NUM=2
86-
CONFIG_SOC_CPU_WATCHPOINT_SIZE=64
86+
CONFIG_SOC_CPU_WATCHPOINT_MAX_REGION_SIZE=64
8787
CONFIG_SOC_DS_SIGNATURE_MAX_BIT_LEN=4096
8888
CONFIG_SOC_DS_KEY_PARAM_MD_IV_LENGTH=16
8989
CONFIG_SOC_DS_KEY_CHECK_MAX_WAIT_US=1100
@@ -227,7 +227,7 @@ CONFIG_SOC_UART_SUPPORT_APB_CLK=y
227227
CONFIG_SOC_UART_SUPPORT_RTC_CLK=y
228228
CONFIG_SOC_UART_SUPPORT_XTAL_CLK=y
229229
CONFIG_SOC_UART_REQUIRE_CORE_RESET=y
230-
CONFIG_SOC_USB_PERIPH_NUM=y
230+
CONFIG_SOC_USB_OTG_PERIPH_NUM=1
231231
CONFIG_SOC_SHA_DMA_MAX_BUFFER_SIZE=3968
232232
CONFIG_SOC_SHA_SUPPORT_DMA=y
233233
CONFIG_SOC_SHA_SUPPORT_RESUME=y
@@ -309,6 +309,7 @@ CONFIG_SOC_WIFI_WAPI_SUPPORT=y
309309
CONFIG_SOC_WIFI_CSI_SUPPORT=y
310310
CONFIG_SOC_WIFI_MESH_SUPPORT=y
311311
CONFIG_SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW=y
312+
CONFIG_SOC_WIFI_PHY_NEEDS_USB_WORKAROUND=y
312313
CONFIG_SOC_BLE_SUPPORTED=y
313314
CONFIG_SOC_BLE_MESH_SUPPORTED=y
314315
CONFIG_SOC_BLE_50_SUPPORTED=y
@@ -350,6 +351,14 @@ CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
350351
# CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set
351352
# CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
352353
CONFIG_BOOTLOADER_LOG_LEVEL=0
354+
355+
#
356+
# Serial Flash Configurations
357+
#
358+
# CONFIG_BOOTLOADER_FLASH_DC_AWARE is not set
359+
CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y
360+
# end of Serial Flash Configurations
361+
353362
CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
354363
# CONFIG_BOOTLOADER_FACTORY_RESET is not set
355364
# CONFIG_BOOTLOADER_APP_TEST is not set
@@ -363,7 +372,6 @@ CONFIG_BOOTLOADER_WDT_TIME_MS=9000
363372
# CONFIG_BOOTLOADER_SKIP_VALIDATE_ALWAYS is not set
364373
CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0
365374
# CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC is not set
366-
CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y
367375
# end of Bootloader config
368376

369377
#
@@ -393,8 +401,10 @@ CONFIG_ESP_ROM_HAS_MZ_CRC32=y
393401
CONFIG_ESP_ROM_HAS_JPEG_DECODE=y
394402
CONFIG_ESP_ROM_UART_CLK_IS_XTAL=y
395403
CONFIG_ESP_ROM_HAS_RETARGETABLE_LOCKING=y
404+
CONFIG_ESP_ROM_USB_OTG_NUM=3
396405
CONFIG_ESP_ROM_USB_SERIAL_DEVICE_NUM=4
397406
CONFIG_ESP_ROM_HAS_ERASE_0_REGION_BUG=y
407+
CONFIG_ESP_ROM_HAS_ENCRYPTED_WRITES_USING_LEGACY_DRV=y
398408
CONFIG_ESP_ROM_GET_CLK_FREQ=y
399409
CONFIG_ESP_ROM_HAS_HAL_WDT=y
400410
CONFIG_ESP_ROM_NEEDS_SWSETUP_WORKAROUND=y
@@ -514,6 +524,7 @@ CONFIG_APPTRACE_LOCK_ENABLE=y
514524
# Bluetooth
515525
#
516526
# CONFIG_BT_ENABLED is not set
527+
CONFIG_BT_ALARM_MAX_NUM=50
517528
# end of Bluetooth
518529

519530
#
@@ -598,6 +609,7 @@ CONFIG_GPTIMER_ISR_HANDLER_IN_IRAM=y
598609
# RMT Configuration
599610
#
600611
# CONFIG_RMT_ISR_IRAM_SAFE is not set
612+
# CONFIG_RMT_RECV_FUNC_IN_IRAM is not set
601613
# CONFIG_RMT_SUPPRESS_DEPRECATE_WARN is not set
602614
# CONFIG_RMT_ENABLE_DEBUG_LOG is not set
603615
# end of RMT Configuration
@@ -749,6 +761,7 @@ CONFIG_ESP_MAC_UNIVERSAL_MAC_ADDRESSES_FOUR=y
749761
# CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO is not set
750762
CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_FOUR=y
751763
CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES=4
764+
# CONFIG_ESP_MAC_USE_CUSTOM_MAC_AS_BASE_MAC is not set
752765
# end of MAC Config
753766

754767
#
@@ -759,8 +772,10 @@ CONFIG_ESP_SLEEP_PSRAM_LEAKAGE_WORKAROUND=y
759772
CONFIG_ESP_SLEEP_MSPI_NEED_ALL_IO_PU=y
760773
CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
761774
CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y
762-
CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY=2000
775+
CONFIG_ESP_SLEEP_WAIT_FLASH_READY_EXTRA_DELAY=2000
776+
# CONFIG_ESP_SLEEP_DEBUG is not set
763777
CONFIG_ESP_SLEEP_GPIO_ENABLE_INTERNAL_RESISTORS=y
778+
# CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION is not set
764779
# end of Sleep Config
765780

766781
#
@@ -843,6 +858,7 @@ CONFIG_ESP_PHY_RF_CAL_PARTIAL=y
843858
# CONFIG_ESP_PHY_RF_CAL_NONE is not set
844859
# CONFIG_ESP_PHY_RF_CAL_FULL is not set
845860
CONFIG_ESP_PHY_CALIBRATION_MODE=0
861+
# CONFIG_ESP_PHY_PLL_TRACK_DEBUG is not set
846862
# end of PHY
847863

848864
#
@@ -885,6 +901,7 @@ CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=2048
885901
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
886902
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
887903
CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y
904+
# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
888905
# end of SPI RAM config
889906
# end of ESP PSRAM
890907

@@ -1005,6 +1022,7 @@ CONFIG_ESP_BROWNOUT_DET_LVL=7
10051022
# end of Brownout Detector
10061023

10071024
CONFIG_ESP_SYSTEM_BROWNOUT_INTR=y
1025+
CONFIG_ESP_SYSTEM_BBPLL_RECALIB=y
10081026
# end of ESP System Settings
10091027

10101028
#
@@ -1065,6 +1083,9 @@ CONFIG_ESP_WIFI_ENABLE_SAE_PK=y
10651083
CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT=y
10661084
CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA=y
10671085
# CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set
1086+
CONFIG_ESP_WIFI_SLP_DEFAULT_MIN_ACTIVE_TIME=50
1087+
CONFIG_ESP_WIFI_SLP_DEFAULT_MAX_ACTIVE_TIME=10
1088+
CONFIG_ESP_WIFI_SLP_DEFAULT_WAIT_BROADCAST_DATA_TIME=15
10681089
# CONFIG_ESP_WIFI_FTM_ENABLE is not set
10691090
CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE=y
10701091
# CONFIG_ESP_WIFI_GCMP_SUPPORT is not set
@@ -1092,6 +1113,7 @@ CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y
10921113
# CONFIG_ESP_WIFI_DEBUG_PRINT is not set
10931114
# CONFIG_ESP_WIFI_TESTING_OPTIONS is not set
10941115
CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT=y
1116+
# CONFIG_ESP_WIFI_ENT_FREE_DYNAMIC_BUFFER is not set
10951117
# end of Wi-Fi
10961118

10971119
#
@@ -1208,6 +1230,7 @@ CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
12081230
CONFIG_HAL_WDT_USE_ROM_IMPL=y
12091231
CONFIG_HAL_SPI_MASTER_FUNC_IN_IRAM=y
12101232
CONFIG_HAL_SPI_SLAVE_FUNC_IN_IRAM=y
1233+
# CONFIG_HAL_ECDSA_GEN_SIG_CM is not set
12111234
# end of Hardware Abstraction Layer (HAL) and Low Level (LL)
12121235

12131236
#
@@ -1224,9 +1247,6 @@ CONFIG_HEAP_TRACING_OFF=y
12241247
# CONFIG_HEAP_PLACE_FUNCTION_INTO_FLASH is not set
12251248
# end of Heap memory debugging
12261249

1227-
CONFIG_IEEE802154_CCA_THRESHOLD=-60
1228-
CONFIG_IEEE802154_PENDING_TABLE_SIZE=20
1229-
12301250
#
12311251
# Log output
12321252
#
@@ -1263,13 +1283,15 @@ CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
12631283
# CONFIG_LWIP_EXTRA_IRAM_OPTIMIZATION is not set
12641284
CONFIG_LWIP_TIMERS_ONDEMAND=y
12651285
CONFIG_LWIP_ND6=y
1286+
# CONFIG_LWIP_FORCE_ROUTER_FORWARDING is not set
12661287
CONFIG_LWIP_MAX_SOCKETS=16
12671288
# CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
12681289
# CONFIG_LWIP_SO_LINGER is not set
12691290
CONFIG_LWIP_SO_REUSE=y
12701291
CONFIG_LWIP_SO_REUSE_RXTOALL=y
12711292
# CONFIG_LWIP_SO_RCVBUF is not set
12721293
# CONFIG_LWIP_NETBUF_RECVINFO is not set
1294+
CONFIG_LWIP_IP_DEFAULT_TTL=64
12731295
CONFIG_LWIP_IP4_FRAG=y
12741296
CONFIG_LWIP_IP6_FRAG=y
12751297
# CONFIG_LWIP_IP4_REASSEMBLY is not set
@@ -1324,6 +1346,8 @@ CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744
13241346
CONFIG_LWIP_TCP_WND_DEFAULT=5744
13251347
CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
13261348
CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
1349+
CONFIG_LWIP_TCP_OOSEQ_TIMEOUT=6
1350+
CONFIG_LWIP_TCP_OOSEQ_MAX_PBUFS=0
13271351
# CONFIG_LWIP_TCP_SACK_OUT is not set
13281352
CONFIG_LWIP_TCP_OVERSIZE_MSS=y
13291353
# CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set
@@ -1352,6 +1376,9 @@ CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
13521376
# CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0 is not set
13531377
# CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU1 is not set
13541378
CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
1379+
CONFIG_LWIP_IPV6_ND6_NUM_PREFIXES=5
1380+
CONFIG_LWIP_IPV6_ND6_NUM_ROUTERS=3
1381+
CONFIG_LWIP_IPV6_ND6_NUM_DESTINATIONS=10
13551382
# CONFIG_LWIP_PPP_SUPPORT is not set
13561383
CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
13571384
CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
@@ -1379,6 +1406,13 @@ CONFIG_LWIP_SNTP_MAX_SERVERS=3
13791406
CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
13801407
# end of SNTP
13811408

1409+
#
1410+
# DNS
1411+
#
1412+
CONFIG_LWIP_DNS_MAX_SERVERS=3
1413+
# CONFIG_LWIP_FALLBACK_DNS_SERVER_SUPPORT is not set
1414+
# end of DNS
1415+
13821416
CONFIG_LWIP_BRIDGEIF_MAX_PORTS=7
13831417
CONFIG_LWIP_ESP_LWIP_ASSERT=y
13841418

@@ -1447,7 +1481,9 @@ CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=200
14471481
CONFIG_MBEDTLS_CMAC_C=y
14481482
CONFIG_MBEDTLS_HARDWARE_AES=y
14491483
CONFIG_MBEDTLS_AES_USE_INTERRUPT=y
1484+
# CONFIG_MBEDTLS_GCM_SUPPORT_NON_AES_CIPHER is not set
14501485
CONFIG_MBEDTLS_HARDWARE_MPI=y
1486+
# CONFIG_MBEDTLS_LARGE_KEY_SOFTWARE_MPI is not set
14511487
CONFIG_MBEDTLS_MPI_USE_INTERRUPT=y
14521488
CONFIG_MBEDTLS_HARDWARE_SHA=y
14531489
CONFIG_MBEDTLS_ROM_MD5=y
@@ -1533,7 +1569,7 @@ CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y
15331569
# CONFIG_MBEDTLS_CHACHA20_C is not set
15341570
# CONFIG_MBEDTLS_HKDF_C is not set
15351571
# CONFIG_MBEDTLS_THREADING_C is not set
1536-
# CONFIG_MBEDTLS_LARGE_KEY_SOFTWARE_MPI is not set
1572+
CONFIG_MBEDTLS_ERROR_STRINGS=y
15371573
# end of mbedTLS
15381574

15391575
#
@@ -1591,6 +1627,13 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
15911627
# end of Thread Operational Dataset
15921628

15931629
CONFIG_OPENTHREAD_XTAL_ACCURACY=130
1630+
# CONFIG_OPENTHREAD_SPINEL_ONLY is not set
1631+
CONFIG_OPENTHREAD_RX_ON_WHEN_IDLE=y
1632+
1633+
#
1634+
# Thread Address Query Config
1635+
#
1636+
# end of Thread Address Query Config
15941637
# end of OpenThread
15951638

15961639
#
@@ -1622,6 +1665,33 @@ CONFIG_MMU_PAGE_MODE="64KB"
16221665
CONFIG_MMU_PAGE_SIZE=0x10000
16231666
# end of MMU Config
16241667

1668+
#
1669+
# Main Flash configuration
1670+
#
1671+
1672+
#
1673+
# SPI Flash behavior when brownout
1674+
#
1675+
CONFIG_SPI_FLASH_BROWNOUT_RESET_XMC=y
1676+
CONFIG_SPI_FLASH_BROWNOUT_RESET=y
1677+
# end of SPI Flash behavior when brownout
1678+
1679+
#
1680+
# Optional and Experimental Features (READ DOCS FIRST)
1681+
#
1682+
1683+
#
1684+
# Features here require specific hardware (READ DOCS FIRST!)
1685+
#
1686+
# CONFIG_SPI_FLASH_HPM_ENA is not set
1687+
CONFIG_SPI_FLASH_HPM_AUTO=y
1688+
# CONFIG_SPI_FLASH_HPM_DIS is not set
1689+
CONFIG_SPI_FLASH_HPM_ON=y
1690+
CONFIG_SPI_FLASH_HPM_DC_AUTO=y
1691+
# CONFIG_SPI_FLASH_HPM_DC_DISABLE is not set
1692+
# end of Optional and Experimental Features (READ DOCS FIRST)
1693+
# end of Main Flash configuration
1694+
16251695
#
16261696
# SPI Flash driver
16271697
#
@@ -1641,13 +1711,6 @@ CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=8192
16411711
# CONFIG_SPI_FLASH_CHECK_ERASE_TIMEOUT_DISABLED is not set
16421712
# CONFIG_SPI_FLASH_OVERRIDE_CHIP_DRIVER_LIST is not set
16431713

1644-
#
1645-
# SPI Flash behavior when brownout
1646-
#
1647-
CONFIG_SPI_FLASH_BROWNOUT_RESET_XMC=y
1648-
CONFIG_SPI_FLASH_BROWNOUT_RESET=y
1649-
# end of SPI Flash behavior when brownout
1650-
16511714
#
16521715
# Auto-detect flash chips
16531716
#
@@ -1740,7 +1803,6 @@ CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
17401803
#
17411804
# USB-OTG
17421805
#
1743-
CONFIG_USB_OTG_SUPPORTED=y
17441806
CONFIG_USB_HOST_CONTROL_TRANSFER_MAX_SIZE=256
17451807
CONFIG_USB_HOST_HW_BUFFER_BIAS_BALANCED=y
17461808
# CONFIG_USB_HOST_HW_BUFFER_BIAS_IN is not set
@@ -1754,6 +1816,9 @@ CONFIG_USB_HOST_RESET_HOLD_MS=30
17541816
CONFIG_USB_HOST_RESET_RECOVERY_MS=30
17551817
CONFIG_USB_HOST_SET_ADDR_RECOVERY_MS=10
17561818
# end of Root Hub configuration
1819+
1820+
CONFIG_USB_OTG_SUPPORTED=y
1821+
# CONFIG_USB_HOST_ENABLE_ENUM_FILTER_CALLBACK is not set
17571822
# end of USB-OTG
17581823

17591824
#
@@ -1763,6 +1828,7 @@ CONFIG_VFS_SUPPORT_IO=y
17631828
CONFIG_VFS_SUPPORT_DIR=y
17641829
CONFIG_VFS_SUPPORT_SELECT=y
17651830
CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=y
1831+
CONFIG_VFS_SELECT_IN_RAM=y
17661832
CONFIG_VFS_SUPPORT_TERMIOS=y
17671833
CONFIG_VFS_MAX_COUNT=8
17681834

@@ -1794,6 +1860,7 @@ CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
17941860
#
17951861
# LittleFS
17961862
#
1863+
# CONFIG_LITTLEFS_SDMMC_SUPPORT is not set
17971864
CONFIG_LITTLEFS_MAX_PARTITIONS=2
17981865
CONFIG_LITTLEFS_PAGE_SIZE=256
17991866
CONFIG_LITTLEFS_OBJ_NAME_LEN=255
@@ -1810,6 +1877,11 @@ CONFIG_LITTLEFS_MTIME_USE_SECONDS=y
18101877
# CONFIG_LITTLEFS_SPIFFS_COMPAT is not set
18111878
# CONFIG_LITTLEFS_FLUSH_FILE_EVERY_WRITE is not set
18121879
# CONFIG_LITTLEFS_FCNTL_GET_PATH is not set
1880+
# CONFIG_LITTLEFS_MULTIVERSION is not set
1881+
# CONFIG_LITTLEFS_MALLOC_STRATEGY_DISABLE is not set
1882+
CONFIG_LITTLEFS_MALLOC_STRATEGY_DEFAULT=y
1883+
# CONFIG_LITTLEFS_MALLOC_STRATEGY_INTERNAL is not set
1884+
CONFIG_LITTLEFS_ASSERTS=y
18131885
# end of LittleFS
18141886

18151887
#
@@ -1917,6 +1989,7 @@ CONFIG_POST_EVENTS_FROM_ISR=y
19171989
CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
19181990
# CONFIG_OTA_ALLOW_HTTP is not set
19191991
CONFIG_ESP32S3_DEEP_SLEEP_WAKEUP_DELAY=2000
1992+
CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY=2000
19201993
CONFIG_ESP32S3_RTC_CLK_SRC_INT_RC=y
19211994
# CONFIG_ESP32S3_RTC_CLK_SRC_EXT_CRYS is not set
19221995
# CONFIG_ESP32S3_RTC_CLK_SRC_EXT_OSC is not set

hardware/drivers_usb_otg/usb_serial/usb_serial.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ esp_err_t usb_serial_init() {
103103
const usb_host_config_t host_config = {
104104
.skip_phy_setup = true,
105105
.intr_flags = ESP_INTR_FLAG_LEVEL1,
106-
//.enum_filter_cb = NULL,
106+
.enum_filter_cb = NULL,
107107
};
108108
// Install USB Host driver. Should only be called once in entire application
109109
esp3d_log("Installing USB Host");

0 commit comments

Comments
 (0)