Move to idf 5.1.5

Update littlefs from 1.6.0 to v1.14.8 Update USB definition struct due to new API
luc-github · Dec 2, 2024 · ade6ee8 · ade6ee8
1 parent 2d42348
commit ade6ee8
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 20 deletions.
diff --git a/components/SSDP_IDF b/components/SSDP_IDF
diff --git a/components/esp_littlefs b/components/esp_littlefs
diff --git a/hardware/ESP32S3_HMI43V3/sdkconfig b/hardware/ESP32S3_HMI43V3/sdkconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file. DO NOT EDIT.
-# Espressif IoT Development Framework (ESP-IDF) 5.1.2 Project Configuration
+# Espressif IoT Development Framework (ESP-IDF) 5.1.5 Project Configuration
 #
 CONFIG_SOC_MPU_MIN_REGION_SIZE=0x20000000
 CONFIG_SOC_MPU_REGIONS_MAX_NUM=8
@@ -83,7 +83,7 @@ CONFIG_SOC_CPU_INTR_NUM=32
 CONFIG_SOC_CPU_HAS_FPU=y
 CONFIG_SOC_CPU_BREAKPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINTS_NUM=2
-CONFIG_SOC_CPU_WATCHPOINT_SIZE=64
+CONFIG_SOC_CPU_WATCHPOINT_MAX_REGION_SIZE=64
 CONFIG_SOC_DS_SIGNATURE_MAX_BIT_LEN=4096
 CONFIG_SOC_DS_KEY_PARAM_MD_IV_LENGTH=16
 CONFIG_SOC_DS_KEY_CHECK_MAX_WAIT_US=1100
@@ -227,7 +227,7 @@ CONFIG_SOC_UART_SUPPORT_APB_CLK=y
 CONFIG_SOC_UART_SUPPORT_RTC_CLK=y
 CONFIG_SOC_UART_SUPPORT_XTAL_CLK=y
 CONFIG_SOC_UART_REQUIRE_CORE_RESET=y
-CONFIG_SOC_USB_PERIPH_NUM=y
+CONFIG_SOC_USB_OTG_PERIPH_NUM=1
 CONFIG_SOC_SHA_DMA_MAX_BUFFER_SIZE=3968
 CONFIG_SOC_SHA_SUPPORT_DMA=y
 CONFIG_SOC_SHA_SUPPORT_RESUME=y
@@ -309,6 +309,7 @@ CONFIG_SOC_WIFI_WAPI_SUPPORT=y
 CONFIG_SOC_WIFI_CSI_SUPPORT=y
 CONFIG_SOC_WIFI_MESH_SUPPORT=y
 CONFIG_SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW=y
+CONFIG_SOC_WIFI_PHY_NEEDS_USB_WORKAROUND=y
 CONFIG_SOC_BLE_SUPPORTED=y
 CONFIG_SOC_BLE_MESH_SUPPORTED=y
 CONFIG_SOC_BLE_50_SUPPORTED=y
@@ -350,6 +351,14 @@ CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 # CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set
 # CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
 CONFIG_BOOTLOADER_LOG_LEVEL=0
+
+#
+# Serial Flash Configurations
+#
+# CONFIG_BOOTLOADER_FLASH_DC_AWARE is not set
+CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y
+# end of Serial Flash Configurations
+
 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
 # CONFIG_BOOTLOADER_FACTORY_RESET is not set
 # CONFIG_BOOTLOADER_APP_TEST is not set
@@ -363,7 +372,6 @@ CONFIG_BOOTLOADER_WDT_TIME_MS=9000
 # CONFIG_BOOTLOADER_SKIP_VALIDATE_ALWAYS is not set
 CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0
 # CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC is not set
-CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y
 # end of Bootloader config
 
 #
@@ -393,8 +401,10 @@ CONFIG_ESP_ROM_HAS_MZ_CRC32=y
 CONFIG_ESP_ROM_HAS_JPEG_DECODE=y
 CONFIG_ESP_ROM_UART_CLK_IS_XTAL=y
 CONFIG_ESP_ROM_HAS_RETARGETABLE_LOCKING=y
