Cleanup redefinition warnings for arduino core 3.3+

Author: h2zero

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