Switch to NimBLE from Bluedroid

Meshtastic patched version esp-idf commit #e7f316d5a4eb64ca52d40575cb20815d456a9c4f
used.

In support of: meshtastic/firmware#266

Author: geeksville

tools/sdk/bin/bootloader_dio_40m.bin

@@ -25,7 +25,7 @@
 extern "C" {
 #endif
 
-#define ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL  0x20200106
+#define ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL  0x20200611
 
 /**
  * @brief Bluetooth mode for controller enable/disable
@@ -102,6 +102,12 @@ the adv packet will be discarded until the memory is restored. */
 #define BTDM_CTRL_AUTO_LATENCY_EFF false
 #endif
 
+#ifdef CONFIG_BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF
+#define BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF CONFIG_BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF
+#else
+#define BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF false
+#endif
+
 #define BTDM_CONTROLLER_BLE_MAX_CONN_LIMIT          9   //Maximum BLE connection limitation
 #define BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_LIMIT   7   //Maximum ACL connection limitation
 #define BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_LIMIT  3   //Maximum SCO/eSCO connection limitation
@@ -115,7 +121,7 @@ the adv packet will be discarded until the memory is restored. */
     .hci_uart_no = BT_HCI_UART_NO_DEFAULT,                                 \
     .hci_uart_baudrate = BT_HCI_UART_BAUDRATE_DEFAULT,                     \
     .scan_duplicate_mode = SCAN_DUPLICATE_MODE,                            \
-    .scan_duplicate_type = SCAN_DUPLICATE_TYPE_VALUE,                     \
+    .scan_duplicate_type = SCAN_DUPLICATE_TYPE_VALUE,                      \
     .normal_adv_size = NORMAL_SCAN_DUPLICATE_CACHE_SIZE,                   \
     .mesh_adv_size = MESH_DUPLICATE_SCAN_CACHE_SIZE,                       \
     .send_adv_reserved_size = SCAN_SEND_ADV_RESERVED_SIZE,                 \
@@ -125,6 +131,7 @@ the adv packet will be discarded until the memory is restored. */
     .bt_max_acl_conn = CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF,     \
     .bt_sco_datapath = CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF,          \
     .auto_latency = BTDM_CTRL_AUTO_LATENCY_EFF,                            \
+    .bt_legacy_auth_vs_evt = BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF,         \
     .bt_max_sync_conn = CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF,   \
     .magic = ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL,                           \
 };
