Merge branch 'bugfix/fix_config_option' into 'master'

Nimble: Fixed setting macro values based on selected configuration See merge request espressif/esp-idf!23857
espressif · May 26, 2023 · 0b5ab48 · 0b5ab48
2 parents cbf460c + 9901bdf
commit 0b5ab48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble
diff --git a/components/bt/host/nimble/port/include/esp_nimble_cfg.h b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
@@ -91,6 +91,7 @@
 #define BLE_50_FEATURE_SUPPORT (CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT)
 #endif
 #endif
+
 #ifndef CONFIG_BT_NIMBLE_EXT_ADV
 #define MYNEWT_VAL_BLE_EXT_ADV (0)
 #else
@@ -141,25 +142,25 @@
 #endif
 
 #ifndef CONFIG_BT_NIMBLE_ROLE_BROADCASTER
-#define MYNEWT_VAL_BLE_ROLE_BROADCASTER (1)
+#define MYNEWT_VAL_BLE_ROLE_BROADCASTER (0)
 #else
 #define MYNEWT_VAL_BLE_ROLE_BROADCASTER (CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
 #endif
 
 #ifndef CONFIG_BT_NIMBLE_ROLE_CENTRAL
-#define MYNEWT_VAL_BLE_ROLE_CENTRAL (1)
+#define MYNEWT_VAL_BLE_ROLE_CENTRAL (0)
 #else
 #define MYNEWT_VAL_BLE_ROLE_CENTRAL (CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 #endif
 
 #ifndef CONFIG_BT_NIMBLE_ROLE_OBSERVER
-#define MYNEWT_VAL_BLE_ROLE_OBSERVER (1)
+#define MYNEWT_VAL_BLE_ROLE_OBSERVER (0)
 #else
 #define MYNEWT_VAL_BLE_ROLE_OBSERVER (CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 #endif
 
 #ifndef CONFIG_BT_NIMBLE_ROLE_PERIPHERAL
-#define MYNEWT_VAL_BLE_ROLE_PERIPHERAL (1)
+#define MYNEWT_VAL_BLE_ROLE_PERIPHERAL (0)
 #else
 #define MYNEWT_VAL_BLE_ROLE_PERIPHERAL (CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 #endif
@@ -320,7 +321,7 @@
 #endif
 
 #ifndef CONFIG_BT_NIMBLE_HCI_UART_PORT
-#define MYNEWT_VAL_BLE_HCI_UART_PORT (1)
+#define MYNEWT_VAL_BLE_HCI_UART_PORT (0)
 #else
 #define MYNEWT_VAL_BLE_HCI_UART_PORT (CONFIG_BT_NIMBLE_HCI_UART_PORT)
 #endif