Merge branch 'master' of https://github.com/mbedmicro/mbed

Author: emilmont

libraries/USBDevice/USBSerial/USBCDC.cpp

@@ -29,9 +29,9 @@ static uint8_t cdc_line_coding[7]= {0x80, 0x25, 0x00, 0x00, 0x00, 0x00, 0x08};
 
 #define MAX_CDC_REPORT_SIZE MAX_PACKET_SIZE_EPBULK
 
-USBCDC::USBCDC(uint16_t vendor_id, uint16_t product_id, uint16_t product_release): USBDevice(vendor_id, product_id, product_release) {
+USBCDC::USBCDC(uint16_t vendor_id, uint16_t product_id, uint16_t product_release, bool connect_blocking): USBDevice(vendor_id, product_id, product_release) {
     terminal_connected = false;
-    USBDevice::connect();
+    USBDevice::connect(connect_blocking);
 }
 
 bool USBCDC::USBCallback_request(void) {

libraries/USBDevice/USBSerial/USBCDC.h

@@ -35,8 +35,9 @@ class USBCDC: public USBDevice {
     * @param vendor_id Your vendor_id
     * @param product_id Your product_id
     * @param product_release Your preoduct_release
+    * @param connect_blocking define if the connection must be blocked if USB not plugged in
     */
-    USBCDC(uint16_t vendor_id, uint16_t product_id, uint16_t product_release);
+    USBCDC(uint16_t vendor_id, uint16_t product_id, uint16_t product_release, bool connect_blocking);
 
 protected:
 

libraries/USBDevice/USBSerial/USBSerial.h

@@ -53,9 +53,10 @@ class USBSerial: public USBCDC, public Stream {
     * @param vendor_id Your vendor_id (default: 0x1f00)
     * @param product_id Your product_id (default: 0x2012)
     * @param product_release Your preoduct_release (default: 0x0001)
+    * @param connect_blocking define if the connection must be blocked if USB not plugged in
     *
     */
-    USBSerial(uint16_t vendor_id = 0x1f00, uint16_t product_id = 0x2012, uint16_t product_release = 0x0001): USBCDC(vendor_id, product_id, product_release), buf(128){
+    USBSerial(uint16_t vendor_id = 0x1f00, uint16_t product_id = 0x2012, uint16_t product_release = 0x0001, bool connect_blocking = true): USBCDC(vendor_id, product_id, product_release, connect_blocking), buf(128){
         settingsChangedCallback = 0;
     };
 

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/PinNames.h

@@ -196,10 +196,10 @@ typedef enum {
     LED_BLUE = PTD1,
 
     // mbed original LED naming
-    LED1 = LED_BLUE,
+    LED1 = LED_RED,
     LED2 = LED_GREEN,
-    LED3 = LED_RED,
-    LED4 = LED_RED,
+    LED3 = LED_BLUE,
+    LED4 = LED_BLUE,
 
     // USB Pins
     USBTX = PTA2,
@@ -229,6 +229,9 @@ typedef enum {
     A3 = PTB3,
     A4 = PTC2,
     A5 = PTC1,
+    
+    I2C_SCL = D15,
+    I2C_SDA = D14,
 
     // Not connected
     NC = (int)0xFFFFFFFF

workspace_tools/build.py

@@ -58,12 +58,18 @@
 
     # Get target list
     if options.mcu:
+        if options.mcu not in TARGET_NAMES:
+            print "Given MCU '%s' not into the supported list:\n%s" % (options.mcu, TARGET_NAMES)
+            sys.exit(1)
         targets = [options.mcu]
     else:
         targets = TARGET_NAMES
 
     # Get toolchains list
     if options.tool:
+        if options.tool not in TOOLCHAINS:
+            print "Given toolchain '%s' not into the supported list:\n%s" % (options.tool, TOOLCHAINS)
+            sys.exit(1)
         toolchains = [options.tool]
     else:
         toolchains = TOOLCHAINS