Janek Mann / mbed-src-openwear

mbed library sources modified for open wear

Dependents:   openwear-lifelogger-example

Fork of mbed-src by mbed official

Files at this revision

API Documentation at this revision

Revision 307:b1463675c899, committed 2014-09-02

Comitter:
janekm
Date:
Tue Sep 02 21:14:02 2014 +0000
Parent:
306:1f0269907d8b
Child:
308:61b24bcb4679
Commit message:
RC oscillator, I2C pins & pullups

Changed in this revision

targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/system_nrf51822.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51822_MKIT/PinNames.h Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/i2c_api.c Show annotated file Show diff for this revision Revisions of this file 
--- a/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/system_nrf51822.c	Fri Aug 29 20:45:07 2014 +0100
+++ b/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/system_nrf51822.c	Tue Sep 02 21:14:02 2014 +0000
@@ -62,7 +62,7 @@
     }
 
     // Start the external 32khz crystal oscillator.
-    NRF_CLOCK->LFCLKSRC             = (CLOCK_LFCLKSRC_SRC_Xtal << CLOCK_LFCLKSRC_SRC_Pos);
+    NRF_CLOCK->LFCLKSRC             = (CLOCK_LFCLKSRC_SRC_RC << CLOCK_LFCLKSRC_SRC_Pos);
     NRF_CLOCK->EVENTS_LFCLKSTARTED  = 0;
     NRF_CLOCK->TASKS_LFCLKSTART     = 1;
 

--- a/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51822_MKIT/PinNames.h	Fri Aug 29 20:45:07 2014 +0100
+++ b/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51822_MKIT/PinNames.h	Tue Sep 02 21:14:02 2014 +0000
@@ -130,8 +130,8 @@
     SPIS_PSELSS = p14,    
     SPIS_PSELSCK = p15,
 
-    I2C_SDA0 = p22,
-    I2C_SCL0 = p20,
+    I2C_SDA0 = p7,
+    I2C_SCL0 = p6,
 
     I2C_SDA1 = p13,
     I2C_SCL1 = p15,

--- a/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/i2c_api.c	Fri Aug 29 20:45:07 2014 +0100
+++ b/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/i2c_api.c	Tue Sep 02 21:14:02 2014 +0000
@@ -19,13 +19,13 @@
 #include "pinmap.h"
 
 static const PinMap PinMap_I2C_SDA[] = {
-    {p22, I2C_0, 1},
+    {p7, I2C_0, 1},
     {p13, I2C_1, 2},
     {NC, NC, 0}
 };
 
 static const PinMap PinMap_I2C_SCL[] = {
-    {p20, I2C_0, 1},
+    {p6, I2C_0, 1},
     {p15, I2C_1, 2},
     {NC, NC,    0}
 };
@@ -41,13 +41,13 @@
 {
     NRF_GPIO->PIN_CNF[scl] = ((GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) |
                               (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) |
-                              (GPIO_PIN_CNF_PULL_Disabled << GPIO_PIN_CNF_PULL_Pos) |
+                              (GPIO_PIN_CNF_PULL_Pullup << GPIO_PIN_CNF_PULL_Pos) |
                               (GPIO_PIN_CNF_DRIVE_S0D1 << GPIO_PIN_CNF_DRIVE_Pos) |
                               (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos));
 
     NRF_GPIO->PIN_CNF[sda] = ((GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) |
                               (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) |
-                              (GPIO_PIN_CNF_PULL_Disabled << GPIO_PIN_CNF_PULL_Pos) |
+                              (GPIO_PIN_CNF_PULL_Pullup << GPIO_PIN_CNF_PULL_Pos) |
                               (GPIO_PIN_CNF_DRIVE_S0D1 << GPIO_PIN_CNF_DRIVE_Pos) |
                               (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos));