Steve Kim / mbed-src

mbed library sources(for async_print)

Dependents:   AsyncPrint

Fork of mbed-src by mbed official

Files at this revision

API Documentation at this revision

Revision 546:a843b1cd80b8, committed 2015-05-22

Comitter:
mbed_official
Date:
Fri May 22 08:45:08 2015 +0100
Parent:
545:5112d5ae6723
Child:
547:88c982c8f758
Commit message:
Synchronized with git revision e55fa60b4f31196e0723898ea25099bf4e28d92f

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

Maxim Integrated platform max32600 updates

Changed in this revision

targets/hal/TARGET_Maxim/TARGET_MAX32600/TARGET_MAX32600MBED/PinNames.h Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_Maxim/TARGET_MAX32600/spi_api.c Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_Maxim/TARGET_MAX32610/spi_api.c Show annotated file Show diff for this revision Revisions of this file 
--- a/targets/hal/TARGET_Maxim/TARGET_MAX32600/TARGET_MAX32600MBED/PinNames.h	Thu May 21 10:00:09 2015 +0100
+++ b/targets/hal/TARGET_Maxim/TARGET_MAX32600/TARGET_MAX32600MBED/PinNames.h	Fri May 22 08:45:08 2015 +0100
@@ -170,10 +170,10 @@
     AOUT_CO = (0xF << PORT_SHIFT) | 2,
     AOUT_DO = (0xF << PORT_SHIFT) | 3,
 
-    LED_GREEN  = P7_4,
-    LED_RED    = P7_0,
-    LED_YELLOW = P6_6,
-    LED_BLUE   = P7_6,
+    LED_GREEN  = P6_6,
+    LED_RED    = P7_1,
+    LED_YELLOW = P7_0,
+    LED_BLUE   = P6_7,
 
     // mbed original LED naming
     LED1 = LED_RED,

--- a/targets/hal/TARGET_Maxim/TARGET_MAX32600/spi_api.c	Thu May 21 10:00:09 2015 +0100
+++ b/targets/hal/TARGET_Maxim/TARGET_MAX32600/spi_api.c	Fri May 22 08:45:08 2015 +0100
@@ -115,7 +115,7 @@
 void spi_frequency(spi_t *obj, int hz)
 {
     // Maximum frequency is half the system frequency
-    MBED_ASSERT((unsigned int)hz < (SystemCoreClock / 2));
+    MBED_ASSERT((unsigned int)hz <= (SystemCoreClock / 2));
     unsigned clocks = ((SystemCoreClock/2)/(hz));
 
     // Figure out the divider ratio

--- a/targets/hal/TARGET_Maxim/TARGET_MAX32610/spi_api.c	Thu May 21 10:00:09 2015 +0100
+++ b/targets/hal/TARGET_Maxim/TARGET_MAX32610/spi_api.c	Fri May 22 08:45:08 2015 +0100
@@ -115,7 +115,7 @@
 void spi_frequency(spi_t *obj, int hz)
 {
     // Maximum frequency is half the system frequency
-    MBED_ASSERT((unsigned int)hz < (SystemCoreClock / 2));
+    MBED_ASSERT((unsigned int)hz <= (SystemCoreClock / 2));
     unsigned clocks = ((SystemCoreClock/2)/(hz));
 
     // Figure out the divider ratio