Merge branch 'bugfix/post_reattempt_cnt_event_v5.0' into 'release/v5.0'

fix(nimble): Add event for reattempt connection count information(v5.0) See merge request espressif/esp-idf!26113
espressif · Sep 29, 2023 · 3f55377 · 3f55377
2 parents 2007f2f + 782a60a
commit 3f55377
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble
diff --git a/components/bt/host/nimble/nimble.rej b/components/bt/host/nimble/nimble.rej
@@ -0,0 +1,5 @@
+--- components/bt/host/nimble/nimble
++++ components/bt/host/nimble/nimble
+@@ -1 +1 @@
+-Subproject commit e2d7a766fb3927d008902611b3985e8595864c55
++Subproject commit e2d7a766fb3927d008902611b3985e8595864c55-dirty
diff --git a/components/bt/host/nimble/port/include/esp_nimble_cfg.h b/components/bt/host/nimble/port/include/esp_nimble_cfg.h
@@ -1627,4 +1627,12 @@
 #endif
 #endif
 
+#ifndef MYNEWT_VAL_BLE_ENABLE_CONN_REATTEMPT
+#ifdef CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT
+#define MYNEWT_VAL_BLE_ENABLE_CONN_REATTEMPT CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT
+#else
+#define MYNEWT_VAL_BLE_ENABLE_CONN_REATTEMPT (0)
+#endif
+#endif
+
 #endif