Get arduino primo building

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

Branch: refs/heads/develop
Commit: 96e85a1eb933ed84b1f00c7ac06f9c78f9a98778
Parents: b2bf7ad
Author: William San Filippo <wi...@runtime.io>
Authored: Thu Sep 22 22:53:37 2016 -0700
Committer: William San Filippo <wi...@runtime.io>
Committed: Thu Sep 22 22:57:00 2016 -0700

----------------------------------------------------------------------
 hw/bsp/arduino_primo_nrf52/src/os_bsp.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/96e85a1e/hw/bsp/arduino_primo_nrf52/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/arduino_primo_nrf52/src/os_bsp.c 
b/hw/bsp/arduino_primo_nrf52/src/os_bsp.c
index 49249c7..6c2c2c4 100644
--- a/hw/bsp/arduino_primo_nrf52/src/os_bsp.c
+++ b/hw/bsp/arduino_primo_nrf52/src/os_bsp.c
@@ -41,9 +41,12 @@
 #include "app_util_platform.h"
 #include "nrf.h"
 #include "app_error.h"
-#include "adc_nrf52/adc_nrf52.h"
 #include "nrf_drv_saadc.h"
 
+#if MYNEWT_VAL(ADC_0)
+#include "adc_nrf52/adc_nrf52.h"
+#endif
+
 static struct flash_area bsp_flash_areas[] = {
     [FLASH_AREA_BOOTLOADER] = {
         .fa_flash_id = 0,       /* internal flash */
@@ -163,8 +166,8 @@ bsp_init(void)
 #endif
 
 #if MYNEWT_VAL(SPI_SLAVE)
-    /*  We initialize one SPI interface as a master. */
-    spi_cfg.csn_pin = SPIS0_CONFIG_CSN_PIN;
+    spi_cfg.csn_pin = SPI_SS_PIN;
+    spi_cfg.csn_pullup = NRF_GPIO_PIN_PULLUP;
     rc = hal_spi_init(0, &spi_cfg, HAL_SPI_TYPE_SLAVE);
     assert(rc == 0);
 #endif

Reply via email to