Adam Kucybala / mbed-src

mbed library sources

Fork of mbed-src by mbed official

Files at this revision

API Documentation at this revision

Revision 177:d57c40a064c8, committed 2014-05-01

Comitter:
mbed_official
Date:
Thu May 01 13:00:08 2014 +0100
Parent:
176:2d0c9ad7ef62
Child:
178:a873352662d8
Commit message:
Synchronized with git revision 60b6b2c007da93422c82ac43775895d0314c00d8

Full URL: https://github.com/mbedmicro/mbed/commit/60b6b2c007da93422c82ac43775895d0314c00d8/

Update with I2C fix

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
targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/PinNames.h Show annotated file Show diff for this revision Revisions of this file 
--- a/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c	Tue Apr 29 17:15:06 2014 +0100
+++ b/targets/hal/TARGET_NORDIC/TARGET_NRF51822/i2c_api.c	Thu May 01 13:00:08 2014 +0100
@@ -128,16 +128,17 @@
 
 int i2c_do_read(i2c_t *obj, char * data, int last) {
     int timeOut = 100000;
+
+    if (last){
+        obj->i2c->TASKS_STOP = 1;
+    }
     while(!obj->i2c->EVENTS_RXDREADY){
         timeOut--;
         if(timeOut<0)
             return 1;
     }
     obj->i2c->EVENTS_RXDREADY       = 0;
-
-    if (last){
-        obj->i2c->TASKS_STOP = 1;
-    }
+    
     *data = obj->i2c->RXD;
     
     for(int i=0;i<320;i++){

--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/PinNames.h	Tue Apr 29 17:15:06 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/PinNames.h	Thu May 01 13:00:08 2014 +0100
@@ -104,8 +104,6 @@
     PC_14 = 0x2E,
     PC_15 = 0x2F,
 
-    PD_0  = 0x30,
-    PD_1  = 0x31,
     PD_2  = 0x32,
 
     // Arduino connector namings