Repository: incubator-mynewt-core Updated Branches: refs/heads/develop 6b55b72c2 -> 868f79dfa
MYNEWT-632; uart1 pin <-> syscfg reversed. 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/868f79df Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/868f79df Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/868f79df Branch: refs/heads/develop Commit: 868f79dfaf7b25eeb5e740dde82cab2c830b59e0 Parents: 6b55b72 Author: Marko Kiiskila <ma...@runtime.io> Authored: Fri Feb 17 16:20:30 2017 -0800 Committer: Marko Kiiskila <ma...@runtime.io> Committed: Fri Feb 17 16:20:30 2017 -0800 ---------------------------------------------------------------------- hw/bsp/arduino_primo_nrf52/src/hal_bsp.c | 4 ++-- hw/bsp/arduino_primo_nrf52/syscfg.yml | 4 ++-- hw/bsp/bmd300eval/src/hal_bsp.c | 4 ++-- hw/bsp/nrf52840pdk/src/hal_bsp.c | 4 ++-- hw/bsp/nrf52dk/src/hal_bsp.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/868f79df/hw/bsp/arduino_primo_nrf52/src/hal_bsp.c ---------------------------------------------------------------------- diff --git a/hw/bsp/arduino_primo_nrf52/src/hal_bsp.c b/hw/bsp/arduino_primo_nrf52/src/hal_bsp.c index 4e77617..4229a88 100644 --- a/hw/bsp/arduino_primo_nrf52/src/hal_bsp.c +++ b/hw/bsp/arduino_primo_nrf52/src/hal_bsp.c @@ -51,8 +51,8 @@ static const struct nrf52_uart_cfg os_bsp_uart0_cfg = { #if MYNEWT_VAL(UART_1) static struct uart_dev os_bsp_bitbang_uart1; static const struct uart_bitbang_conf os_bsp_uart1_cfg = { - .ubc_rxpin = MYNEWT_VAL(UART_1_PIN_TX), - .ubc_txpin = MYNEWT_VAL(UART_1_PIN_RX), + .ubc_txpin = MYNEWT_VAL(UART_1_PIN_TX), + .ubc_rxpin = MYNEWT_VAL(UART_1_PIN_RX), .ubc_cputimer_freq = MYNEWT_VAL(OS_CPUTIME_FREQ), }; #endif http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/868f79df/hw/bsp/arduino_primo_nrf52/syscfg.yml ---------------------------------------------------------------------- diff --git a/hw/bsp/arduino_primo_nrf52/syscfg.yml b/hw/bsp/arduino_primo_nrf52/syscfg.yml index 4408b8b..01d2ded 100644 --- a/hw/bsp/arduino_primo_nrf52/syscfg.yml +++ b/hw/bsp/arduino_primo_nrf52/syscfg.yml @@ -53,10 +53,10 @@ syscfg.defs: value: 1 UART_1_PIN_TX: description: 'TBD' - value: 5 + value: 6 UART_1_PIN_RX: description: 'TBD' - value: 6 + value: 5 UART_1_PIN_RTS: description: 'TBD' value: 0 http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/868f79df/hw/bsp/bmd300eval/src/hal_bsp.c ---------------------------------------------------------------------- diff --git a/hw/bsp/bmd300eval/src/hal_bsp.c b/hw/bsp/bmd300eval/src/hal_bsp.c index 4f6ebb1..03e302a 100644 --- a/hw/bsp/bmd300eval/src/hal_bsp.c +++ b/hw/bsp/bmd300eval/src/hal_bsp.c @@ -46,8 +46,8 @@ static const struct nrf52_uart_cfg os_bsp_uart0_cfg = { #if MYNEWT_VAL(UART_1) static struct uart_dev os_bsp_bitbang_uart1; static const struct uart_bitbang_conf os_bsp_uart1_cfg = { - .ubc_rxpin = MYNEWT_VAL(UART_1_PIN_TX), - .ubc_txpin = MYNEWT_VAL(UART_1_PIN_RX), + .ubc_txpin = MYNEWT_VAL(UART_1_PIN_TX), + .ubc_rxpin = MYNEWT_VAL(UART_1_PIN_RX), .ubc_cputimer_freq = MYNEWT_VAL(OS_CPUTIME_FREQ), }; #endif http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/868f79df/hw/bsp/nrf52840pdk/src/hal_bsp.c ---------------------------------------------------------------------- diff --git a/hw/bsp/nrf52840pdk/src/hal_bsp.c b/hw/bsp/nrf52840pdk/src/hal_bsp.c index c904cdb..a0c78b8 100644 --- a/hw/bsp/nrf52840pdk/src/hal_bsp.c +++ b/hw/bsp/nrf52840pdk/src/hal_bsp.c @@ -49,8 +49,8 @@ static const struct nrf52_uart_cfg os_bsp_uart0_cfg = { #if MYNEWT_VAL(UART_1) static struct uart_dev os_bsp_bitbang_uart1; static const struct uart_bitbang_conf os_bsp_uart1_cfg = { - .ubc_rxpin = MYNEWT_VAL(UART_1_PIN_TX), - .ubc_txpin = MYNEWT_VAL(UART_1_PIN_RX), + .ubc_txpin = MYNEWT_VAL(UART_1_PIN_TX), + .ubc_rxpin = MYNEWT_VAL(UART_1_PIN_RX), .ubc_cputimer_freq = MYNEWT_VAL(OS_CPUTIME_FREQ), }; #endif http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/868f79df/hw/bsp/nrf52dk/src/hal_bsp.c ---------------------------------------------------------------------- diff --git a/hw/bsp/nrf52dk/src/hal_bsp.c b/hw/bsp/nrf52dk/src/hal_bsp.c index 40ce57b..1ab37e1 100644 --- a/hw/bsp/nrf52dk/src/hal_bsp.c +++ b/hw/bsp/nrf52dk/src/hal_bsp.c @@ -56,8 +56,8 @@ static const struct nrf52_uart_cfg os_bsp_uart0_cfg = { #if MYNEWT_VAL(UART_1) static struct uart_dev os_bsp_bitbang_uart1; static const struct uart_bitbang_conf os_bsp_uart1_cfg = { - .ubc_rxpin = MYNEWT_VAL(UART_1_PIN_TX), - .ubc_txpin = MYNEWT_VAL(UART_1_PIN_RX), + .ubc_txpin = MYNEWT_VAL(UART_1_PIN_TX), + .ubc_rxpin = MYNEWT_VAL(UART_1_PIN_RX), .ubc_cputimer_freq = MYNEWT_VAL(OS_CPUTIME_FREQ), }; #endif