Revision 20:6bf7f0bb0f66, committed 2015-11-11

Comitter:

mbed_official

Date:

Wed Nov 11 07:30:10 2015 +0000

Parent:

19:112740acecfa

Child:

21:37171f377a9e

Commit message:

Synchronized with git revision 638176970036349582692863598e69d16cc39361

Full URL: https://github.com/mbedmicro/mbed/commit/638176970036349582692863598e69d16cc39361/

Change PIN name config for DELTA DFCM NNN40

Changed in this revision

--- a/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/PinNames.h	Tue Nov 10 09:30:11 2015 +0000
+++ b/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/PinNames.h	Wed Nov 11 07:30:10 2015 +0000
@@ -39,17 +39,17 @@
     p5  = 5,
     p6  = 6,
     p7  = 7,
-    p8  = NC,
-    p9  = NC,
-    p10 = NC,
-    p11 = NC,
-    p12 = NC,
+    p8  = 8,
+    p9  = 9,
+    p10 = 10,
+    p11 = 11,
+    p12 = 12,
     p13 = 13,
-    p14 = NC,
-    p15 = NC,
+    p14 = 14,
+    p15 = 15,
     p16 = 16,
     p17 = 17,
-    p18 = NC,
+    p18 = 18,
     p19 = 19,
     p20 = 20,
     p21 = 21,
@@ -59,13 +59,15 @@
     p25 = 25,
     p26 = 26,
     p27 = 27,
-    p28 = NC,
+    p28 = 28,
     p29 = 29,
     p30 = 30,
     p31 = 31,
 
-    LED1    = p7,
-    LED2    = p13,
+    LED1    = p4,
+    LED2    = p5,
+    LED3    = p6,
+    LED4    = p13,
 
     BUTTON0 = p16,
     BUTTON1 = p17,
@@ -79,23 +81,22 @@
 
     SPI_PSELMOSI0 = p24,
     SPI_PSELMISO0 = p29,
-    SPI_PSELSS0   = p6,
+    SPI_PSELSS0   = p30,
     SPI_PSELSCK0  = p21,
 
     SPIS_PSELMOSI = p24,
     SPIS_PSELMISO = p29,
-    SPIS_PSELSS   = p6,
+    SPIS_PSELSS   = p30,
     SPIS_PSELSCK  = p21,
 
     I2C_SDA0 = p22,
     I2C_SCL0 = p20,
 
-    A0  = p1,
-    A1  = p2,
-    A2  = p3,
-    A3  = p4,
-    A4  = p5,
-    A5  = p6,
+    A0  = p26,
+    A1  = p27,
+    A2  = p4,
+    A3  = p5,
+    A4  = p6,
 
     SWIO = p19,
     VERF0 = p0,
@@ -112,8 +113,7 @@
     SPI_PSELMISO1 = NC,
     SPI_PSELSS1   = NC,
     SPI_PSELSCK1  = NC,
-    LED3          = NC,
-    LED4          = NC
+    A5  = NC
 } PinName;
 
 typedef enum {

--- a/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/mbed_overrides.c	Tue Nov 10 09:30:11 2015 +0000
+++ b/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_DELTA_DFCM_NNN40/mbed_overrides.c	Wed Nov 11 07:30:10 2015 +0000
@@ -16,7 +16,8 @@
 
 #include "cmsis.h"
 
-
+/* No init flash in this version, 2015/10/27 */
+#if 0
 #define SPIM1_SCK_PIN       11u     /**< SPI clock GPIO pin number. */
 #define SPIM1_MOSI_PIN      15u     /**< SPI Master Out Slave In GPIO pin number. */
 #define SPIM1_MISO_PIN      9u     /**< SPI Master In Slave Out GPIO pin number. */
@@ -95,6 +96,8 @@
     //wait for sleep
     //wait_us(3);
 }
+/* No init flash in this version, 2015/10/27 */
+#endif
 
 void mbed_sdk_init()
 {
@@ -115,9 +118,11 @@
     {// Do nothing.
     }
 	
-	flash_init();
-	
-	//nrf_delay_ms(10);
-	flash_powerDown();
+/* No init flash in this version, 2015/10/27 */
+//  flash_init();
+//  
+//  //nrf_delay_ms(10);
+//  flash_powerDown();
+/* No init flash in this version, 2015/10/27 */
 	
 }