Revision 586:dfaf40375987, committed 2015-07-08

Comitter:

mbed_official

Date:

Wed Jul 08 15:00:09 2015 +0100

Parent:

585:a1ed5b41f74f

Child:

587:61103edf8a92

Commit message:

Synchronized with git revision 13790ec5ce78baabd51c96ea7fb135e853a490ec

Full URL: https://github.com/mbedmicro/mbed/commit/13790ec5ce78baabd51c96ea7fb135e853a490ec/

update target C029 (pin, clock)

Changed in this revision

--- a/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_C029/hal_tick.c	Wed Jul 08 14:45:08 2015 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_C029/hal_tick.c	Wed Jul 08 15:00:09 2015 +0100
@@ -75,12 +75,8 @@
     // Configure time base
     TimMasterHandle.Instance = TIM_MST;
     TimMasterHandle.Init.Period            = 0xFFFFFFFF;
-	if ( SystemCoreClock == 16000000 ) { 
-		TimMasterHandle.Init.Prescaler         = (uint32_t)( SystemCoreClock / 1000000) - 1; // 1 µs tick
-	} else {
-		TimMasterHandle.Init.Prescaler         = (uint32_t)( SystemCoreClock / 2 / 1000000) - 1; // 1 µs tick
-	}
-    TimMasterHandle.Init.ClockDivision     = 0;
+    TimMasterHandle.Init.Prescaler         = (uint32_t)( SystemCoreClock / 1000000) - 1; // 1 µs tick
+	  TimMasterHandle.Init.ClockDivision     = 0;
     TimMasterHandle.Init.CounterMode       = TIM_COUNTERMODE_UP;
     TimMasterHandle.Init.RepetitionCounter = 0;
     HAL_TIM_OC_Init(&TimMasterHandle);

--- a/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_C029/system_stm32f4xx.c	Wed Jul 08 14:45:08 2015 +0100
+++ b/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_C029/system_stm32f4xx.c	Wed Jul 08 15:00:09 2015 +0100
@@ -138,7 +138,7 @@
   */
 
 /* Select the clock sources (other than HSI) to start with (0=OFF, 1=ON) */
