From 84cce39eabe0fc2cbe77cfb36dc89d0a21eb1a6c Mon Sep 17 00:00:00 2001 From: h2zero Date: Sun, 10 Aug 2025 13:48:44 -0600 Subject: [PATCH] Cleanup redefinition warnings for arduino core 3.3+ --- src/nimconfig.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/nimconfig.h b/src/nimconfig.h index 8e2fb5ae..e130c834 100644 --- a/src/nimconfig.h +++ b/src/nimconfig.h @@ -251,9 +251,9 @@ #endif #ifdef CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT // backward compatibility -#define CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT -#elif !defined(CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT) -#define CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT 12 +#define MYNEWT_VAL_MSYS_1_BLOCK_COUNT CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT +#else +#define MYNEWT_VAL_MSYS_1_BLOCK_COUNT 12 #endif #ifndef CONFIG_BT_NIMBLE_MSYS_1_BLOCK_SIZE @@ -286,7 +286,9 @@ #define CONFIG_BT_NIMBLE_GAP_DEVICE_NAME_MAX_LEN 31 /** @brief ACL Buffer count */ +#ifndef CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT #define CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT 12 +#endif /** @brief ACL Buffer size */ #define CONFIG_BT_NIMBLE_TRANSPORT_ACL_SIZE 255