You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by we...@apache.org on 2016/06/28 16:46:31 UTC
[6/9] incubator-mynewt-core git commit: Merge remote-tracking branch
'origin/090_dev'
Merge remote-tracking branch 'origin/090_dev'
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/8b331089
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/8b331089
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/8b331089
Branch: refs/heads/develop
Commit: 8b331089296019c6cf4f15d8d820c95fb1048e8b
Parents: ba465e8 054efdb
Author: Christopher Collins <cc...@apache.org>
Authored: Tue Jun 14 19:10:01 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Tue Jun 14 19:10:01 2016 -0700
----------------------------------------------------------------------
.rat-excludes | 2 +
LICENSE | 2 +
README.md | 38 +-
RELEASE_NOTES.md | 28 +-
apps/bleprph/src/bleprph.h | 21 +-
apps/bleprph/src/gatt_svr.c | 155 ++++++-
apps/bleprph/src/keystore.c | 100 +++++
apps/bleprph/src/main.c | 144 +++++--
apps/bletiny/pkg.yml | 5 +
apps/bletiny/src/bletiny_priv.h | 23 +-
apps/bletiny/src/cmd.c | 55 +--
apps/bletiny/src/gatt_svr.c | 457 +++++++++++++++++++++
apps/bletiny/src/keystore.c | 100 +++++
apps/bletiny/src/main.c | 260 ++++--------
apps/bletiny/src/periph.c | 344 ----------------
net/nimble/host/include/host/ble_att.h | 17 +-
net/nimble/host/include/host/ble_gatt.h | 9 +-
net/nimble/host/src/ble_att_clt.c | 48 +--
net/nimble/host/src/ble_att_svr.c | 64 +--
net/nimble/host/src/ble_eddystone.c | 4 +-
net/nimble/host/src/ble_gap.c | 32 +-
net/nimble/host/src/ble_gattc.c | 64 +--
net/nimble/host/src/ble_gatts.c | 35 +-
net/nimble/host/src/ble_hs_adv.c | 4 +-
net/nimble/host/src/ble_hs_cfg.c | 6 +-
net/nimble/host/src/ble_hs_conn.c | 22 +-
net/nimble/host/src/ble_l2cap_sm.c | 13 +-
net/nimble/host/src/ble_l2cap_sm_alg.c | 2 +-
net/nimble/host/src/ble_l2cap_sm_cmd.c | 2 +-
net/nimble/host/src/ble_l2cap_sm_priv.h | 4 +-
net/nimble/host/src/test/ble_gatt_conn_test.c | 4 +-
net/nimble/host/src/test/ble_l2cap_sm_test.c | 4 +-
net/nimble/include/nimble/nimble_opt.h | 13 +-
33 files changed, 1278 insertions(+), 803 deletions(-)
----------------------------------------------------------------------