You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/01/04 13:56:05 UTC
[incubator-nuttx] 01/01: Merge branch 'master' of
github.com:apache/incubator-nuttx into netlink_crypto
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch pr35
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 4abb644003856fd547be7d370b93f8f92fbb8b7d
Merge: a1e27bf 9e091d2
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Sat Jan 4 07:55:37 2020 -0600
Merge branch 'master' of github.com:apache/incubator-nuttx into netlink_crypto
TODO | 80 ++-
arch/arm/src/lc823450/lc823450_usbdev.c | 10 +-
arch/arm/src/nrf52/hardware/nrf52_gpio.h | 2 +
arch/arm/src/nrf52/hardware/nrf52_gpiote.h | 99 ++++
arch/arm/src/nrf52/hardware/nrf52_saadc.h | 221 +++++++
arch/arm/src/nrf52/hardware/nrf52_spi.h | 26 +-
arch/arm/src/nrf52/hardware/nrf52_twi.h | 22 +-
arch/arm/src/nrf52/hardware/nrf52_uarte.h | 22 +-
arch/arm/src/nrf52/nrf52_gpio.c | 30 +
arch/arm/src/nrf52/nrf52_gpio.h | 10 +
arch/arm/src/nrf52/nrf52_i2c.c | 644 +++++++++++++++++++++
.../arm/src/nrf52/{nrf52_lowputc.h => nrf52_i2c.h} | 107 ++--
arch/arm/src/nrf52/nrf52_lowputc.c | 19 +-
arch/arm/src/nrf52/nrf52_lowputc.h | 6 +-
arch/arm/src/nrf52/nrf52_serial.c | 4 +-
arch/arm/src/sama5/sam_tsd.c | 7 +-
arch/arm/src/stm32/stm32_adc.c | 61 +-
arch/arm/src/stm32l4/stm32l4_otgfshost.c | 5 +
drivers/input/ads7843e.c | 21 +-
drivers/usbhost/usbhost_hidmouse.c | 27 +-
drivers/wireless/lpwan/sx127x/sx127x.c | 508 ++++++++++------
include/nuttx/wireless/lpwan/sx127x.h | 73 +--
22 files changed, 1601 insertions(+), 403 deletions(-)