-#define USE_PLL_HSE_EXTC (1) /* Use external clock */
+#define USE_PLL_HSE_EXTC (0) /* Use external clock */
 #define USE_PLL_HSE_XTAL (1) /* Use external xtal */
 
 /**
@@ -612,8 +612,11 @@
   RCC_OscInitStruct.PLL.PLLSource       = RCC_PLLSOURCE_HSE;
   //RCC_OscInitStruct.PLL.PLLM          = 8;             // VCO input clock = 1 MHz (8 MHz / 8)
   //RCC_OscInitStruct.PLL.PLLN          = 400;           // VCO output clock = 400 MHz (1 MHz * 400)
-  RCC_OscInitStruct.PLL.PLLM            = 4;             // VCO input clock = 2 MHz (8 MHz / 4)
-  RCC_OscInitStruct.PLL.PLLN            = 200;           // VCO output clock = 400 MHz (2 MHz * 200)
+  //RCC_OscInitStruct.PLL.PLLM            = 4;             // VCO input clock = 2 MHz (8 MHz / 4)
+  //RCC_OscInitStruct.PLL.PLLN            = 200;           // VCO output clock = 400 MHz (2 MHz * 200)
+  #define VCO_IN_FREQ 2000000
+  RCC_OscInitStruct.PLL.PLLM            = (HSE_VALUE / VCO_IN_FREQ); // VCO input clock = 2 MHz = (24 MHz / 12)
+  RCC_OscInitStruct.PLL.PLLN            = (400000000 / VCO_IN_FREQ); // VCO output clock = 400 MHz = (2 MHz * 200)
   RCC_OscInitStruct.PLL.PLLP            = RCC_PLLP_DIV4; // PLLCLK = 100 MHz (400 MHz / 4)
   RCC_OscInitStruct.PLL.PLLQ            = 9;             // USB clock = 44.44 MHz (400 MHz / 9) --> Not good for USB
   if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)

--- a/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_C029/PinNames.h	Wed Jul 08 14:45:08 2015 +0100
+++ b/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_C029/PinNames.h	Wed Jul 08 15:00:09 2015 +0100
@@ -126,7 +126,7 @@
     P_A17   = PD_12,  // GPIO-3
     P_A18   = PA_3,   // UART-DSR
     // B
-    // C
+	  // C
     P_C5    = PG_4,   // SPI-IRQ
     P_C6    = PE_13,  // SPI-MISO
     P_C8    = PE_12,  // Res
@@ -139,7 +139,7 @@
     P_C16   = PF_7,   // GPIO-7
     P_C17   = PF_1,   // I2C-SCL
     P_C18   = PF_0,   // I2C-SDA
-    // D
+	  // D
     P_D1    = PB_12,  // RMII-TXD0
     P_D2    = PB_13,  // RMII-TXD1
     P_D3    = PB_11,  // RMII-TXEN
@@ -152,27 +152,28 @@
     P_TP7   = PA_13,  // TMS  SWDIO
     P_TP8   = PA_15,  // TDI
     P_TP9   = PA_14,  // TCK  SWCLK
-    P_TP10  = PB_3,   // TDO  
+    P_TP10  = PB_3,   // TDO 
+    //P_TP11,         // BOOT0 		
 
     // Board Pins
     // A0-A5
-    A0      = PF_7,
-    A1      = PF_6,
-    A2      = PA_3,
-    A3      = PC_2,
+    A0      = PF_6,  // AI4
+    A1      = PA_3,  // AI3
+    A2      = PC_2,  // AI12
+    A3      = PF_7,  // LPOCLK, not AI
     A4      = PG_4,  // not AI
     A5      = PB_3,  // not AI
     // D0-D15
-    D0      = PD_9,   // RX
-    D1      = PD_8,   // TX
-    D2      = PA_10,  // RX
-    D3      = PA_11,
-    D4      = PA_12,
+    D0      = PD_9,   // UART3-RX
+    D1      = PD_8,   // UART3-TX
+    D2      = PA_10,  // UART1-RX
+    D3      = PA_11,  // CAN1-RX
+    D4      = PA_12,  // CAN1-TX
     D5      = PA_15,
-    D6      = PD_11,
-    D7      = PD_12,
-    D8      = PA_9,   // TX
-    D9      = PE_9,   // shared with SW1
+    D6      = PD_11,  // UART3-CTS
+    D7      = PD_12,  // UART3-RTS
+    D8      = PA_9,   // UART1-TX
+    D9      = PE_9,   // SDCard-CS
     D10     = PE_11,  // SSEL
     D11     = PE_14,  // MOSI
     D12     = PE_13,  // MISO
@@ -180,16 +181,17 @@
     D14     = PF_0,   // SDA
     D15     = PF_1,   // SCL
     // Internal
-    LED1    = PE_0,   // Red
-    LED2    = PB_6,   // Green / shared with SW1
-    LED_RED = PE_0,   // Red
-    LED_GRE = PB_6,   // Green / shared with SW1
+    LED_RED = PE_0,   // Red / Mode
+    LED_GRE = PB_6,   // Green / Switch-1
     LED_BLU = PB_8,   // Blue
-    SW0     = PF_2,	  // Switch 0
-    SW1     = PB_6,   // Switch 1 / shared with LED_GRE
-    SDCS    = PE_9,   // SD Card CS / shared with D9
-    USBRXD  = PD_9,   // RX
-    USBTXD  = PD_8,   // TX
+    SW0     = PF_2,   // Switch-0
+    SW1     = PB_6,   // Green / Switch-1
+    // ST-Link
+    USBRXD  = PD_9,
+    USBTXD  = PD_8,
+    SWDIO   = PA_15, 
+    SWCLK   = PA_14, 
+    NTRST   = PB_4,  
 
     // Not connected
     NC = (int)0xFFFFFFFF