Merge branch 'tomvdb-master'

Author: fpistm

cores/arduino/pins_arduino.h

@@ -49,7 +49,7 @@ uint32_t pinNametoDigitalPin(PinName p);
 // Convert an analog pin number Axx to a PinName Pxy
 #define analogInputToPinName(p)     (digitalPinToPinName(analogInputToDigitalPin(p)))
 // All pins could manage EXTI
-#define digitalPinToInterrupt(p)    ((digitalPinIsValid(p) ? p : NOT_AN_INTERRUPT)
+#define digitalPinToInterrupt(p)    (digitalPinIsValid(p) ? p : NOT_AN_INTERRUPT)
 
 #define digitalPinHasI2C(p)         (pin_in_pinmap(digitalPinToPinName(p), PinMap_I2C_SDA) ||\
                                      pin_in_pinmap(digitalPinToPinName(p), PinMap_I2C_SCL))

cores/arduino/stm32/stm32_def_build.h

@@ -26,6 +26,8 @@
 #define CMSIS_STARTUP_FILE "startup_stm32f091xc.s"
 #elif defined(STM32F030x8)
 #define CMSIS_STARTUP_FILE "startup_stm32f030x8.s"
+#elif defined(STM32F042x6)
+#define CMSIS_STARTUP_FILE "startup_stm32f042x6.s"
 #elif defined(STM32F207xx)
 #define CMSIS_STARTUP_FILE "startup_stm32f207xx.s"
 #elif defined(STM32F303xE)