Skip to content

Commit 083d921

Browse files
committed
[Bugfix] Set Legacy VHCI correctly - fixes older Arduino core crashes
1 parent 592ddb8 commit 083d921

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

src/nimconfig.h

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@
147147
/* This section should not be altered */
148148

149149
#ifdef ESP_PLATFORM
150-
# include "sdkconfig.h"
150+
# include <sdkconfig.h>
151+
# include <esp_idf_version.h>
151152

152153
# ifndef CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE
153154
# define CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE (0)
@@ -161,19 +162,17 @@
161162
# define CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE (2)
162163
# endif
163164

164-
# if !defined(CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE) && \
165-
(defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3))
166-
# define CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE (1)
167-
# endif
168-
169165
# if !defined(CONFIG_BT_CONTROLLER_DISABLED)
170166
# define CONFIG_BT_CONTROLLER_DISABLED (0)
171167
# endif
172168

169+
# undef CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE
173170
# if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
174-
# define NIMBLE_CFG_CONTROLLER 0
171+
# define CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE (1)
172+
# define NIMBLE_CFG_CONTROLLER (0)
175173
# else
176-
# define NIMBLE_CFG_CONTROLLER CONFIG_BT_CONTROLLER_ENABLED
174+
# define CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE (0)
175+
# define NIMBLE_CFG_CONTROLLER CONFIG_BT_CONTROLLER_ENABLED
177176
# endif
178177

179178
# ifndef CONFIG_BT_NIMBLE_USE_ESP_TIMER
@@ -187,6 +186,10 @@
187186
# define MYNEWT_VAL_BLE_EXT_ADV (CONFIG_BT_NIMBLE_EXT_ADV)
188187
# endif
189188

189+
# if CONFIG_IDF_TARGET_ESP32 && (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0))
190+
# define MYNEWT_VAL_BLE_HCI_VS (0)
191+
# endif
192+
190193
#else // !ESP_PLATFORM
191194
# if defined(NRF51)
192195
# include "syscfg/devcfg/nrf51cfg.h"

0 commit comments

Comments
 (0)