You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by st...@apache.org on 2016/05/05 15:18:26 UTC
[2/2] incubator-mynewt-core git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-mynewt-core into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-mynewt-core into develop
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/e080c3c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/e080c3c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/e080c3c4
Branch: refs/heads/develop
Commit: e080c3c4c6e1b7102550d597dcdb042f0043577b
Parents: 5c87fec 8051041
Author: Sterling Hughes <st...@apache.org>
Authored: Thu May 5 08:18:15 2016 -0700
Committer: Sterling Hughes <st...@apache.org>
Committed: Thu May 5 08:18:15 2016 -0700
----------------------------------------------------------------------
apps/bleprph/src/main.c | 2 +-
apps/bletest/src/main.c | 23 +-
apps/bletiny/src/bletiny_priv.h | 4 +-
apps/bletiny/src/cmd.c | 100 ++++
apps/bletiny/src/main.c | 14 +-
apps/bletiny/src/parse.c | 18 +-
.../controller/include/controller/ble_ll_conn.h | 2 +-
.../controller/include/controller/ble_phy.h | 3 +
net/nimble/controller/src/ble_ll.c | 5 +-
net/nimble/controller/src/ble_ll_adv.c | 81 ++--
net/nimble/controller/src/ble_ll_conn.c | 33 +-
net/nimble/drivers/nrf51/src/ble_phy.c | 21 +-
net/nimble/drivers/nrf52/src/ble_phy.c | 20 +-
net/nimble/host/include/host/ble_att.h | 1 +
net/nimble/host/include/host/ble_gap.h | 21 +-
net/nimble/host/include/host/ble_gatt.h | 3 +
net/nimble/host/include/host/ble_hs.h | 11 +-
net/nimble/host/include/host/ble_hs_adv.h | 2 +-
net/nimble/host/include/host/ble_l2cap.h | 19 +-
net/nimble/host/src/ble_att_svr.c | 89 +++-
net/nimble/host/src/ble_gap.c | 34 ++
net/nimble/host/src/ble_gap_priv.h | 6 +-
net/nimble/host/src/ble_gatts.c | 11 +-
net/nimble/host/src/ble_hs_cfg.c | 4 +-
net/nimble/host/src/ble_ibeacon.c | 4 +-
net/nimble/host/src/ble_l2cap_sm.c | 474 ++++++++++++++-----
net/nimble/host/src/ble_l2cap_sm_cmd.c | 6 +-
net/nimble/host/src/test/ble_l2cap_sm_test.c | 30 +-
net/nimble/include/nimble/ble.h | 6 +
net/nimble/src/util.c | 84 ++++
30 files changed, 871 insertions(+), 260 deletions(-)
----------------------------------------------------------------------