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 2017/04/29 00:23:18 UTC
[1/2] incubator-mynewt-core git commit: Add I2C support in BLE nano
BSP
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/master 2c8cdfb46 -> 369df92d3
Add I2C support in BLE nano BSP
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/6e75818f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/6e75818f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/6e75818f
Branch: refs/heads/master
Commit: 6e75818f224e6e384e64813eadb0db69777f1a6e
Parents: eb4f289
Author: Antoine Albertelli <an...@antoinealb.net>
Authored: Fri Apr 28 10:32:50 2017 +0200
Committer: Antoine Albertelli <an...@antoinealb.net>
Committed: Fri Apr 28 10:33:21 2017 +0200
----------------------------------------------------------------------
hw/bsp/nrf51-blenano/src/hal_bsp.c | 31 +++++++++++++++++++++++++++++++
hw/bsp/nrf51-blenano/syscfg.yml | 26 ++++++++++++++++++++++++++
2 files changed, 57 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/6e75818f/hw/bsp/nrf51-blenano/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-blenano/src/hal_bsp.c b/hw/bsp/nrf51-blenano/src/hal_bsp.c
index 3f47f78..97b5004 100644
--- a/hw/bsp/nrf51-blenano/src/hal_bsp.c
+++ b/hw/bsp/nrf51-blenano/src/hal_bsp.c
@@ -32,6 +32,10 @@
#include "hal/hal_spi.h"
#include "os/os_dev.h"
+#if MYNEWT_VAL(I2C_0) || MYNEWT_VAL(I2C_1)
+#include "hal/hal_i2c.h"
+#endif
+
#if MYNEWT_VAL(UART_0)
#include "uart/uart.h"
#include "uart_hal/uart_hal.h"
@@ -66,6 +70,23 @@ static const struct nrf51_hal_spi_cfg os_bsp_spi1s_cfg = {
};
#endif
+#if MYNEWT_VAL(I2C_0)
+static const struct nrf51_hal_i2c_cfg os_bsp_i2c0_cfg = {
+ .sda_pin = MYNEWT_VAL(I2C_0_SDA_PIN),
+ .scl_pin = MYNEWT_VAL(I2C_0_SCL_PIN),
+ .i2c_frequency = MYNEWT_VAL(I2C_0_FREQUENCY),
+};
+#endif
+
+#if MYNEWT_VAL(I2C_1)
+static const struct nrf51_hal_i2c_cfg os_bsp_i2c1_cfg = {
+ .sda_pin = MYNEWT_VAL(I2C_1_SDA_PIN),
+ .scl_pin = MYNEWT_VAL(I2C_1_SCL_PIN),
+ .i2c_frequency = MYNEWT_VAL(I2C_1_FREQUENCY),
+};
+#endif
+
+
/*
* What memory to include in coredump.
*/
@@ -173,4 +194,14 @@ hal_bsp_init(void)
rc = hal_spi_init(1, (void *)&os_bsp_spi1s_cfg, HAL_SPI_TYPE_SLAVE);
assert(rc == 0);
#endif
+
+#if MYNEWT_VAL(I2C_0)
+ rc = hal_i2c_init(0, (void *)&os_bsp_i2c0_cfg);
+ assert(rc == 0);
+#endif
+
+#if MYNEWT_VAL(I2C_1)
+ rc = hal_i2c_init(1, (void *)&os_bsp_i2c1_cfg);
+ assert(rc == 0);
+#endif
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/6e75818f/hw/bsp/nrf51-blenano/syscfg.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-blenano/syscfg.yml b/hw/bsp/nrf51-blenano/syscfg.yml
index 86128f8..2b128ae 100644
--- a/hw/bsp/nrf51-blenano/syscfg.yml
+++ b/hw/bsp/nrf51-blenano/syscfg.yml
@@ -54,6 +54,32 @@ syscfg.defs:
description: 'SPI 1 slave'
value: 0
+ I2C_0:
+ description: 'I2C0 enable'
+ value: 0
+ I2C_0_SDA_PIN:
+ description: 'Data pin for I2C0'
+ value: 6
+ I2C_0_SCL_PIN:
+ description: 'Clock pin for I2C0'
+ value: 7
+ I2C_0_FREQUENCY:
+ description: 'Bus frequency in KHz for I2C0'
+ value: 100
+
+ I2C_1:
+ description: 'I2C1 enable'
+ value: 0
+ I2C_1_SDA_PIN:
+ description: 'Data pin for I2C1'
+ value: 28
+ I2C_1_SCL_PIN:
+ description: 'Clock pin for I2C1'
+ value: 29
+ I2C_1_FREQUENCY:
+ description: 'Bus frequency in KHz for I2C1'
+ value: 100
+
TIMER_0:
description: 'NRF51 Timer 0'
value: 1
[2/2] incubator-mynewt-core git commit: This closes #252.
Posted by ma...@apache.org.
This closes #252.
Merge branch 'master' of https://github.com/antoinealb/incubator-mynewt-core
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/369df92d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/369df92d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/369df92d
Branch: refs/heads/master
Commit: 369df92d33a8bea2d4d6cb481a9d06aceb2661cd
Parents: 2c8cdfb 6e75818
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Fri Apr 28 17:22:38 2017 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Fri Apr 28 17:22:38 2017 -0700
----------------------------------------------------------------------
hw/bsp/nrf51-blenano/src/hal_bsp.c | 31 +++++++++++++++++++++++++++++++
hw/bsp/nrf51-blenano/syscfg.yml | 26 ++++++++++++++++++++++++++
2 files changed, 57 insertions(+)
----------------------------------------------------------------------