From 9de20bbd3d7d6a0949e828963412ee9180a7e6a3 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Fri, 22 Dec 2017 17:51:22 +0100 Subject: [PATCH] esp32: update sdkconfig and use esp_bt.h instead of bt.h --- port/esp32/components/btstack/main.c | 2 +- port/esp32/template/sdkconfig | 78 +++++++++++++++++++++++----- 2 files changed, 66 insertions(+), 14 deletions(-) diff --git a/port/esp32/components/btstack/main.c b/port/esp32/components/btstack/main.c index 5410c06af..ceea10b2b 100644 --- a/port/esp32/components/btstack/main.c +++ b/port/esp32/components/btstack/main.c @@ -55,7 +55,7 @@ #include "classic/btstack_link_key_db_tlv.h" #include "hci.h" #include "hci_dump.h" -#include "bt.h" +#include "esp_bt.h" #include "btstack_debug.h" #include "freertos/FreeRTOS.h" diff --git a/port/esp32/template/sdkconfig b/port/esp32/template/sdkconfig index 8a87df25c..5d67361af 100644 --- a/port/esp32/template/sdkconfig +++ b/port/esp32/template/sdkconfig @@ -20,6 +20,7 @@ CONFIG_LOG_BOOTLOADER_LEVEL_INFO= CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG= CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE= CONFIG_LOG_BOOTLOADER_LEVEL=2 +CONFIG_BOOTLOADER_VDDSDIO_BOOST=y # # Security features @@ -91,6 +92,12 @@ CONFIG_OPTIMIZATION_LEVEL_RELEASE= CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y CONFIG_OPTIMIZATION_ASSERTIONS_SILENT= CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED= +CONFIG_CXX_EXCEPTIONS= +CONFIG_STACK_CHECK_NONE=y +CONFIG_STACK_CHECK_NORM= +CONFIG_STACK_CHECK_STRONG= +CONFIG_STACK_CHECK_ALL= +CONFIG_STACK_CHECK= # # Component config @@ -108,10 +115,15 @@ CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y # FreeRTOS SystemView Tracing # CONFIG_AWS_IOT_SDK= + +# +# Bluetooth +# CONFIG_BT_ENABLED=y +CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0 +CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y +CONFIG_BTDM_CONTROLLER_HCI_MODE_UART_H4= CONFIG_BLUEDROID_ENABLED= -CONFIG_BTDM_CONTROLLER_RUN_CPU=0 -CONFIG_BT_HCI_UART= CONFIG_BT_RESERVE_DRAM=0x10000 # @@ -165,7 +177,7 @@ CONFIG_INT_WDT_TIMEOUT_MS=300 CONFIG_TASK_WDT=y CONFIG_TASK_WDT_PANIC= CONFIG_TASK_WDT_TIMEOUT_S=5 -CONFIG_TASK_WDT_CHECK_IDLE_TASK=y +CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y CONFIG_BROWNOUT_DET=y CONFIG_BROWNOUT_DET_LVL_SEL_0=y CONFIG_BROWNOUT_DET_LVL_SEL_1= @@ -176,8 +188,8 @@ CONFIG_BROWNOUT_DET_LVL_SEL_5= CONFIG_BROWNOUT_DET_LVL_SEL_6= CONFIG_BROWNOUT_DET_LVL_SEL_7= CONFIG_BROWNOUT_DET_LVL=0 -CONFIG_ESP32_TIME_SYSCALL_USE_RTC= CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y +CONFIG_ESP32_TIME_SYSCALL_USE_RTC= CONFIG_ESP32_TIME_SYSCALL_USE_FRC1= CONFIG_ESP32_TIME_SYSCALL_USE_NONE= CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y @@ -189,6 +201,8 @@ CONFIG_ESP32_XTAL_FREQ_26= CONFIG_ESP32_XTAL_FREQ_AUTO=y CONFIG_ESP32_XTAL_FREQ=0 CONFIG_DISABLE_BASIC_ROM_CONSOLE= +CONFIG_ESP_TIMER_PROFILING= +CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS= # # Wi-Fi @@ -200,8 +214,9 @@ CONFIG_ESP32_WIFI_STATIC_TX_BUFFER= CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1 CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32 -CONFIG_ESP32_WIFI_AMPDU_ENABLED=y +CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y CONFIG_ESP32_WIFI_TX_BA_WIN=6 +CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y CONFIG_ESP32_WIFI_RX_BA_WIN=6 CONFIG_ESP32_WIFI_NVS_ENABLED=y @@ -213,6 +228,11 @@ CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION= CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP32_PHY_MAX_TX_POWER=20 +# +# Power Management +# +CONFIG_PM_ENABLE= + # # Ethernet # @@ -224,8 +244,8 @@ CONFIG_EMAC_TASK_PRIORITY=20 # # FAT Filesystem support # -CONFIG_FATFS_CODEPAGE_ASCII=y -CONFIG_FATFS_CODEPAGE_437= +CONFIG_FATFS_CODEPAGE_DYNAMIC= +CONFIG_FATFS_CODEPAGE_437=y CONFIG_FATFS_CODEPAGE_720= CONFIG_FATFS_CODEPAGE_737= CONFIG_FATFS_CODEPAGE_771= @@ -246,8 +266,13 @@ CONFIG_FATFS_CODEPAGE_932= CONFIG_FATFS_CODEPAGE_936= CONFIG_FATFS_CODEPAGE_949= CONFIG_FATFS_CODEPAGE_950= -CONFIG_FATFS_CODEPAGE=1 -CONFIG_FATFS_MAX_LFN=255 +CONFIG_FATFS_CODEPAGE=437 +CONFIG_FATFS_LFN_NONE=y +CONFIG_FATFS_LFN_HEAP= +CONFIG_FATFS_LFN_STACK= +CONFIG_FATFS_FS_LOCK=0 +CONFIG_FATFS_TIMEOUT_MS=10000 +CONFIG_FATFS_PER_FILE_CACHE=y # # FreeRTOS @@ -266,8 +291,6 @@ CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3 CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE= CONFIG_FREERTOS_ASSERT_DISABLE= -CONFIG_FREERTOS_BREAK_ON_SCHEDULER_START_JTAG=y -CONFIG_ENABLE_MEMORY_DEBUG= CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 CONFIG_FREERTOS_ISR_STACKSIZE=1536 CONFIG_FREERTOS_LEGACY_HOOKS= @@ -277,6 +300,9 @@ CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK= CONFIG_TIMER_TASK_PRIORITY=1 CONFIG_TIMER_TASK_STACK_DEPTH=2048 CONFIG_TIMER_QUEUE_LENGTH=10 +CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0 +CONFIG_FREERTOS_USE_TRACE_FACILITY= +CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS= CONFIG_FREERTOS_DEBUG_INTERNALS= # @@ -287,6 +313,10 @@ CONFIG_HEAP_POISONING_LIGHT= CONFIG_HEAP_POISONING_COMPREHENSIVE= CONFIG_HEAP_TRACING= +# +# libsodium +# + # # Log output # @@ -304,7 +334,6 @@ CONFIG_LOG_COLORS=y # CONFIG_L2_TO_L3_COPY= CONFIG_LWIP_MAX_SOCKETS=4 -CONFIG_LWIP_THREAD_LOCAL_STORAGE_INDEX=0 CONFIG_LWIP_SO_REUSE= CONFIG_LWIP_SO_RCVBUF= CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1 @@ -313,10 +342,22 @@ CONFIG_LWIP_IP_REASSEMBLY= CONFIG_LWIP_STATS= CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y CONFIG_TCPIP_RECVMBOX_SIZE=32 +CONFIG_LWIP_DHCP_DOES_ARP_CHECK= + +# +# DHCP server +# +CONFIG_LWIP_DHCPS_LEASE_UNIT=60 +CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8 +CONFIG_LWIP_AUTOIP= +CONFIG_LWIP_NETIF_LOOPBACK=y +CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8 # # TCP # +CONFIG_LWIP_MAX_ACTIVE_TCP=16 +CONFIG_LWIP_MAX_LISTENING_TCP=16 CONFIG_TCP_MAXRTX=12 CONFIG_TCP_SYNMAXRTX=6 CONFIG_TCP_MSS=1436 @@ -332,8 +373,8 @@ CONFIG_TCP_OVERSIZE_DISABLE= # # UDP # +CONFIG_LWIP_MAX_UDP_PCBS=16 CONFIG_UDP_RECVMBOX_SIZE=6 -CONFIG_LWIP_DHCP_DOES_ARP_CHECK= CONFIG_TCPIP_TASK_STACK_SIZE=2560 CONFIG_PPP_SUPPORT= @@ -343,6 +384,11 @@ CONFIG_PPP_SUPPORT= CONFIG_LWIP_MULTICAST_PING= CONFIG_LWIP_BROADCAST_PING= +# +# LWIP RAW API +# +CONFIG_LWIP_MAX_RAW_PCBS=16 + # # mbedTLS # @@ -437,8 +483,12 @@ CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048 # # SPI Flash driver # +CONFIG_SPI_FLASH_VERIFY_WRITE= CONFIG_SPI_FLASH_ENABLE_COUNTERS= CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y +CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y +CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS= +CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED= # # SPIFFS Configuration @@ -457,6 +507,8 @@ CONFIG_SPIFFS_GC_STATS= CONFIG_SPIFFS_OBJ_NAME_LEN=32 CONFIG_SPIFFS_USE_MAGIC=y CONFIG_SPIFFS_USE_MAGIC_LENGTH=y +CONFIG_SPIFFS_META_LENGTH=4 +CONFIG_SPIFFS_USE_MTIME=y # # Debug Configuration