You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/04/28 02:14:02 UTC

[03/50] [abbrv] incubator-mynewt-core git commit: Add support for 1 megabaud for nrf UART.

Add support for 1 megabaud for nrf UART.


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/27605cb1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/27605cb1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/27605cb1

Branch: refs/heads/master
Commit: 27605cb1c0ed6e82bf75ccb0019c4a1e6de1e22d
Parents: a590265
Author: Christopher Collins <cc...@apache.org>
Authored: Mon Apr 18 23:59:37 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Apr 18 23:59:37 2016 -0700

----------------------------------------------------------------------
 hw/mcu/nordic/nrf51xxx/src/hal_uart.c | 2 ++
 hw/mcu/nordic/nrf52xxx/src/hal_uart.c | 2 ++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/27605cb1/hw/mcu/nordic/nrf51xxx/src/hal_uart.c
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/nrf51xxx/src/hal_uart.c b/hw/mcu/nordic/nrf51xxx/src/hal_uart.c
index 06d2490..798c2df 100644
--- a/hw/mcu/nordic/nrf51xxx/src/hal_uart.c
+++ b/hw/mcu/nordic/nrf51xxx/src/hal_uart.c
@@ -209,6 +209,8 @@ hal_uart_baudrate(int baudrate)
         return UART_BAUDRATE_BAUDRATE_Baud460800;
     case 921600:
         return UART_BAUDRATE_BAUDRATE_Baud921600;
+    case 1000000:
+        return UART_BAUDRATE_BAUDRATE_Baud1M;
     default:
         return 0;
     }

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/27605cb1/hw/mcu/nordic/nrf52xxx/src/hal_uart.c
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/nrf52xxx/src/hal_uart.c b/hw/mcu/nordic/nrf52xxx/src/hal_uart.c
index 5e7adac..4986100 100644
--- a/hw/mcu/nordic/nrf52xxx/src/hal_uart.c
+++ b/hw/mcu/nordic/nrf52xxx/src/hal_uart.c
@@ -210,6 +210,8 @@ hal_uart_baudrate(int baudrate)
         return UARTE_BAUDRATE_BAUDRATE_Baud460800;
     case 921600:
         return UARTE_BAUDRATE_BAUDRATE_Baud921600;
+    case 1000000:
+        return UARTE_BAUDRATE_BAUDRATE_Baud1M;
     default:
         return 0;
     }