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 257:9258cc0a200d, committed 2014-07-15

Comitter:
mbed_official
Date:
Tue Jul 15 21:15:07 2014 +0100
Parent:
256:76fd9a263045
Child:
258:2a0bf79294ef
Commit message:
Synchronized with git revision c785460107cddf4e98247498c782f397368743e7

Full URL: https://github.com/mbedmicro/mbed/commit/c785460107cddf4e98247498c782f397368743e7/

[HAL] Fix for asserts LPC15xx, NRF51822

Changed in this revision

targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c Show annotated file Show diff for this revision Revisions of this file 
--- a/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c	Tue Jul 15 07:45:08 2014 +0100
+++ b/targets/hal/TARGET_NORDIC/TARGET_NRF51822/spi_api.c	Tue Jul 15 21:15:07 2014 +0100
@@ -69,7 +69,7 @@
         obj->spi = (NRF_SPI_Type*)NC;
         obj->spis = (NRF_SPIS_Type*)spi;
     }
-    MBED_ASSERT((int)obj->spi != NC && (int)obj->spis != NC);
+    MBED_ASSERT((int)obj->spi != NC || (int)obj->spis != NC);
 
       // pin out the spi pins
     if (ssel != NC) {//slave

--- a/targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c	Tue Jul 15 07:45:08 2014 +0100
+++ b/targets/hal/TARGET_NXP/TARGET_LPC15XX/i2c_api.c	Tue Jul 15 21:15:07 2014 +0100
@@ -41,7 +41,7 @@
 }
 
 void i2c_init(i2c_t *obj, PinName sda, PinName scl) {
-    MBED_ASSERT((sda == P0_23) || (scl == P0_22));
+    MBED_ASSERT((sda == P0_23) && (scl == P0_22));
     
     // Enables clock for I2C0
     LPC_SYSCON->SYSAHBCLKCTRL1 |= (1 << 13);