+CONFIG_ESP_ROM_USB_OTG_NUM=3
 CONFIG_ESP_ROM_USB_SERIAL_DEVICE_NUM=4
 CONFIG_ESP_ROM_HAS_ERASE_0_REGION_BUG=y
+CONFIG_ESP_ROM_HAS_ENCRYPTED_WRITES_USING_LEGACY_DRV=y
 CONFIG_ESP_ROM_GET_CLK_FREQ=y
 CONFIG_ESP_ROM_HAS_HAL_WDT=y
 CONFIG_ESP_ROM_NEEDS_SWSETUP_WORKAROUND=y
@@ -514,6 +524,7 @@ CONFIG_APPTRACE_LOCK_ENABLE=y
 # Bluetooth
 #
 # CONFIG_BT_ENABLED is not set
+CONFIG_BT_ALARM_MAX_NUM=50
 # end of Bluetooth
 
 #
@@ -598,6 +609,7 @@ CONFIG_GPTIMER_ISR_HANDLER_IN_IRAM=y
 # RMT Configuration
 #
 # CONFIG_RMT_ISR_IRAM_SAFE is not set
+# CONFIG_RMT_RECV_FUNC_IN_IRAM is not set
 # CONFIG_RMT_SUPPRESS_DEPRECATE_WARN is not set
 # CONFIG_RMT_ENABLE_DEBUG_LOG is not set
 # end of RMT Configuration
@@ -749,6 +761,7 @@ CONFIG_ESP_MAC_UNIVERSAL_MAC_ADDRESSES_FOUR=y
 # CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO is not set
 CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_FOUR=y
 CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES=4
+# CONFIG_ESP_MAC_USE_CUSTOM_MAC_AS_BASE_MAC is not set
 # end of MAC Config
 
 #
@@ -759,8 +772,10 @@ CONFIG_ESP_SLEEP_PSRAM_LEAKAGE_WORKAROUND=y
 CONFIG_ESP_SLEEP_MSPI_NEED_ALL_IO_PU=y
 CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
 CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y
-CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY=2000
+CONFIG_ESP_SLEEP_WAIT_FLASH_READY_EXTRA_DELAY=2000
+# CONFIG_ESP_SLEEP_DEBUG is not set
 CONFIG_ESP_SLEEP_GPIO_ENABLE_INTERNAL_RESISTORS=y
+# CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION is not set
 # end of Sleep Config
 
 #
@@ -843,6 +858,7 @@ CONFIG_ESP_PHY_RF_CAL_PARTIAL=y
 # CONFIG_ESP_PHY_RF_CAL_NONE is not set
 # CONFIG_ESP_PHY_RF_CAL_FULL is not set
 CONFIG_ESP_PHY_CALIBRATION_MODE=0
+# CONFIG_ESP_PHY_PLL_TRACK_DEBUG is not set
 # end of PHY
 
 #
@@ -885,6 +901,7 @@ CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=2048
 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y
+# CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY is not set
 # end of SPI RAM config
 # end of ESP PSRAM
 
@@ -1005,6 +1022,7 @@ CONFIG_ESP_BROWNOUT_DET_LVL=7
 # end of Brownout Detector
 
 CONFIG_ESP_SYSTEM_BROWNOUT_INTR=y
+CONFIG_ESP_SYSTEM_BBPLL_RECALIB=y
 # end of ESP System Settings
 
 #
@@ -1065,6 +1083,9 @@ CONFIG_ESP_WIFI_ENABLE_SAE_PK=y
 CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT=y
 CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA=y
 # CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set
+CONFIG_ESP_WIFI_SLP_DEFAULT_MIN_ACTIVE_TIME=50
+CONFIG_ESP_WIFI_SLP_DEFAULT_MAX_ACTIVE_TIME=10
+CONFIG_ESP_WIFI_SLP_DEFAULT_WAIT_BROADCAST_DATA_TIME=15
 # CONFIG_ESP_WIFI_FTM_ENABLE is not set
 CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE=y
 # CONFIG_ESP_WIFI_GCMP_SUPPORT is not set
