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/04/08 20:14:12 UTC
[7/7] incubator-mynewt-core git commit: Merge remote-tracking branch
'vrahane/develop' into develop
Merge remote-tracking branch 'vrahane/develop' into develop
This closes #33.
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/25152089
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/25152089
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/25152089
Branch: refs/heads/develop
Commit: 251520894dc708610efe569a16738a27e99e94a4
Parents: 46849c5 905b851
Author: Christopher Collins <cc...@apache.org>
Authored: Fri Apr 8 11:13:14 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Fri Apr 8 11:13:14 2016 -0700
----------------------------------------------------------------------
apps/slinky/src/main.c | 27 ++--
hw/hal/include/hal/hal_gpio.h | 74 +++++-----
hw/mcu/native/src/hal_gpio.c | 8 +-
hw/mcu/nordic/nrf51xxx/src/hal_gpio.c | 212 +++++++++++++--------------
hw/mcu/nordic/nrf52xxx/src/hal_gpio.c | 212 +++++++++++++--------------
hw/mcu/stm/stm32f4xx/src/hal_gpio.c | 228 ++++++++++++++---------------
libs/json/include/json/json.h | 2 +-
libs/json/src/json_encode.c | 22 +--
libs/newtmgr/src/newtmgr.c | 2 +-
sys/log/src/log_nmgr.c | 39 ++++-
10 files changed, 438 insertions(+), 388 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/25152089/apps/slinky/src/main.c
----------------------------------------------------------------------