[NUCLEO_F103RB] Add I2C master, code cleanup, ...

libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_MICRO/startup_stm32f10x_md.s

@@ -1,19 +1,7 @@
-;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************
+;*******************************************************************************
 ;* File Name          : startup_stm32f10x_md.s
-;* Author             : MCD Application Team
-;* Version            : V3.5.0
-;* Date               : 11-March-2011
 ;* Description        : STM32F10x Medium Density Devices vector table for MDK-ARM 
-;*                      toolchain.  
-;*                      This module performs:
-;*                      - Set the initial SP
-;*                      - Set the initial PC == Reset_Handler
-;*                      - Set the vector table entries with the exceptions ISR address
-;*                      - Configure the clock system
-;*                      - Branches to __main in the C library (which eventually
-;*                        calls main()).
-;*                      After Reset the CortexM3 processor is in Thread mode,
-;*                      priority is Privileged, and the Stack is set to Main.
+;*                      toolchain + ARM_MICRO compiler
 ;* <<< Use Configuration Wizard in Context Menu >>>   
 ;*******************************************************************************
 ; THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
@@ -33,6 +21,8 @@
 Stack_Size      EQU     0x00000400
 
                 AREA    STACK, NOINIT, READWRITE, ALIGN=3
+                EXPORT  __initial_sp
+
 Stack_Mem       SPACE   Stack_Size
 __initial_sp    EQU     0x20005000 ; Top of RAM
 
@@ -41,9 +31,12 @@ __initial_sp    EQU     0x20005000 ; Top of RAM
 ;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
 ; </h>
 
-Heap_Size       EQU     0x00000200
+Heap_Size       EQU     0x00000000
 
                 AREA    HEAP, NOINIT, READWRITE, ALIGN=3
+                EXPORT  __heap_base
+                EXPORT  __heap_limit
+
 __heap_base
 Heap_Mem        SPACE   Heap_Size
 __heap_limit
@@ -275,33 +268,4 @@ USBWakeUp_IRQHandler
                 ENDP
 
                 ALIGN
-
-;*******************************************************************************
-; User Stack and Heap initialization
-;*******************************************************************************
-                 IF      :DEF:__MICROLIB           
-
-                 EXPORT  __initial_sp
-                 EXPORT  __heap_base
-                 EXPORT  __heap_limit
-
-                 ELSE
-
-                 IMPORT  __use_two_region_memory
-                 EXPORT  __user_initial_stackheap
-
-__user_initial_stackheap
-
-                 LDR     R0, =  Heap_Mem
-                 LDR     R1, =(Stack_Mem + Stack_Size)
-                 LDR     R2, = (Heap_Mem +  Heap_Size)
-                 LDR     R3, = Stack_Mem
-                 BX      LR
-
-                 ALIGN
-
-                 ENDIF
-
-                 END
-
-;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****
+                END

libraries/mbed/targets/cmsis/TARGET_STM/TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/startup_stm32f10x_md.s

@@ -1,19 +1,7 @@
-;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************
+;*******************************************************************************
 ;* File Name          : startup_stm32f10x_md.s
-;* Author             : MCD Application Team
-;* Version            : V3.5.0
-;* Date               : 11-March-2011
 ;* Description        : STM32F10x Medium Density Devices vector table for MDK-ARM 
-;*                      toolchain.  
-;*                      This module performs:
-;*                      - Set the initial SP
-;*                      - Set the initial PC == Reset_Handler
-;*                      - Set the vector table entries with the exceptions ISR address
-;*                      - Configure the clock system
-;*                      - Branches to __main in the C library (which eventually
-;*                        calls main()).
-;*                      After Reset the CortexM3 processor is in Thread mode,
-;*                      priority is Privileged, and the Stack is set to Main.
+;*                      toolchain + ARM_STD compiler
 ;* <<< Use Configuration Wizard in Context Menu >>>   
 ;*******************************************************************************
 ; THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
@@ -24,30 +12,8 @@
 ; INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
 ;*******************************************************************************
 
-; Amount of memory (in bytes) allocated for Stack
-; Tailor this value to your application needs
-; <h> Stack Configuration
-;   <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
-; </h>
-
-Stack_Size      EQU     0x00000400
-
-                AREA    STACK, NOINIT, READWRITE, ALIGN=3
-Stack_Mem       SPACE   Stack_Size
 __initial_sp    EQU     0x20005000 ; Top of RAM
 