@@ -1092,6 +1113,7 @@ CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y
 # CONFIG_ESP_WIFI_DEBUG_PRINT is not set
 # CONFIG_ESP_WIFI_TESTING_OPTIONS is not set
 CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT=y
+# CONFIG_ESP_WIFI_ENT_FREE_DYNAMIC_BUFFER is not set
 # end of Wi-Fi
 
 #
@@ -1208,6 +1230,7 @@ CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
 CONFIG_HAL_WDT_USE_ROM_IMPL=y
 CONFIG_HAL_SPI_MASTER_FUNC_IN_IRAM=y
 CONFIG_HAL_SPI_SLAVE_FUNC_IN_IRAM=y
+# CONFIG_HAL_ECDSA_GEN_SIG_CM is not set
 # end of Hardware Abstraction Layer (HAL) and Low Level (LL)
 
 #
@@ -1224,9 +1247,6 @@ CONFIG_HEAP_TRACING_OFF=y
 # CONFIG_HEAP_PLACE_FUNCTION_INTO_FLASH is not set
 # end of Heap memory debugging
 
-CONFIG_IEEE802154_CCA_THRESHOLD=-60
-CONFIG_IEEE802154_PENDING_TABLE_SIZE=20
-
 #
 # Log output
 #
@@ -1263,13 +1283,15 @@ CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
 # CONFIG_LWIP_EXTRA_IRAM_OPTIMIZATION is not set
 CONFIG_LWIP_TIMERS_ONDEMAND=y
 CONFIG_LWIP_ND6=y
+# CONFIG_LWIP_FORCE_ROUTER_FORWARDING is not set
 CONFIG_LWIP_MAX_SOCKETS=16
 # CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
 # CONFIG_LWIP_SO_LINGER is not set
 CONFIG_LWIP_SO_REUSE=y
 CONFIG_LWIP_SO_REUSE_RXTOALL=y
 # CONFIG_LWIP_SO_RCVBUF is not set
 # CONFIG_LWIP_NETBUF_RECVINFO is not set
+CONFIG_LWIP_IP_DEFAULT_TTL=64
 CONFIG_LWIP_IP4_FRAG=y
 CONFIG_LWIP_IP6_FRAG=y
 # CONFIG_LWIP_IP4_REASSEMBLY is not set
@@ -1324,6 +1346,8 @@ CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744
 CONFIG_LWIP_TCP_WND_DEFAULT=5744
 CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
 CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
+CONFIG_LWIP_TCP_OOSEQ_TIMEOUT=6
+CONFIG_LWIP_TCP_OOSEQ_MAX_PBUFS=0
 # CONFIG_LWIP_TCP_SACK_OUT is not set
 CONFIG_LWIP_TCP_OVERSIZE_MSS=y
 # CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set
@@ -1352,6 +1376,9 @@ CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
 # CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0 is not set
 # CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU1 is not set
 CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
+CONFIG_LWIP_IPV6_ND6_NUM_PREFIXES=5
+CONFIG_LWIP_IPV6_ND6_NUM_ROUTERS=3
+CONFIG_LWIP_IPV6_ND6_NUM_DESTINATIONS=10
 # CONFIG_LWIP_PPP_SUPPORT is not set
 CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
 CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
@@ -1379,6 +1406,13 @@ CONFIG_LWIP_SNTP_MAX_SERVERS=3
 CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
 # end of SNTP
 
+#
+# DNS
+#
+CONFIG_LWIP_DNS_MAX_SERVERS=3
+# CONFIG_LWIP_FALLBACK_DNS_SERVER_SUPPORT is not set
+# end of DNS
+
 CONFIG_LWIP_BRIDGEIF_MAX_PORTS=7
 CONFIG_LWIP_ESP_LWIP_ASSERT=y
 
@@ -1447,7 +1481,9 @@ CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=200
 CONFIG_MBEDTLS_CMAC_C=y
 CONFIG_MBEDTLS_HARDWARE_AES=y
 CONFIG_MBEDTLS_AES_USE_INTERRUPT=y
+# CONFIG_MBEDTLS_GCM_SUPPORT_NON_AES_CIPHER is not set
 CONFIG_MBEDTLS_HARDWARE_MPI=y
