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 278:6d89e6c1dc52, committed 2014-08-31

Comitter:
janekm
Date:
Sun Aug 31 22:14:49 2014 +0000
Parent:
266:69e8a32876bd
Commit message:
dunno;

Changed in this revision

targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c Show annotated file Show diff for this revision Revisions of this file 
--- a/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c	Thu Jul 24 12:00:06 2014 +0100
+++ b/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c	Sun Aug 31 22:14:49 2014 +0000
@@ -19,13 +19,13 @@
 #include "pinmap.h"
 
 static const PinMap PinMap_I2C_SDA[] = {
-    {p22, I2C_0, 1},
+    {p10, I2C_0, 1},
     {p13, I2C_1, 2},
     {NC  , NC   , 0}
 };
 
 static const PinMap PinMap_I2C_SCL[] = {
-    {p20, I2C_0, 1},
+    {p11, I2C_0, 1},
     {p15, I2C_1, 2},
     {NC  , NC,    0}
 };
@@ -39,13 +39,13 @@
 void twi_master_init(i2c_t *obj, PinName sda, PinName scl, int frequency) {
     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));