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/02/20 05:13:20 UTC
[1/2] incubator-mynewt-larva git commit: This closes #5
Repository: incubator-mynewt-larva
Updated Branches:
refs/heads/develop cf9e78db7 -> 3ffb81b5b
This closes #5
Squashed commit of the following:
commit 60a1d53afaf130267844abf1b1da14db060cc8d9
Author: Gordon Chaffee <go...@runtime.io>
Date: Thu Feb 18 10:58:40 2016 -0800
Make constants consistent between newt and larva repos
NMGR_ID_TASKSTAT => NMGR_ID_TASKSTATS
NMGR_ID_MPSTAT => NMGR_ID_MPSTATS
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/commit/7895e857
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/7895e857
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/7895e857
Branch: refs/heads/develop
Commit: 7895e8571e31ef3ada948a6d7f78231697061fd7
Parents: 741cd7d
Author: Sterling Hughes <st...@apache.org>
Authored: Fri Feb 19 20:12:11 2016 -0800
Committer: Sterling Hughes <st...@apache.org>
Committed: Fri Feb 19 20:12:11 2016 -0800
----------------------------------------------------------------------
libs/newtmgr/include/newtmgr/newtmgr.h | 4 ++--
libs/newtmgr/src/newtmgr.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/7895e857/libs/newtmgr/include/newtmgr/newtmgr.h
----------------------------------------------------------------------
diff --git a/libs/newtmgr/include/newtmgr/newtmgr.h b/libs/newtmgr/include/newtmgr/newtmgr.h
index f53f497..4fd7e8a 100644
--- a/libs/newtmgr/include/newtmgr/newtmgr.h
+++ b/libs/newtmgr/include/newtmgr/newtmgr.h
@@ -55,8 +55,8 @@
*/
#define NMGR_ID_ECHO 0
#define NMGR_ID_CONS_ECHO_CTRL 1
-#define NMGR_ID_TASKSTAT 2
-#define NMGR_ID_MPSTAT 3
+#define NMGR_ID_TASKSTATS 2
+#define NMGR_ID_MPSTATS 3
struct nmgr_hdr {
uint8_t nh_op;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/7895e857/libs/newtmgr/src/newtmgr.c
----------------------------------------------------------------------
diff --git a/libs/newtmgr/src/newtmgr.c b/libs/newtmgr/src/newtmgr.c
index e9efcd7..1ea385a 100644
--- a/libs/newtmgr/src/newtmgr.c
+++ b/libs/newtmgr/src/newtmgr.c
@@ -54,8 +54,8 @@ static struct nmgr_group nmgr_def_group;
static const struct nmgr_handler nmgr_def_group_handlers[] = {
[NMGR_ID_ECHO] = {nmgr_def_echo, nmgr_def_echo},
[NMGR_ID_CONS_ECHO_CTRL] = {nmgr_def_console_echo, nmgr_def_console_echo},
- [NMGR_ID_TASKSTAT] = {nmgr_def_taskstat_read, NULL},
- [NMGR_ID_MPSTAT] = {nmgr_def_mpstat_read, NULL},
+ [NMGR_ID_TASKSTATS] = {nmgr_def_taskstat_read, NULL},
+ [NMGR_ID_MPSTATS] = {nmgr_def_mpstat_read, NULL},
};
/* JSON buffer for NMGR task
[2/2] incubator-mynewt-larva git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva into develop
Posted by st...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/commit/3ffb81b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/3ffb81b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/3ffb81b5
Branch: refs/heads/develop
Commit: 3ffb81b5b020c9c4638f0b7192092c2801a96a11
Parents: 7895e85 cf9e78d
Author: Sterling Hughes <st...@apache.org>
Authored: Fri Feb 19 20:13:10 2016 -0800
Committer: Sterling Hughes <st...@apache.org>
Committed: Fri Feb 19 20:13:10 2016 -0800
----------------------------------------------------------------------
net/nimble/host/include/host/ble_gap.h | 8 +-
net/nimble/host/src/ble_gap.c | 131 +++++++--------
net/nimble/host/src/ble_gap_priv.h | 2 +-
net/nimble/host/src/ble_gattc.c | 238 ++++++++++++++++++++++++++-
net/nimble/host/src/test/ble_gap_test.c | 19 +--
project/bletiny/src/main.c | 3 +-
6 files changed, 309 insertions(+), 92 deletions(-)
----------------------------------------------------------------------