+# CONFIG_MBEDTLS_LARGE_KEY_SOFTWARE_MPI is not set
 CONFIG_MBEDTLS_MPI_USE_INTERRUPT=y
 CONFIG_MBEDTLS_HARDWARE_SHA=y
 CONFIG_MBEDTLS_ROM_MD5=y
@@ -1533,7 +1569,7 @@ CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y
 # CONFIG_MBEDTLS_CHACHA20_C is not set
 # CONFIG_MBEDTLS_HKDF_C is not set
 # CONFIG_MBEDTLS_THREADING_C is not set
-# CONFIG_MBEDTLS_LARGE_KEY_SOFTWARE_MPI is not set
+CONFIG_MBEDTLS_ERROR_STRINGS=y
 # end of mbedTLS
 
 #
@@ -1591,6 +1627,13 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
 # end of Thread Operational Dataset
 
 CONFIG_OPENTHREAD_XTAL_ACCURACY=130
+# CONFIG_OPENTHREAD_SPINEL_ONLY is not set
+CONFIG_OPENTHREAD_RX_ON_WHEN_IDLE=y
+
+#
+# Thread Address Query Config
+#
+# end of Thread Address Query Config
 # end of OpenThread
 
 #
@@ -1622,6 +1665,33 @@ CONFIG_MMU_PAGE_MODE="64KB"
 CONFIG_MMU_PAGE_SIZE=0x10000
 # end of MMU Config
 
+#
+# Main Flash configuration
+#
+
+#
+# SPI Flash behavior when brownout
+#
+CONFIG_SPI_FLASH_BROWNOUT_RESET_XMC=y
+CONFIG_SPI_FLASH_BROWNOUT_RESET=y
+# end of SPI Flash behavior when brownout
+
+#
+# Optional and Experimental Features (READ DOCS FIRST)
+#
+
+#
+# Features here require specific hardware (READ DOCS FIRST!)
+#
+# CONFIG_SPI_FLASH_HPM_ENA is not set
+CONFIG_SPI_FLASH_HPM_AUTO=y
+# CONFIG_SPI_FLASH_HPM_DIS is not set
+CONFIG_SPI_FLASH_HPM_ON=y
+CONFIG_SPI_FLASH_HPM_DC_AUTO=y
+# CONFIG_SPI_FLASH_HPM_DC_DISABLE is not set
+# end of Optional and Experimental Features (READ DOCS FIRST)
+# end of Main Flash configuration
+
 #
 # SPI Flash driver
 #
@@ -1641,13 +1711,6 @@ CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=8192
 # CONFIG_SPI_FLASH_CHECK_ERASE_TIMEOUT_DISABLED is not set
 # CONFIG_SPI_FLASH_OVERRIDE_CHIP_DRIVER_LIST is not set
 
-#
-# SPI Flash behavior when brownout
-#
-CONFIG_SPI_FLASH_BROWNOUT_RESET_XMC=y
-CONFIG_SPI_FLASH_BROWNOUT_RESET=y
-# end of SPI Flash behavior when brownout
-
 #
 # Auto-detect flash chips
 #
@@ -1740,7 +1803,6 @@ CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
 #
 # USB-OTG
 #
-CONFIG_USB_OTG_SUPPORTED=y
 CONFIG_USB_HOST_CONTROL_TRANSFER_MAX_SIZE=256
 CONFIG_USB_HOST_HW_BUFFER_BIAS_BALANCED=y
 # CONFIG_USB_HOST_HW_BUFFER_BIAS_IN is not set
@@ -1754,6 +1816,9 @@ CONFIG_USB_HOST_RESET_HOLD_MS=30
 CONFIG_USB_HOST_RESET_RECOVERY_MS=30
 CONFIG_USB_HOST_SET_ADDR_RECOVERY_MS=10
 # end of Root Hub configuration
+
+CONFIG_USB_OTG_SUPPORTED=y
+# CONFIG_USB_HOST_ENABLE_ENUM_FILTER_CALLBACK is not set
 # end of USB-OTG
 
 #