@@ -157,6 +164,7 @@ typedef struct {
     uint8_t bt_max_acl_conn;                /*!< BR/EDR maximum ACL connection numbers */
     uint8_t bt_sco_datapath;                /*!< SCO data path, i.e. HCI or PCM module */
     bool auto_latency;                      /*!< BLE auto latency, used to enhance classic BT performance */
+    bool bt_legacy_auth_vs_evt;             /*!< BR/EDR Legacy auth complete event required to  protect from BIAS attack */
     /*
      * Following parameters can not be configured runtime when call esp_bt_controller_init()
      * It will be overwrite with a constant value which in menuconfig or from a macro.

tools/sdk/bin/bootloader_dio_80m.bin

@@ -4,12 +4,10 @@
  * Espressif IoT Development Framework Configuration
  *
  */
-#define CONFIG_GATTC_ENABLE 1
 #define CONFIG_ESP32_PHY_MAX_TX_POWER 20
 #define CONFIG_TRACEMEM_RESERVE_DRAM 0x0
 #define CONFIG_FREERTOS_MAX_TASK_NAME_LEN 16
 #define CONFIG_MQTT_TRANSPORT_SSL 1
-#define CONFIG_BLE_SMP_ENABLE 1
 #define CONFIG_SPIRAM_TYPE_AUTO 1
 #define CONFIG_STACK_CHECK 1
 #define CONFIG_MB_SERIAL_TASK_PRIO 10
@@ -27,11 +25,11 @@
 #define CONFIG_IPC_TASK_STACK_SIZE 1024
 #define CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES 16
 #define CONFIG_FATFS_PER_FILE_CACHE 1
-#define CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY 1
 #define CONFIG_ESPTOOLPY_FLASHFREQ "40m"
 #define CONFIG_SCCB_HARDWARE_I2C_PORT1 1
 #define CONFIG_MBEDTLS_KEY_EXCHANGE_RSA 1
 #define CONFIG_UDP_RECVMBOX_SIZE 6
+#define CONFIG_NIMBLE_PINNED_TO_CORE 0
 #define CONFIG_APP_RETRIEVE_LEN_ELF_SHA 16
 #define CONFIG_ARDUHAL_PARTITION_SCHEME_DEFAULT 1
 #define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
@@ -46,13 +44,14 @@
 #define CONFIG_D0WD_PSRAM_CS_IO 16
 #define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER 1
 #define CONFIG_EMAC_L2_TO_L3_RX_BUF_MODE 1
+#define CONFIG_NIMBLE_ROLE_CENTRAL 1
 #define CONFIG_BTDM_CONTROLLER_MODEM_SLEEP 1
+#define CONFIG_NIMBLE_L2CAP_COC_MAX_NUM 0
 #define CONFIG_SPIFFS_CACHE 1
 #define CONFIG_INT_WDT 1
 #define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL 1
 #define CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN 3
 #define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
-#define CONFIG_BT_STACK_NO_LOG 1
 #define CONFIG_ESP_GRATUITOUS_ARP 1
 #define CONFIG_MBEDTLS_ECDSA_C 1
 #define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
@@ -62,11 +61,13 @@
 #define CONFIG_MBEDTLS_ECDH_C 1
 #define CONFIG_SPIRAM_USE_CAPS_ALLOC 1
 #define CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE 1
+#define CONFIG_MBEDTLS_ECP_RESTARTABLE 1
 #define CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM 16
 #define CONFIG_MBEDTLS_SSL_ALPN 1
 #define CONFIG_MBEDTLS_PEM_WRITE_C 1
 #define CONFIG_BT_RESERVE_DRAM 0xdb5c
 #define CONFIG_APP_COMPILE_TIME_DATE 1
+#define CONFIG_NIMBLE_MAX_CONNECTIONS 3
 #define CONFIG_CXX_EXCEPTIONS 1
 #define CONFIG_D2WD_PSRAM_CLK_IO 9
 #define CONFIG_FATFS_FS_LOCK 0
@@ -79,10 +80,13 @@
 #define CONFIG_CAMERA_CORE1 1
 #define CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL 5
 #define CONFIG_MB_SERIAL_BUF_SIZE 256
+#define CONFIG_NIMBLE_HS_FLOW_CTRL 1
 #define CONFIG_CONSOLE_UART_BAUDRATE 115200
+#define CONFIG_NIMBLE_SM_SC 1
 #define CONFIG_SPIRAM_SUPPORT 1
 #define CONFIG_MFN56_1X 1
 #define CONFIG_LWIP_MAX_SOCKETS 10
+#define CONFIG_NIMBLE_HS_FLOW_CTRL_ITVL 1000
 #define CONFIG_LWIP_NETIF_LOOPBACK 1
 #define CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT "pthread"
 #define CONFIG_EMAC_TASK_PRIORITY 20
@@ -93,14 +97,19 @@
 #define CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4 1
 #define CONFIG_TCPIP_TASK_AFFINITY_CPU0 1
 #define CONFIG_FATFS_CODEPAGE 850
+#define CONFIG_NIMBLE_ROLE_BROADCASTER 1
 #define CONFIG_SPIRAM_SPIWP_SD3_PIN 7
 #define CONFIG_ULP_COPROC_RESERVE_MEM 512
 #define CONFIG_LWIP_MAX_UDP_PCBS 16
 #define CONFIG_ESPTOOLPY_BAUD 921600
 #define CONFIG_INT_WDT_CHECK_CPU1 1
+#define CONFIG_NIMBLE_MEM_ALLOC_MODE_DEFAULT 1
 #define CONFIG_ADC_CAL_LUT_ENABLE 1
+#define CONFIG_NIMBLE_MSYS1_BLOCK_COUNT 12
 #define CONFIG_FLASHMODE_DIO 1
 #define CONFIG_LWIP_ESP_LWIP_ASSERT 1
+#define CONFIG_NIMBLE_MAX_BONDS 3
+#define CONFIG_NIMBLE_TASK_STACK_SIZE 4096
 #define CONFIG_ESPTOOLPY_AFTER_RESET 1
 #define CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED 1
 #define CONFIG_LWIP_DHCPS_MAX_STATION_NUM 8
@@ -119,30 +128,33 @@
 #define CONFIG_TCP_OVERSIZE_MSS 1
 #define CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS 1
 #define CONFIG_CONSOLE_UART_DEFAULT 1
+#define CONFIG_NIMBLE_HCI_EVT_LO_BUF_COUNT 8
 #define CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN 16384
 #define CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS 4
+#define CONFIG_NIMBLE_SVC_GAP_APPEARANCE 0x0
 #define CONFIG_ESPTOOLPY_FLASHSIZE_DETECT 1
 #define CONFIG_AUTOSTART_ARDUINO 1
 #define CONFIG_ARDUINO_RUNNING_CORE 1
+#define CONFIG_NIMBLE_MAX_CCCDS 8
 #define CONFIG_PPP_CHAP_SUPPORT 1
 #define CONFIG_LOG_DEFAULT_LEVEL_ERROR 1
 #define CONFIG_TIMER_TASK_STACK_SIZE 4096
 #define CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE 1
 #define CONFIG_SPIRAM_BANKSWITCH_ENABLE 1
 #define CONFIG_MBEDTLS_X509_CRL_PARSE_C 1
+#define CONFIG_MBEDTLS_CMAC_C 1
 #define CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER 1
 #define CONFIG_HTTPD_PURGE_BUF_LEN 32
 #define CONFIG_SCAN_DUPLICATE_BY_DEVICE_ADDR 1
 #define CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER 1
 #define CONFIG_MB_SERIAL_TASK_STACK_SIZE 2048
 #define CONFIG_MBEDTLS_PSK_MODES 1
-#define CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO 1
 #define CONFIG_LWIP_DHCPS_LEASE_UNIT 60
 #define CONFIG_EFUSE_MAX_BLK_LEN 192
 #define CONFIG_SPIFFS_USE_MAGIC 1
+#define CONFIG_NIMBLE_SM_LEGACY 1
 #define CONFIG_OV7725_SUPPORT 1
 #define CONFIG_TCPIP_TASK_STACK_SIZE 2560
-#define CONFIG_BLUEDROID_PINNED_TO_CORE_0 1
 #define CONFIG_FATFS_CODEPAGE_850 1
 #define CONFIG_TASK_WDT 1
 #define CONFIG_MTMN_LITE_QUANT 1
@@ -152,13 +164,14 @@
 #define CONFIG_LWIP_MAX_ACTIVE_TCP 16
 #define CONFIG_TASK_WDT_TIMEOUT_S 5
 #define CONFIG_INT_WDT_TIMEOUT_MS 300
+#define CONFIG_NIMBLE_ATT_PREFERRED_MTU 256
 #define CONFIG_SCCB_HARDWARE_I2C 1
 #define CONFIG_ARDUINO_EVENT_RUN_CORE1 1
 #define CONFIG_ESPTOOLPY_FLASHMODE "dio"
-#define CONFIG_BTC_TASK_STACK_SIZE 8192
-#define CONFIG_BLUEDROID_ENABLED 1
+#define CONFIG_NIMBLE_SVC_GAP_DEVICE_NAME "nimble"
 #define CONFIG_NEWLIB_STDIN_LINE_ENDING_CR 1
 #define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA 1
+#define CONFIG_NIMBLE_ROLE_OBSERVER 1
 #define CONFIG_ESPTOOLPY_BEFORE "default_reset"
 #define CONFIG_ADC2_DISABLE_DAC 1
 #define CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM 100
@@ -167,13 +180,13 @@
 #define CONFIG_TIMER_QUEUE_LENGTH 10
 #define CONFIG_ESP32_REV_MIN 0
 #define CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT 1
-#define CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE 0
 #define CONFIG_OV5640_SUPPORT 1
 #define CONFIG_MAKE_WARN_UNDEFINED_VARIABLES 1
 #define CONFIG_FATFS_TIMEOUT_MS 10000
 #define CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM 32
 #define CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS 1
 #define CONFIG_MBEDTLS_CCM_C 1
+#define CONFIG_NIMBLE_HCI_EVT_BUF_SIZE 70
 #define CONFIG_SPI_MASTER_ISR_IN_IRAM 1
 #define CONFIG_ARDUHAL_PARTITION_SCHEME "default"
 #define CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER 20
@@ -221,6 +234,7 @@
 #define CONFIG_LWIP_DHCP_RESTORE_LAST_IP 1
 #define CONFIG_PICO_PSRAM_CS_IO 10
 #define CONFIG_EMAC_TASK_STACK_SIZE 3072
+#define CONFIG_NIMBLE_HCI_EVT_HI_BUF_COUNT 30
 #define CONFIG_MB_QUEUE_LENGTH 20
 #define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA 1
 #define CONFIG_OV2640_SUPPORT 1
@@ -257,17 +271,18 @@
 #define CONFIG_MBEDTLS_TLS_ENABLED 1
 #define CONFIG_LWIP_MAX_RAW_PCBS 16
 #define CONFIG_SPIRAM_IGNORE_NOTFOUND 1
-#define CONFIG_BTU_TASK_STACK_SIZE 4096
-#define CONFIG_SMP_ENABLE 1
 #define CONFIG_SPIRAM_SIZE -1
+#define CONFIG_NIMBLE_ROLE_PERIPHERAL 1
 #define CONFIG_PM_ENABLE 1
 #define CONFIG_MBEDTLS_SSL_SESSION_TICKETS 1
 #define CONFIG_SPIFFS_MAX_PARTITIONS 3
 #define CONFIG_ESP_ERR_TO_NAME_LOOKUP 1
+#define CONFIG_NIMBLE_PINNED_TO_CORE_0 1
 #define CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_0 1
 #define CONFIG_MBEDTLS_SSL_RENEGOTIATION 1
 #define CONFIG_ESPTOOLPY_BEFORE_RESET 1
 #define CONFIG_MB_EVENT_QUEUE_TIMEOUT 20
+#define CONFIG_NIMBLE_ACL_BUF_COUNT 12
 #define CONFIG_ESPTOOLPY_BAUD_OTHER_VAL 115200
 #define CONFIG_PPP_MPPE_SUPPORT 1
 #define CONFIG_ENABLE_ARDUINO_DEPENDS 1
@@ -280,7 +295,6 @@
 #define CONFIG_TCPIP_RECVMBOX_SIZE 32
 #define CONFIG_ESP32_DEFAULT_CPU_FREQ_240 1
 #define CONFIG_ESP32_XTAL_FREQ_AUTO 1
-#define CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST 1
 #define CONFIG_TCP_MAXRTX 12
 #define CONFIG_ESPTOOLPY_AFTER "hard_reset"
 #define CONFIG_TCPIP_TASK_AFFINITY 0x0
@@ -297,14 +311,14 @@
 #define CONFIG_PPP_PAP_SUPPORT 1
 #define CONFIG_MBEDTLS_TLS_CLIENT 1
 #define CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI 1
+#define CONFIG_NIMBLE_GAP_DEVICE_NAME_MAX_LEN 31
 #define CONFIG_BT_ENABLED 1
 #define CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY 1
 #define CONFIG_D0WD_PSRAM_CLK_IO 17
 #define CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED 1
 #define CONFIG_MONITOR_BAUD 115200
 #define CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT -1
 #define CONFIG_ESP32_DEBUG_STUBS_ENABLE 1
-#define CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT 30
 #define CONFIG_TCPIP_LWIP 1
 #define CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST 1
 #define CONFIG_REDUCE_PHY_TX_POWER 1
@@ -316,7 +330,6 @@
 #define CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY 1
 #define CONFIG_TCP_QUEUE_OOSEQ 1
 #define CONFIG_FATFS_ALLOC_PREFER_EXTRAM 1
-#define CONFIG_GATTS_ENABLE 1
 #define CONFIG_CXX_EXCEPTIONS_EMG_POOL_SIZE 0
 #define CONFIG_ADC_CAL_EFUSE_VREF_ENABLE 1
 #define CONFIG_MBEDTLS_TLS_SERVER 1
@@ -326,40 +339,46 @@
 #define CONFIG_FREERTOS_ISR_STACKSIZE 1536
 #define CONFIG_SUPPORT_TERMIOS 1
 #define CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK 1
+#define CONFIG_NIMBLE_CRYPTO_STACK_MBEDTLS 1
 #define CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_PSK 1
 #define CONFIG_OPENSSL_ASSERT_DO_NOTHING 1
 #define CONFIG_IDF_TARGET "esp32"
 #define CONFIG_SPIRAM_MEMTEST 1
+#define CONFIG_NIMBLE_ENABLED 1
 #define CONFIG_WL_SECTOR_SIZE_4096 1
 #define CONFIG_FREERTOS_NO_AFFINITY 0x7FFFFFFF
+#define CONFIG_NIMBLE_HS_FLOW_CTRL_TX_ON_DISCONNECT 1
 #define CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED 1
 #define CONFIG_HTTPD_ERR_RESP_NO_DELAY 1
 #define CONFIG_MB_TIMER_INDEX 0
 #define CONFIG_SCAN_DUPLICATE_TYPE 0
+#define CONFIG_NIMBLE_HS_FLOW_CTRL_THRESH 2
 #define CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED 1
 #define CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED 1
 #define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA 1
 #define CONFIG_SYSTEM_EVENT_QUEUE_SIZE 32
-#define CONFIG_BT_ACL_CONNECTIONS 4
+#define CONFIG_NIMBLE_NVS_PERSIST 1
 #define CONFIG_FATFS_MAX_LFN 255
 #define CONFIG_ESP32_WIFI_TX_BUFFER_TYPE 1
 #define CONFIG_ESPTOOLPY_BAUD_921600B 1
 #define CONFIG_BOOTLOADER_WDT_ENABLE 1
 #define CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED 1
 #define CONFIG_LWIP_LOOPBACK_MAX_PBUFS 8
+#define CONFIG_NIMBLE_RPA_TIMEOUT 900
 #define CONFIG_MB_TIMER_GROUP 0
 #define CONFIG_FREERTOS_IDLE_TIME_BEFORE_SLEEP 3
 #define CONFIG_SPI_FLASH_ROM_DRIVER_PATCH 1
 #define CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE 1
 #define CONFIG_SPIFFS_PAGE_SIZE 256
 #define CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED 1
 #define CONFIG_ESP32_DPORT_WORKAROUND 1
+#define CONFIG_NIMBLE_ACL_BUF_SIZE 255
 #define CONFIG_PPP_MSCHAP_SUPPORT 1
 #define CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0 1
 #define CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT 2048
 #define CONFIG_LWIP_SO_RCVBUF 1
 #define CONFIG_MB_TIMER_PORT_ENABLED 1
-#define CONFIG_DUPLICATE_SCAN_CACHE_SIZE 20
+#define CONFIG_DUPLICATE_SCAN_CACHE_SIZE 200
 #define CONFIG_ARDUINO_UDP_RUNNING_CORE 1
 #define CONFIG_MONITOR_BAUD_OTHER_VAL 115200
 #define CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF 1
@@ -372,9 +391,8 @@
 #define CONFIG_OV3660_SUPPORT 1
 #define CONFIG_UNITY_ENABLE_DOUBLE 1
 #define CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD 20
-#define CONFIG_BLUEDROID_PINNED_TO_CORE 0
 #define CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG 1
 #define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
 #define CONFIG_FATFS_API_ENCODING_ANSI_OEM 1
-#define CONFIG_ARDUINO_IDF_COMMIT "f4333c8e3"
-#define CONFIG_ARDUINO_IDF_BRANCH "release/v3.3"
+#define CONFIG_ARDUINO_IDF_COMMIT "e7f316d5a"
+#define CONFIG_ARDUINO_IDF_BRANCH "meshtastic-release/v3.3"