-
-; <h> Heap Configuration
-;   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
-; </h>
-
-Heap_Size       EQU     0x00000200
-
-                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
-__heap_base
-Heap_Mem        SPACE   Heap_Size
-__heap_limit
-
                 PRESERVE8
                 THUMB
 
@@ -275,33 +241,4 @@ USBWakeUp_IRQHandler
                 ENDP
 
                 ALIGN
-
-;*******************************************************************************
-; User Stack and Heap initialization
-;*******************************************************************************
-                 IF      :DEF:__MICROLIB           
-
-                 EXPORT  __initial_sp
-                 EXPORT  __heap_base
-                 EXPORT  __heap_limit
-
-                 ELSE
-
-                 IMPORT  __use_two_region_memory
-                 EXPORT  __user_initial_stackheap
-
-__user_initial_stackheap
-
-                 LDR     R0, =  Heap_Mem
-                 LDR     R1, =(Stack_Mem + Stack_Size)
-                 LDR     R2, = (Heap_Mem +  Heap_Size)
-                 LDR     R3, = Stack_Mem
-                 BX      LR
-
-                 ALIGN
-
-                 ENDIF
-
-                 END
-
-;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****
+                END

libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/PeripheralNames.h

@@ -32,8 +32,8 @@ typedef enum {
     UART_2 = (int)USART2_BASE
 } UARTName;
 
-#define STDIO_UART_TX  UART_TX
-#define STDIO_UART_RX  UART_RX
+#define STDIO_UART_TX  PA_2
+#define STDIO_UART_RX  PA_3
 #define STDIO_UART     UART_2
 
 typedef enum {

libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/PinNames.h

@@ -88,45 +88,10 @@ typedef enum {
   PC_14 = 0x2E,
   PC_15 = 0x2F,
 
-  PD_0  = 0x30,
-  PD_1  = 0x31,
   PD_2  = 0x32,
-  PD_3  = 0x33,
-  PD_4  = 0x34,
-  PD_5  = 0x35,
-  PD_6  = 0x36,
-  PD_7  = 0x37,
   PD_8  = 0x38,
-  PD_9  = 0x39,
-  PD_10 = 0x3A,
-  PD_11 = 0x3B,
-  PD_12 = 0x3C,
-  PD_13 = 0x3D,
-  PD_14 = 0x3E,
-  PD_15 = 0x3F,
 
-  PE_0  = 0x40,
-  PE_1  = 0x41,
-  PE_2  = 0x42,
-  PE_3  = 0x43,
-  PE_4  = 0x44,
-  PE_5  = 0x45,
-  PE_6  = 0x46,
-  PE_7  = 0x47,
-  PE_8  = 0x48,
-  PE_9  = 0x49,
-  PE_10 = 0x4A,
-  PE_11 = 0x4B,
-  PE_12 = 0x4C,
-  PE_13 = 0x4D,
-  PE_14 = 0x4E,
-  PE_15 = 0x4F,
-
-  //--------------------
-  // NUCLEO_F103RB board
-  //--------------------
-
-  // Arduino connectors
+  // Arduino connector namings
   A0          = PA_0,
   A1          = PA_1,
   A2          = PA_4,
@@ -150,15 +115,21 @@ typedef enum {
   D14         = PB_9,
   D15         = PB_8,
 
+  // Generic signals namings
+  LED1        = PA_5,
+  LED2        = PA_5,
+  LED3        = PA_5,  
+  LED4        = PA_5,  
   USER_BUTTON = PC_13,
-  UART_TX     = PA_2,
-  UART_RX     = PA_3,
-
-  // mbed mandatory namings
-  LED1 = PA_5,
-  LED2 = PA_5,
-  LED3 = PA_5,  
-  LED4 = PA_5,
+  SERIAL_TX   = PA_2,
+  SERIAL_RX   = PA_3,
+  I2C_SCL     = PB_8,
+  I2C_SDA     = PB_9,
+  SPI_MOSI    = PA_7,
+  SPI_MISO    = PA_6,
+  SPI_SCK     = PA_5,
+  SPI_CS      = PB_6,
+  PWM_OUT     = PB_3,
 
   // Not connected
   NC = (int)0xFFFFFFFF

libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/analogin_api.c

@@ -13,9 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-//==============================================================================
-// STM32F103
-//============================================================================== 
 #include "analogin_api.h"
 #include "wait_api.h"
 

libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/device.h

@@ -27,7 +27,7 @@
 
 #define DEVICE_SERIAL           1
 
-#define DEVICE_I2C              0
+#define DEVICE_I2C              1
 #define DEVICE_I2CSLAVE         0
 
 #define DEVICE_SPI              1