mynewt-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccoll...@apache.org
Subject [3/3] incubator-mynewt-core git commit: This closes #174.
Date Mon, 13 Feb 2017 19:38:23 GMT
This closes #174.

Merge remote-tracking branch 'andrzej-kaczmarek/nimble/cleanup' into develop

* andrzej-kaczmarek/nimble/cleanup:
  apps/blesplit: Fix build after ble_uuid and ble_addr changes
  nimble: Cleanup address types usage


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/57a5bb60
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/57a5bb60
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/57a5bb60

Branch: refs/heads/develop
Commit: 57a5bb60278ecf84b991042057561111750b2fcf
Parents: 8b510e9 605955c
Author: Christopher Collins <ccollins@apache.org>
Authored: Mon Feb 13 11:33:37 2017 -0800
Committer: Christopher Collins <ccollins@apache.org>
Committed: Mon Feb 13 11:33:37 2017 -0800

----------------------------------------------------------------------
 apps/blecent/src/main.c                     |  4 ++--
 apps/bleprph_oic/src/main.c                 |  2 +-
 apps/blesplit/src/main.c                    | 14 +++++++-------
 apps/bleuart/src/main.c                     |  2 +-
 apps/ocf_sample/src/ocf_ble.c               |  2 +-
 net/nimble/host/src/ble_hs_id.c             |  8 ++++----
 net/nimble/host/src/ble_hs_misc.c           | 12 ++++++------
 net/nimble/host/test/src/ble_gap_test.c     | 24 ++++++++++++------------
 net/nimble/host/test/src/ble_hs_test_util.c |  2 +-
 net/nimble/host/test/src/ble_os_test.c      |  2 +-
 net/nimble/host/test/src/ble_sm_lgcy_test.c | 24 ++++++++++++------------
 net/nimble/host/test/src/ble_sm_sc_test.c   | 24 ++++++++++++------------
 12 files changed, 60 insertions(+), 60 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/57a5bb60/apps/bleprph_oic/src/main.c
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/57a5bb60/apps/blesplit/src/main.c
----------------------------------------------------------------------
diff --cc apps/blesplit/src/main.c
index 711803f,ade8019..8c349c1
--- a/apps/blesplit/src/main.c
+++ b/apps/blesplit/src/main.c
@@@ -51,24 -51,24 +51,24 @@@ static voi
  blesplit_print_conn_desc(struct ble_gap_conn_desc *desc)
  {
      BLESPLIT_LOG(INFO, "handle=%d our_ota_addr_type=%d our_ota_addr=",
-                  desc->conn_handle, desc->our_ota_addr.type);
+                 desc->conn_handle, desc->our_ota_addr.type);
      print_addr(desc->our_ota_addr.val);
      BLESPLIT_LOG(INFO, " our_id_addr_type=%d our_id_addr=",
-                  desc->our_id_addr.type);
+                 desc->our_id_addr.type);
      print_addr(desc->our_id_addr.val);
      BLESPLIT_LOG(INFO, " peer_ota_addr_type=%d peer_ota_addr=",
-                  desc->peer_ota_addr.type);
+                 desc->peer_ota_addr.type);
      print_addr(desc->peer_ota_addr.val);
      BLESPLIT_LOG(INFO, " peer_id_addr_type=%d peer_id_addr=",
-                  desc->peer_id_addr.type);
+                 desc->peer_id_addr.type);
      print_addr(desc->peer_id_addr.val);
      BLESPLIT_LOG(INFO, " conn_itvl=%d conn_latency=%d supervision_timeout=%d "
 -                "encrypted=%d authenticated=%d bonded=%d\n",
 -                desc->conn_itvl, desc->conn_latency,
 -                desc->supervision_timeout,
 -                desc->sec_state.encrypted,
 -                desc->sec_state.authenticated,
 -                desc->sec_state.bonded);
 +                 "encrypted=%d authenticated=%d bonded=%d\n",
 +                 desc->conn_itvl, desc->conn_latency,
 +                 desc->supervision_timeout,
 +                 desc->sec_state.encrypted,
 +                 desc->sec_state.authenticated,
 +                 desc->sec_state.bonded);
  }
  
  /**

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/57a5bb60/net/nimble/host/test/src/ble_hs_test_util.c
----------------------------------------------------------------------


Mime
View raw message