⚠ This page is served via a proxy. Original site: https://github.com
This service does not collect credentials or authentication data.
Skip to content

[Breaking] Refactor config #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
h2zero wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[Breaking] Refactor config #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 14 additions & 73 deletions cores/nRF5/nimble_config/ext_nimble_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,80 +12,28 @@
#error No supported mcu config specified
#endif

#ifndef CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY
#ifdef NRF51
#define CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY 0
#else
#define CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY 1
#endif
#endif

#ifndef CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY
#define CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY MYNEWT_VAL_MCU_TARGET__nRF52833 || \
MYNEWT_VAL_MCU_TARGET__nRF52840 || MYNEWT_VAL_MCU_TARGET__nRF52820 || MYNEWT_VAL_MCU_TARGET__nRF52811 || \
MYNEWT_VAL_MCU_TARGET__nRF5340_NET
#ifdef USE_LFRC
#define MYNEWT_VAL_BLE_LL_SCA (500)
#endif

#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY
#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY (CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY)
#endif

#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY
#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY (CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY)
#endif

/* NimBLE 1.5 Updated config */
#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_PERIPH_INIT_FEAT_XCHG
#define MYNEWT_VAL_BLE_LL_CFG_FEAT_PERIPH_INIT_FEAT_XCHG (MYNEWT_VAL_BLE_LL_CFG_FEAT_SLAVE_INIT_FEAT_XCHG)
#endif

#ifndef MYNEWT_VAL_BLE_LL_DTM
#define MYNEWT_VAL_BLE_LL_DTM (MYNEWT_VAL_BLE_LL_DTM)
#endif

#ifndef MYNEWT_VAL_BLE_LL_SCAN_AUX_SEGMENT_CNT
#define MYNEWT_VAL_BLE_LL_SCAN_AUX_SEGMENT_CNT (MYNEWT_VAL_BLE_LL_EXT_ADV_AUX_PTR_CNT)
#endif

#ifndef MYNEWT_VAL_BLE_LL_MANUFACTURER_ID
#define MYNEWT_VAL_BLE_LL_MANUFACTURER_ID (MYNEWT_VAL_BLE_LL_MFRG_ID)
#endif

#ifndef MYNEWT_VAL_BLE_LL_CONN_STRICT_SCHED
#define MYNEWT_VAL_BLE_LL_CONN_STRICT_SCHED (MYNEWT_VAL_BLE_LL_STRICT_CONN_SCHEDULING)
#endif

#ifndef MYNEWT_VAL_BLE_LL_HCI_VS_EVENT_ON_ASSERT
#define MYNEWT_VAL_BLE_LL_HCI_VS_EVENT_ON_ASSERT (MYNEWT_VAL_BLE_LL_VND_EVENT_ON_ASSERT)
#endif

#ifndef MYNEWT_VAL_BLE_LL_PUBLIC_DEV_ADDR
#define MYNEWT_VAL_BLE_LL_PUBLIC_DEV_ADDR (0x000000000000)
#endif

#ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_COUNT
#define MYNEWT_VAL_BLE_TRANSPORT_ACL_COUNT (MYNEWT_VAL_BLE_ACL_BUF_COUNT)
#endif

#ifndef MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE
#define MYNEWT_VAL_BLE_TRANSPORT_ACL_SIZE (MYNEWT_VAL_BLE_ACL_BUF_SIZE)
#ifdef NRF51
#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY (0)
#else
#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_2M_PHY (1)
#endif

#ifndef MYNEWT_VAL_BLE_TRANSPORT_EVT_COUNT
#define MYNEWT_VAL_BLE_TRANSPORT_EVT_COUNT (MYNEWT_VAL_BLE_HCI_ACL_OUT_COUNT)
#endif

#ifndef MYNEWT_VAL_BLE_TRANSPORT_EVT_DISCARDABLE_COUNT
#define MYNEWT_VAL_BLE_TRANSPORT_EVT_DISCARDABLE_COUNT (MYNEWT_VAL_BLE_HCI_EVT_LO_BUF_COUNT)
#ifndef MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY
#define MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY (MYNEWT_VAL_MCU_TARGET__nRF52833 || \
MYNEWT_VAL_MCU_TARGET__nRF52840 || \
MYNEWT_VAL_MCU_TARGET__nRF52820 || \
MYNEWT_VAL_MCU_TARGET__nRF52811 || \
MYNEWT_VAL_MCU_TARGET__nRF5340_NET)
#endif

#ifndef MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE
#if MYNEWT_VAL_BLE_EXT_ADV
#define MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE (257)
#else
#define MYNEWT_VAL_BLE_TRANSPORT_EVT_SIZE (70)
#endif
#endif
#define MYNEWT_VAL_BLE_CONTROLLER (1)
#define CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE 1

#ifndef min
#define min(a, b) ((a)<(b)?(a):(b))
Expand All @@ -94,10 +42,3 @@ MYNEWT_VAL_MCU_TARGET__nRF5340_NET
#ifndef max
#define max(a, b) ((a)>(b)?(a):(b))
#endif

#define CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE 1

/* FIX DLE with Nimble core 1.6 */
#if MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_CODED_PHY
#define BLE_50_FEATURE_SUPPORT 1
#endif
Loading
Loading