@@ -1763,6 +1828,7 @@ CONFIG_VFS_SUPPORT_IO=y
 CONFIG_VFS_SUPPORT_DIR=y
 CONFIG_VFS_SUPPORT_SELECT=y
 CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=y
+CONFIG_VFS_SELECT_IN_RAM=y
 CONFIG_VFS_SUPPORT_TERMIOS=y
 CONFIG_VFS_MAX_COUNT=8
 
@@ -1794,6 +1860,7 @@ CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
 #
 # LittleFS
 #
+# CONFIG_LITTLEFS_SDMMC_SUPPORT is not set
 CONFIG_LITTLEFS_MAX_PARTITIONS=2
 CONFIG_LITTLEFS_PAGE_SIZE=256
 CONFIG_LITTLEFS_OBJ_NAME_LEN=255
@@ -1810,6 +1877,11 @@ CONFIG_LITTLEFS_MTIME_USE_SECONDS=y
 # CONFIG_LITTLEFS_SPIFFS_COMPAT is not set
 # CONFIG_LITTLEFS_FLUSH_FILE_EVERY_WRITE is not set
 # CONFIG_LITTLEFS_FCNTL_GET_PATH is not set
+# CONFIG_LITTLEFS_MULTIVERSION is not set
+# CONFIG_LITTLEFS_MALLOC_STRATEGY_DISABLE is not set
+CONFIG_LITTLEFS_MALLOC_STRATEGY_DEFAULT=y
+# CONFIG_LITTLEFS_MALLOC_STRATEGY_INTERNAL is not set
+CONFIG_LITTLEFS_ASSERTS=y
 # end of LittleFS
 
 #
@@ -1917,6 +1989,7 @@ CONFIG_POST_EVENTS_FROM_ISR=y
 CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
 # CONFIG_OTA_ALLOW_HTTP is not set
 CONFIG_ESP32S3_DEEP_SLEEP_WAKEUP_DELAY=2000
+CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY=2000
 CONFIG_ESP32S3_RTC_CLK_SRC_INT_RC=y
 # CONFIG_ESP32S3_RTC_CLK_SRC_EXT_CRYS is not set
 # CONFIG_ESP32S3_RTC_CLK_SRC_EXT_OSC is not set

diff --git a/hardware/drivers_usb_otg/usb_serial/usb_serial.cpp b/hardware/drivers_usb_otg/usb_serial/usb_serial.cpp
@@ -103,7 +103,7 @@ esp_err_t usb_serial_init() {
   const usb_host_config_t host_config = {
       .skip_phy_setup = true,
       .intr_flags = ESP_INTR_FLAG_LEVEL1,
-      //.enum_filter_cb = NULL,
+      .enum_filter_cb = NULL,
   };
   // Install USB Host driver. Should only be called once in entire application
   esp3d_log("Installing USB Host");
+7 −0		README.md
+119 −127		examples/ssdp_example/main/ssdp_example.c
+0 −1		include/ssdp.h
+49 −0		tools/format_sources.py
+5 −1		.bumpversion.cfg
+21 −44		.github/workflows/pr.yml
+0 −3		.gitmodules
+23 −3		CMakeLists.txt
+80 −0		Kconfig
+79 −7		README.md
+5 −0		component.mk
+2 −2		idf_component.yml
+1 −0		image-building-requirements.txt
+117 −7		include/esp_littlefs.h
+14 −0		library.json
+0 −1		mklittlefs
+37 −28		project_include.cmake
+660 −203		src/esp_littlefs.c
+21 −11		src/lfs_config.h
+1 −1		src/littlefs
+63 −6		src/littlefs_api.h
+6 −6		src/littlefs_esp_part.c
+63 −0		src/littlefs_sdmmc.c
+3 −1		test/CMakeLists.txt
+20 −0		test/test_littlefs.c
+19 −0		test/test_littlefs_common.c
+2 −6		test/test_littlefs_common.h
+168 −0		test/test_littlefs_static_partition.c
+ −		test/testfs.bin
+1 −0		testdir/pangram.txt
+1 −0		testdir/test1.txt
+1 −0		testdir/test2.txt
+1 −0		testdir/test_folder/lorem_ipsum.txt