Merge branch 'master' of git://github.com/bcostm/mbed into bcostm-master

Conflicts:
	workspace_tools/targets.py

libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F401RE/system_stm32f4xx.c

@@ -64,7 +64,6 @@
   */
 
 #include "stm32f4xx_hal.h"
-#include "error.h" /* [ADDED FOR MBED] */
 
 /**
   * @}
@@ -292,7 +291,11 @@ void SystemClock_Config(void)
   RCC_OscInitStruct.PLL.PLLQ            = 7;
   if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
   {
-    error("System clock initialization failed.");
+    // System clock initialization failed
+    while(1)
+    {
+      // [TODO] Put something here to tell the user that a problem occured...
+    }
   }
  
   /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2 clocks dividers */
@@ -303,7 +306,11 @@ void SystemClock_Config(void)
   RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;   // 84 MHz (SPI1 clock...)
   if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
   {
-    error("System clock initialization failed.");
+    // System clock initialization failed
+    while(1)
+    {
+      // [TODO] Put something here to tell the user that a problem occured...
+    }
   }
 
   /* Update the SystemCoreClock variable

workspace_tools/build_release.py

@@ -46,6 +46,7 @@ OFFICIAL_MBED_LIBRARY_BUILD = (
     ('NUCLEO_L152RE', ('ARM', 'uARM')),
     ('NUCLEO_F401RE', ('ARM', 'uARM')),
     ('NUCLEO_F030R8', ('ARM', 'uARM')),
+    ('NUCLEO_F302R8', ('ARM', 'uARM')),
     
     ('NRF51822', ('ARM', )),
 )

workspace_tools/export/uvision4.py

@@ -38,6 +38,7 @@ class Uvision4(Exporter):
         'NUCLEO_L152RE',
         'NUCLEO_F030R8',
         'NUCLEO_F401RE',
+        'NUCLEO_F302R8',
         'UBLOX_C027',
         'LPC1549',
         'LPC11U35_501',
@@ -52,6 +53,7 @@ class Uvision4(Exporter):
         'NUCLEO_L152RE',
         'NUCLEO_F030R8',
         'NUCLEO_F401RE',
+        'NUCLEO_F302R8',
         'LPC1549',
         'LPC11U35_501',
     ]

workspace_tools/export_test.py

@@ -77,7 +77,7 @@ if __name__ == '__main__':
     
     for toolchain, target in [
             ('uvision', 'LPC1768'), ('uvision', 'LPC11U24'), ('uvision', 'KL25Z'), ('uvision', 'LPC1347'), ('uvision', 'LPC1114'), ('uvision', 'LPC4088'),
-            ('uvision', 'NUCLEO_F103RB'), ('uvision', 'NUCLEO_L152RE'), ('uvision', 'NUCLEO_F401RE'), ('uvision', 'NUCLEO_F030R8'), 
+            ('uvision', 'NUCLEO_F103RB'), ('uvision', 'NUCLEO_L152RE'), ('uvision', 'NUCLEO_F401RE'), ('uvision', 'NUCLEO_F030R8'), ('uvision', 'NUCLEO_F302R8'),
             
             ('codered', 'LPC1768'), ('codered', 'LPC4088'),('codered', 'LPC1114'),
             ('codered', 'LPC11U35_401'),

workspace_tools/targets.py

@@ -342,6 +342,20 @@ class DISCO_F100RB(Target):
         self.supported_toolchains = ["GCC_ARM"]
 
 
+class NUCLEO_F302R8(Target):
+    ONLINE_TOOLCHAIN = "uARM"
+    OUTPUT_NAMING = "8.3"
+
+    def __init__(self):
+        Target.__init__(self)
+        
+        self.core = "Cortex-M3"
+        
+        self.extra_labels = ['STM', 'STM32F3', 'STM32F302R8']
+        
+        self.supported_toolchains = ["ARM", "uARM"]
+
+        
 class LPC1347(Target):
     def __init__(self):
         Target.__init__(self)
@@ -487,7 +501,7 @@ TARGETS = [
     NUCLEO_L152RE(),
     NUCLEO_F401RE(),
     NUCLEO_F030R8(),
-    DISCO_F100RB(),
+    NUCLEO_F302R8(),
     LPC1347(),
     LPC1114(),
     LPC11C24(),