Skip to content

Commit 1adba3f

Browse files
geeksvillegeeksville
committed
Switch to NimBLE from Bluedroid
Meshtastic patched version esp-idf commit #e7f316d5a4eb64ca52d40575cb20815d456a9c4f used. In support of: meshtastic/firmware#266
1 parent 263a484 commit 1adba3f

File tree

144 files changed

+12461
-51
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+12461
-51
lines changed

Diff for: ‎tools/sdk/bin/bootloader_dio_40m.bin

16 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/bin/bootloader_dio_80m.bin

0 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/bin/bootloader_dout_40m.bin

16 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/bin/bootloader_dout_80m.bin

0 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/bin/bootloader_qio_40m.bin

16 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/bin/bootloader_qio_80m.bin

0 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/bin/bootloader_qout_40m.bin

16 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/bin/bootloader_qout_80m.bin

0 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/include/bt/esp_bt.h

+10-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
extern "C" {
2626
#endif
2727

28-
#define ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL 0x20200106
28+
#define ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL 0x20200611
2929

3030
/**
3131
* @brief Bluetooth mode for controller enable/disable
@@ -102,6 +102,12 @@ the adv packet will be discarded until the memory is restored. */
102102
#define BTDM_CTRL_AUTO_LATENCY_EFF false
103103
#endif
104104

105+
#ifdef CONFIG_BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF
106+
#define BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF CONFIG_BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF
107+
#else
108+
#define BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF false
109+
#endif
110+
105111
#define BTDM_CONTROLLER_BLE_MAX_CONN_LIMIT 9 //Maximum BLE connection limitation
106112
#define BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_LIMIT 7 //Maximum ACL connection limitation
107113
#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. */
115121
.hci_uart_no = BT_HCI_UART_NO_DEFAULT, \
116122
.hci_uart_baudrate = BT_HCI_UART_BAUDRATE_DEFAULT, \
117123
.scan_duplicate_mode = SCAN_DUPLICATE_MODE, \
118-
.scan_duplicate_type = SCAN_DUPLICATE_TYPE_VALUE, \
124+
.scan_duplicate_type = SCAN_DUPLICATE_TYPE_VALUE, \
119125
.normal_adv_size = NORMAL_SCAN_DUPLICATE_CACHE_SIZE, \
120126
.mesh_adv_size = MESH_DUPLICATE_SCAN_CACHE_SIZE, \
121127
.send_adv_reserved_size = SCAN_SEND_ADV_RESERVED_SIZE, \
@@ -125,6 +131,7 @@ the adv packet will be discarded until the memory is restored. */
125131
.bt_max_acl_conn = CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF, \
126132
.bt_sco_datapath = CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF, \
127133
.auto_latency = BTDM_CTRL_AUTO_LATENCY_EFF, \
134+
.bt_legacy_auth_vs_evt = BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF, \
128135
.bt_max_sync_conn = CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF, \
129136
.magic = ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL, \
130137
};
@@ -157,6 +164,7 @@ typedef struct {
157164
uint8_t bt_max_acl_conn; /*!< BR/EDR maximum ACL connection numbers */
158165
uint8_t bt_sco_datapath; /*!< SCO data path, i.e. HCI or PCM module */
159166
bool auto_latency; /*!< BLE auto latency, used to enhance classic BT performance */
167+
bool bt_legacy_auth_vs_evt; /*!< BR/EDR Legacy auth complete event required to protect from BIAS attack */
160168
/*
161169
* Following parameters can not be configured runtime when call esp_bt_controller_init()
162170
* It will be overwrite with a constant value which in menuconfig or from a macro.

Diff for: ‎tools/sdk/include/config/sdkconfig.h

+37-19
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
* Espressif IoT Development Framework Configuration
55
*
66
*/
7-
#define CONFIG_GATTC_ENABLE 1
87
#define CONFIG_ESP32_PHY_MAX_TX_POWER 20
98
#define CONFIG_TRACEMEM_RESERVE_DRAM 0x0
109
#define CONFIG_FREERTOS_MAX_TASK_NAME_LEN 16
1110
#define CONFIG_MQTT_TRANSPORT_SSL 1
12-
#define CONFIG_BLE_SMP_ENABLE 1
1311
#define CONFIG_SPIRAM_TYPE_AUTO 1
1412
#define CONFIG_STACK_CHECK 1
1513
#define CONFIG_MB_SERIAL_TASK_PRIO 10
@@ -27,11 +25,11 @@
2725
#define CONFIG_IPC_TASK_STACK_SIZE 1024
2826
#define CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES 16
2927
#define CONFIG_FATFS_PER_FILE_CACHE 1
30-
#define CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY 1
3128
#define CONFIG_ESPTOOLPY_FLASHFREQ "40m"
3229
#define CONFIG_SCCB_HARDWARE_I2C_PORT1 1
3330
#define CONFIG_MBEDTLS_KEY_EXCHANGE_RSA 1
3431
#define CONFIG_UDP_RECVMBOX_SIZE 6
32+
#define CONFIG_NIMBLE_PINNED_TO_CORE 0
3533
#define CONFIG_APP_RETRIEVE_LEN_ELF_SHA 16
3634
#define CONFIG_ARDUHAL_PARTITION_SCHEME_DEFAULT 1
3735
#define CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE 0
@@ -46,13 +44,14 @@
4644
#define CONFIG_D0WD_PSRAM_CS_IO 16
4745
#define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER 1
4846
#define CONFIG_EMAC_L2_TO_L3_RX_BUF_MODE 1
47+
#define CONFIG_NIMBLE_ROLE_CENTRAL 1
4948
#define CONFIG_BTDM_CONTROLLER_MODEM_SLEEP 1
49+
#define CONFIG_NIMBLE_L2CAP_COC_MAX_NUM 0
5050
#define CONFIG_SPIFFS_CACHE 1
5151
#define CONFIG_INT_WDT 1
5252
#define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL 1
5353
#define CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN 3
5454
#define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
55-
#define CONFIG_BT_STACK_NO_LOG 1
5655
#define CONFIG_ESP_GRATUITOUS_ARP 1
5756
#define CONFIG_MBEDTLS_ECDSA_C 1
5857
#define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
@@ -62,11 +61,13 @@
6261
#define CONFIG_MBEDTLS_ECDH_C 1
6362
#define CONFIG_SPIRAM_USE_CAPS_ALLOC 1
6463
#define CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE 1
64+
#define CONFIG_MBEDTLS_ECP_RESTARTABLE 1
6565
#define CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM 16
6666
#define CONFIG_MBEDTLS_SSL_ALPN 1
6767
#define CONFIG_MBEDTLS_PEM_WRITE_C 1
6868
#define CONFIG_BT_RESERVE_DRAM 0xdb5c
6969
#define CONFIG_APP_COMPILE_TIME_DATE 1
70+
#define CONFIG_NIMBLE_MAX_CONNECTIONS 3
7071
#define CONFIG_CXX_EXCEPTIONS 1
7172
#define CONFIG_D2WD_PSRAM_CLK_IO 9
7273
#define CONFIG_FATFS_FS_LOCK 0
@@ -79,10 +80,13 @@
7980
#define CONFIG_CAMERA_CORE1 1
8081
#define CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL 5
8182
#define CONFIG_MB_SERIAL_BUF_SIZE 256
83+
#define CONFIG_NIMBLE_HS_FLOW_CTRL 1
8284
#define CONFIG_CONSOLE_UART_BAUDRATE 115200
85+
#define CONFIG_NIMBLE_SM_SC 1
8386
#define CONFIG_SPIRAM_SUPPORT 1
8487
#define CONFIG_MFN56_1X 1
8588
#define CONFIG_LWIP_MAX_SOCKETS 10
89+
#define CONFIG_NIMBLE_HS_FLOW_CTRL_ITVL 1000
8690
#define CONFIG_LWIP_NETIF_LOOPBACK 1
8791
#define CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT "pthread"
8892
#define CONFIG_EMAC_TASK_PRIORITY 20
@@ -93,14 +97,19 @@
9397
#define CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4 1
9498
#define CONFIG_TCPIP_TASK_AFFINITY_CPU0 1
9599
#define CONFIG_FATFS_CODEPAGE 850
100+
#define CONFIG_NIMBLE_ROLE_BROADCASTER 1
96101
#define CONFIG_SPIRAM_SPIWP_SD3_PIN 7
97102
#define CONFIG_ULP_COPROC_RESERVE_MEM 512
98103
#define CONFIG_LWIP_MAX_UDP_PCBS 16
99104
#define CONFIG_ESPTOOLPY_BAUD 921600
100105
#define CONFIG_INT_WDT_CHECK_CPU1 1
106+
#define CONFIG_NIMBLE_MEM_ALLOC_MODE_DEFAULT 1
101107
#define CONFIG_ADC_CAL_LUT_ENABLE 1
108+
#define CONFIG_NIMBLE_MSYS1_BLOCK_COUNT 12
102109
#define CONFIG_FLASHMODE_DIO 1
103110
#define CONFIG_LWIP_ESP_LWIP_ASSERT 1
111+
#define CONFIG_NIMBLE_MAX_BONDS 3
112+
#define CONFIG_NIMBLE_TASK_STACK_SIZE 4096
104113
#define CONFIG_ESPTOOLPY_AFTER_RESET 1
105114
#define CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED 1
106115
#define CONFIG_LWIP_DHCPS_MAX_STATION_NUM 8
@@ -119,30 +128,33 @@
119128
#define CONFIG_TCP_OVERSIZE_MSS 1
120129
#define CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS 1
121130
#define CONFIG_CONSOLE_UART_DEFAULT 1
131+
#define CONFIG_NIMBLE_HCI_EVT_LO_BUF_COUNT 8
122132
#define CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN 16384
123133
#define CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS 4
134+
#define CONFIG_NIMBLE_SVC_GAP_APPEARANCE 0x0
124135
#define CONFIG_ESPTOOLPY_FLASHSIZE_DETECT 1
125136
#define CONFIG_AUTOSTART_ARDUINO 1
126137
#define CONFIG_ARDUINO_RUNNING_CORE 1
138+
#define CONFIG_NIMBLE_MAX_CCCDS 8
127139
#define CONFIG_PPP_CHAP_SUPPORT 1
128140
#define CONFIG_LOG_DEFAULT_LEVEL_ERROR 1
129141
#define CONFIG_TIMER_TASK_STACK_SIZE 4096
130142
#define CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE 1
131143
#define CONFIG_SPIRAM_BANKSWITCH_ENABLE 1
132144
#define CONFIG_MBEDTLS_X509_CRL_PARSE_C 1
145+
#define CONFIG_MBEDTLS_CMAC_C 1
133146
#define CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER 1
134147
#define CONFIG_HTTPD_PURGE_BUF_LEN 32
135148
#define CONFIG_SCAN_DUPLICATE_BY_DEVICE_ADDR 1
136149
#define CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER 1
137150
#define CONFIG_MB_SERIAL_TASK_STACK_SIZE 2048
138151
#define CONFIG_MBEDTLS_PSK_MODES 1
139-
#define CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO 1
140152
#define CONFIG_LWIP_DHCPS_LEASE_UNIT 60
141153
#define CONFIG_EFUSE_MAX_BLK_LEN 192
142154
#define CONFIG_SPIFFS_USE_MAGIC 1
155+
#define CONFIG_NIMBLE_SM_LEGACY 1
143156
#define CONFIG_OV7725_SUPPORT 1
144157
#define CONFIG_TCPIP_TASK_STACK_SIZE 2560
145-
#define CONFIG_BLUEDROID_PINNED_TO_CORE_0 1
146158
#define CONFIG_FATFS_CODEPAGE_850 1
147159
#define CONFIG_TASK_WDT 1
148160
#define CONFIG_MTMN_LITE_QUANT 1
@@ -152,13 +164,14 @@
152164
#define CONFIG_LWIP_MAX_ACTIVE_TCP 16
153165
#define CONFIG_TASK_WDT_TIMEOUT_S 5
154166
#define CONFIG_INT_WDT_TIMEOUT_MS 300
167+
#define CONFIG_NIMBLE_ATT_PREFERRED_MTU 256
155168
#define CONFIG_SCCB_HARDWARE_I2C 1
156169
#define CONFIG_ARDUINO_EVENT_RUN_CORE1 1
157170
#define CONFIG_ESPTOOLPY_FLASHMODE "dio"
158-
#define CONFIG_BTC_TASK_STACK_SIZE 8192
159-
#define CONFIG_BLUEDROID_ENABLED 1
171+
#define CONFIG_NIMBLE_SVC_GAP_DEVICE_NAME "nimble"
160172
#define CONFIG_NEWLIB_STDIN_LINE_ENDING_CR 1
161173
#define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA 1
174+
#define CONFIG_NIMBLE_ROLE_OBSERVER 1
162175
#define CONFIG_ESPTOOLPY_BEFORE "default_reset"
163176
#define CONFIG_ADC2_DISABLE_DAC 1
164177
#define CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM 100
@@ -167,13 +180,13 @@
167180
#define CONFIG_TIMER_QUEUE_LENGTH 10
168181
#define CONFIG_ESP32_REV_MIN 0
169182
#define CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT 1
170-
#define CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE 0
171183
#define CONFIG_OV5640_SUPPORT 1
172184
#define CONFIG_MAKE_WARN_UNDEFINED_VARIABLES 1
173185
#define CONFIG_FATFS_TIMEOUT_MS 10000
174186
#define CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM 32
175187
#define CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS 1
176188
#define CONFIG_MBEDTLS_CCM_C 1
189+
#define CONFIG_NIMBLE_HCI_EVT_BUF_SIZE 70
177190
#define CONFIG_SPI_MASTER_ISR_IN_IRAM 1
178191
#define CONFIG_ARDUHAL_PARTITION_SCHEME "default"
179192
#define CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER 20
@@ -221,6 +234,7 @@
221234
#define CONFIG_LWIP_DHCP_RESTORE_LAST_IP 1
222235
#define CONFIG_PICO_PSRAM_CS_IO 10
223236
#define CONFIG_EMAC_TASK_STACK_SIZE 3072
237+
#define CONFIG_NIMBLE_HCI_EVT_HI_BUF_COUNT 30
224238
#define CONFIG_MB_QUEUE_LENGTH 20
225239
#define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA 1
226240
#define CONFIG_OV2640_SUPPORT 1
@@ -257,17 +271,18 @@
257271
#define CONFIG_MBEDTLS_TLS_ENABLED 1
258272
#define CONFIG_LWIP_MAX_RAW_PCBS 16
259273
#define CONFIG_SPIRAM_IGNORE_NOTFOUND 1
260-
#define CONFIG_BTU_TASK_STACK_SIZE 4096
261-
#define CONFIG_SMP_ENABLE 1
262274
#define CONFIG_SPIRAM_SIZE -1
275+
#define CONFIG_NIMBLE_ROLE_PERIPHERAL 1
263276
#define CONFIG_PM_ENABLE 1
264277
#define CONFIG_MBEDTLS_SSL_SESSION_TICKETS 1
265278
#define CONFIG_SPIFFS_MAX_PARTITIONS 3
266279
#define CONFIG_ESP_ERR_TO_NAME_LOOKUP 1
280+
#define CONFIG_NIMBLE_PINNED_TO_CORE_0 1
267281
#define CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_0 1
268282
#define CONFIG_MBEDTLS_SSL_RENEGOTIATION 1
269283
#define CONFIG_ESPTOOLPY_BEFORE_RESET 1
270284
#define CONFIG_MB_EVENT_QUEUE_TIMEOUT 20
285+
#define CONFIG_NIMBLE_ACL_BUF_COUNT 12
271286
#define CONFIG_ESPTOOLPY_BAUD_OTHER_VAL 115200
272287
#define CONFIG_PPP_MPPE_SUPPORT 1
273288
#define CONFIG_ENABLE_ARDUINO_DEPENDS 1
@@ -280,7 +295,6 @@
280295
#define CONFIG_TCPIP_RECVMBOX_SIZE 32
281296
#define CONFIG_ESP32_DEFAULT_CPU_FREQ_240 1
282297
#define CONFIG_ESP32_XTAL_FREQ_AUTO 1
283-
#define CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST 1
284298
#define CONFIG_TCP_MAXRTX 12
285299
#define CONFIG_ESPTOOLPY_AFTER "hard_reset"
286300
#define CONFIG_TCPIP_TASK_AFFINITY 0x0
@@ -297,14 +311,14 @@
297311
#define CONFIG_PPP_PAP_SUPPORT 1
298312
#define CONFIG_MBEDTLS_TLS_CLIENT 1
299313
#define CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI 1
314+
#define CONFIG_NIMBLE_GAP_DEVICE_NAME_MAX_LEN 31
300315
#define CONFIG_BT_ENABLED 1
301316
#define CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY 1
302317
#define CONFIG_D0WD_PSRAM_CLK_IO 17
303318
#define CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED 1
304319
#define CONFIG_MONITOR_BAUD 115200
305320
#define CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT -1
306321
#define CONFIG_ESP32_DEBUG_STUBS_ENABLE 1
307-
#define CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT 30
308322
#define CONFIG_TCPIP_LWIP 1
309323
#define CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST 1
310324
#define CONFIG_REDUCE_PHY_TX_POWER 1
@@ -316,7 +330,6 @@
316330
#define CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY 1
317331
#define CONFIG_TCP_QUEUE_OOSEQ 1
318332
#define CONFIG_FATFS_ALLOC_PREFER_EXTRAM 1
319-
#define CONFIG_GATTS_ENABLE 1
320333
#define CONFIG_CXX_EXCEPTIONS_EMG_POOL_SIZE 0
321334
#define CONFIG_ADC_CAL_EFUSE_VREF_ENABLE 1
322335
#define CONFIG_MBEDTLS_TLS_SERVER 1
@@ -326,40 +339,46 @@
326339
#define CONFIG_FREERTOS_ISR_STACKSIZE 1536
327340
#define CONFIG_SUPPORT_TERMIOS 1
328341
#define CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK 1
342+
#define CONFIG_NIMBLE_CRYPTO_STACK_MBEDTLS 1
329343
#define CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_PSK 1
330344
#define CONFIG_OPENSSL_ASSERT_DO_NOTHING 1
331345
#define CONFIG_IDF_TARGET "esp32"
332346
#define CONFIG_SPIRAM_MEMTEST 1
347+
#define CONFIG_NIMBLE_ENABLED 1
333348
#define CONFIG_WL_SECTOR_SIZE_4096 1
334349
#define CONFIG_FREERTOS_NO_AFFINITY 0x7FFFFFFF
350+
#define CONFIG_NIMBLE_HS_FLOW_CTRL_TX_ON_DISCONNECT 1
335351
#define CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED 1
336352
#define CONFIG_HTTPD_ERR_RESP_NO_DELAY 1
337353
#define CONFIG_MB_TIMER_INDEX 0
338354
#define CONFIG_SCAN_DUPLICATE_TYPE 0
355+
#define CONFIG_NIMBLE_HS_FLOW_CTRL_THRESH 2
339356
#define CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED 1
340357
#define CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED 1
341358
#define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA 1
342359
#define CONFIG_SYSTEM_EVENT_QUEUE_SIZE 32
343-
#define CONFIG_BT_ACL_CONNECTIONS 4
360+
#define CONFIG_NIMBLE_NVS_PERSIST 1
344361
#define CONFIG_FATFS_MAX_LFN 255
345362
#define CONFIG_ESP32_WIFI_TX_BUFFER_TYPE 1
346363
#define CONFIG_ESPTOOLPY_BAUD_921600B 1
347364
#define CONFIG_BOOTLOADER_WDT_ENABLE 1
348365
#define CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED 1
349366
#define CONFIG_LWIP_LOOPBACK_MAX_PBUFS 8
367+
#define CONFIG_NIMBLE_RPA_TIMEOUT 900
350368
#define CONFIG_MB_TIMER_GROUP 0
351369
#define CONFIG_FREERTOS_IDLE_TIME_BEFORE_SLEEP 3
352370
#define CONFIG_SPI_FLASH_ROM_DRIVER_PATCH 1
353371
#define CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE 1
354372
#define CONFIG_SPIFFS_PAGE_SIZE 256
355373
#define CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED 1
356374
#define CONFIG_ESP32_DPORT_WORKAROUND 1
375+
#define CONFIG_NIMBLE_ACL_BUF_SIZE 255
357376
#define CONFIG_PPP_MSCHAP_SUPPORT 1
358377
#define CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0 1
359378
#define CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT 2048
360379
#define CONFIG_LWIP_SO_RCVBUF 1
361380
#define CONFIG_MB_TIMER_PORT_ENABLED 1
362-
#define CONFIG_DUPLICATE_SCAN_CACHE_SIZE 20
381+
#define CONFIG_DUPLICATE_SCAN_CACHE_SIZE 200
363382
#define CONFIG_ARDUINO_UDP_RUNNING_CORE 1
364383
#define CONFIG_MONITOR_BAUD_OTHER_VAL 115200
365384
#define CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF 1
@@ -372,9 +391,8 @@
372391
#define CONFIG_OV3660_SUPPORT 1
373392
#define CONFIG_UNITY_ENABLE_DOUBLE 1
374393
#define CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD 20
375-
#define CONFIG_BLUEDROID_PINNED_TO_CORE 0
376394
#define CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG 1
377395
#define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
378396
#define CONFIG_FATFS_API_ENCODING_ANSI_OEM 1
379-
#define CONFIG_ARDUINO_IDF_COMMIT "f4333c8e3"
380-
#define CONFIG_ARDUINO_IDF_BRANCH "release/v3.3"
397+
#define CONFIG_ARDUINO_IDF_COMMIT "e7f316d5a"
398+
#define CONFIG_ARDUINO_IDF_BRANCH "meshtastic-release/v3.3"

Diff for: ‎tools/sdk/include/esp32/esp_wifi_types.h

-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ typedef enum {
9393
WIFI_REASON_ASSOC_FAIL = 203,
9494
WIFI_REASON_HANDSHAKE_TIMEOUT = 204,
9595
WIFI_REASON_CONNECTION_FAIL = 205,
96-
WIFI_REASON_AUTH_CHANGED = 206,
9796
} wifi_err_reason_t;
9897

9998
typedef enum {

Diff for: ‎tools/sdk/include/nimble/console/console.h

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Copyright 2019 Espressif Systems (Shanghai) PTE LTD
2+
//
3+
//Licensed under the Apache License, Version 2.0 (the "License");
4+
//you may not use this file except in compliance with the License.
5+
//You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
//Unless required by applicable law or agreed to in writing, software
10+
//distributed under the License is distributed on an "AS IS" BASIS,
11+
//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
//See the License for the specific language governing permissions and
13+
//limitations under the License.
14+
#ifndef _CONSOLE_H
15+
#define _CONSOLE_H
16+
17+
#include <stdio.h>
18+
19+
#define console_printf printf
20+
21+
#endif

0 commit comments

Comments
 (0)