You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/06/06 14:30:10 UTC
[02/13] incubator-mynewt-core git commit: Fix TXADD bit not being set
correctly in advertisements for all cases
Fix TXADD bit not being set correctly in advertisements for all cases
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/34441827
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/34441827
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/34441827
Branch: refs/heads/upf54
Commit: 344418270465ab93633d03c0034f95fb38ae9654
Parents: 3e67101
Author: William San Filippo <wi...@runtime.io>
Authored: Mon Jun 6 01:39:33 2016 -0700
Committer: William San Filippo <wi...@runtime.io>
Committed: Mon Jun 6 03:39:05 2016 -0700
----------------------------------------------------------------------
apps/bletest/src/main.c | 14 +++++++-------
net/nimble/controller/include/controller/ble_ll.h | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/34441827/apps/bletest/src/main.c
----------------------------------------------------------------------
diff --git a/apps/bletest/src/main.c b/apps/bletest/src/main.c
index 7aa2396..73b3cbf 100755
--- a/apps/bletest/src/main.c
+++ b/apps/bletest/src/main.c
@@ -98,9 +98,9 @@ os_membuf_t g_mbuf_buffer[MBUF_MEMPOOL_SIZE];
#define BLETEST_ROLE_SCANNER (1)
#define BLETEST_ROLE_INITIATOR (2)
-//#define BLETEST_CFG_ROLE (BLETEST_ROLE_INITIATOR)
+#define BLETEST_CFG_ROLE (BLETEST_ROLE_INITIATOR)
//#define BLETEST_CFG_ROLE (BLETEST_ROLE_ADVERTISER)
-#define BLETEST_CFG_ROLE (BLETEST_ROLE_SCANNER)
+//#define BLETEST_CFG_ROLE (BLETEST_ROLE_SCANNER)
/* Advertiser config */
#define BLETEST_CFG_ADV_OWN_ADDR_TYPE (BLE_HCI_ADV_OWN_ADDR_PRIV_PUB)
@@ -113,8 +113,8 @@ os_membuf_t g_mbuf_buffer[MBUF_MEMPOOL_SIZE];
/* Scan config */
#define BLETEST_CFG_SCAN_ITVL (700000 / BLE_HCI_SCAN_ITVL)
#define BLETEST_CFG_SCAN_WINDOW (700000 / BLE_HCI_SCAN_ITVL)
-#define BLETEST_CFG_SCAN_TYPE (BLE_HCI_SCAN_TYPE_ACTIVE)
-#define BLETEST_CFG_SCAN_OWN_ADDR_TYPE (BLE_HCI_ADV_OWN_ADDR_PRIV_PUB)
+#define BLETEST_CFG_SCAN_TYPE (BLE_HCI_SCAN_TYPE_PASSIVE)
+#define BLETEST_CFG_SCAN_OWN_ADDR_TYPE (BLE_HCI_ADV_OWN_ADDR_PUBLIC)
#define BLETEST_CFG_SCAN_FILT_POLICY (BLE_HCI_SCAN_FILT_USE_WL)
#define BLETEST_CFG_FILT_DUP_ADV (1)
@@ -125,8 +125,8 @@ os_membuf_t g_mbuf_buffer[MBUF_MEMPOOL_SIZE];
#define BLETEST_CFG_CONN_SPVN_TMO (1000) /* 20 seconds */
#define BLETEST_CFG_MIN_CE_LEN (6)
#define BLETEST_CFG_MAX_CE_LEN (BLETEST_CFG_CONN_ITVL)
-#define BLETEST_CFG_CONN_PEER_ADDR_TYPE (BLE_HCI_CONN_PEER_ADDR_PUBLIC_IDENT)
-#define BLETEST_CFG_CONN_OWN_ADDR_TYPE (BLE_HCI_ADV_OWN_ADDR_PRIV_PUB)
+#define BLETEST_CFG_CONN_PEER_ADDR_TYPE (BLE_HCI_CONN_PEER_ADDR_PUBLIC)
+#define BLETEST_CFG_CONN_OWN_ADDR_TYPE (BLE_HCI_ADV_OWN_ADDR_PUBLIC)
#define BLETEST_CFG_CONCURRENT_CONNS (1)
/* Test packet config */
@@ -443,7 +443,7 @@ bletest_init_scanner(void)
#endif
if (add_whitelist & 1) {
rc = bletest_hci_le_add_to_whitelist(g_bletest_cur_peer_addr,
- BLE_ADDR_TYPE_PUBLIC);
+ BLE_ADDR_TYPE_RANDOM);
assert(rc == 0);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/34441827/net/nimble/controller/include/controller/ble_ll.h
----------------------------------------------------------------------
diff --git a/net/nimble/controller/include/controller/ble_ll.h b/net/nimble/controller/include/controller/ble_ll.h
index 81cba53..afdff13 100644
--- a/net/nimble/controller/include/controller/ble_ll.h
+++ b/net/nimble/controller/include/controller/ble_ll.h
@@ -361,7 +361,7 @@ int ble_ll_rand_start(void);
* XXX: temporary LL debug log. Will get removed once we transition to real
* log
*/
-#undef BLE_LL_LOG
+#define BLE_LL_LOG
#include "console/console.h"
#define BLE_LL_LOG_ID_PHY_SETCHAN (1)