Revision 75:dc225afb6914, committed 2013-12-19

Comitter:

bogdanm

Date:

Thu Dec 19 15:51:14 2013 +0200

Parent:

74:a842253909c9

Child:

76:824293ae5e43

Commit message:

Release 75 of the mbed library

Main changes:

- added UART flow control API and implementation for LPC1768 and LPC812
- NUCLEO_F103RB and KL46Z fixes

Changed in this revision

--- a/RawSerial.h	Fri Dec 13 14:18:40 2013 +0200
+++ b/RawSerial.h	Thu Dec 19 15:51:14 2013 +0200
@@ -71,6 +71,16 @@
      * @returns The char read from the serial port
      */
     int getc();
+
+    /** Write a string to the serial port
+     *
+     * @param str The string to write
+     *
+     * @returns 0 if the write succeeds, EOF for error
+     */
+    int puts(const char *str);
+
+    int printf(const char *format, ...);
 };
 
 } // namespace mbed

--- a/SerialBase.h	Fri Dec 13 14:18:40 2013 +0200
+++ b/SerialBase.h	Thu Dec 19 15:51:14 2013 +0200
@@ -51,6 +51,13 @@
         TxIrq
     };
 
+    enum Flow {
+        Disabled = 0,
+        RTS,
+        CTS,
+        RTSCTS
+    };
+
     /** Set the transmission format used by the serial port
      *
      *  @param bits The number of bits in a word (5-8; default = 8)
@@ -99,6 +106,16 @@
     /** Generate a break condition on the serial line
      */
     void send_break();
+    
+#if DEVICE_SERIAL_FC
+    /** Set the flow control type on the serial port
+     *
+     *  @param type the flow control type (Disabled, RTS, CTS, RTSCTS)     
+     *  @param flow1 the first flow control pin (RTS for RTS or RTSCTS, CTS for CTS)
+     *  @param flow2 the second flow control pin (CTS for RTSCTS)
+     */
+    void set_flow_control(Flow type, PinName flow1=NC, PinName flow2=NC);
+#endif
 
     static void _irq_handler(uint32_t id, SerialIrq irq_type);
 

Binary file TARGET_KL25Z/TOOLCHAIN_ARM_STD/cmsis_nvic.o has changed

Binary file TARGET_KL25Z/TOOLCHAIN_ARM_STD/mbed.ar has changed

Binary file TARGET_KL25Z/TOOLCHAIN_ARM_STD/retarget.o has changed

Binary file TARGET_KL25Z/TOOLCHAIN_ARM_STD/sys.o has changed

Binary file TARGET_KL25Z/TOOLCHAIN_ARM_STD/system_MKL25Z4.o has changed

Binary file TARGET_KL25Z/TOOLCHAIN_GCC_ARM/libmbed.a has changed

--- a/TARGET_KL46Z/PinNames.h	Fri Dec 13 14:18:40 2013 +0200
+++ b/TARGET_KL46Z/PinNames.h	Thu Dec 19 15:51:14 2013 +0200
@@ -231,10 +231,11 @@
     NC = (int)0xFFFFFFFF
 } PinName;
 
-/* PullDown not available for KL46 */
+/* Pull modes for input pins */
 typedef enum {
     PullNone = 0,
-    PullUp = 2,
+    PullDown = 2,
+    PullUp = 3
 } PinMode;
 
 #ifdef __cplusplus

Binary file TARGET_KL46Z/TOOLCHAIN_ARM_STD/cmsis_nvic.o has changed

Binary file TARGET_KL46Z/TOOLCHAIN_ARM_STD/mbed.ar has changed

Binary file TARGET_KL46Z/TOOLCHAIN_ARM_STD/retarget.o has changed

Binary file TARGET_KL46Z/TOOLCHAIN_ARM_STD/sys.o has changed

Binary file TARGET_KL46Z/TOOLCHAIN_ARM_STD/system_MKL46Z4.o has changed

Binary file TARGET_KL46Z/TOOLCHAIN_GCC_ARM/libmbed.a has changed

Binary file TARGET_LPC1114/TOOLCHAIN_ARM_MICRO/cmsis_nvic.o has changed

Binary file TARGET_LPC1114/TOOLCHAIN_ARM_MICRO/mbed.ar has changed

Binary file TARGET_LPC1114/TOOLCHAIN_ARM_MICRO/retarget.o has changed

Binary file TARGET_LPC1114/TOOLCHAIN_ARM_MICRO/sys.o has changed

Binary file TARGET_LPC1114/TOOLCHAIN_ARM_MICRO/system_LPC11xx.o has changed

Binary file TARGET_LPC11U24/TOOLCHAIN_ARM_MICRO/cmsis_nvic.o has changed

Binary file TARGET_LPC11U24/TOOLCHAIN_ARM_MICRO/mbed.ar has changed

Binary file TARGET_LPC11U24/TOOLCHAIN_ARM_MICRO/retarget.o has changed

Binary file TARGET_LPC11U24/TOOLCHAIN_ARM_MICRO/sys.o has changed

Binary file TARGET_LPC11U24/TOOLCHAIN_ARM_MICRO/system_LPC11Uxx.o has changed

Binary file TARGET_LPC11U24/TOOLCHAIN_ARM_STD/cmsis_nvic.o has changed

Binary file TARGET_LPC11U24/TOOLCHAIN_ARM_STD/mbed.ar has changed

Binary file TARGET_LPC11U24/TOOLCHAIN_ARM_STD/retarget.o has changed

Binary file TARGET_LPC11U24/TOOLCHAIN_ARM_STD/sys.o has changed

Binary file TARGET_LPC11U24/TOOLCHAIN_ARM_STD/system_LPC11Uxx.o has changed

Binary file TARGET_LPC11U35_401/TOOLCHAIN_ARM_MICRO/cmsis_nvic.o has changed

Binary file TARGET_LPC11U35_401/TOOLCHAIN_ARM_MICRO/mbed.ar has changed

Binary file TARGET_LPC11U35_401/TOOLCHAIN_ARM_MICRO/retarget.o has changed

Binary file TARGET_LPC11U35_401/TOOLCHAIN_ARM_MICRO/sys.o has changed

Binary file TARGET_LPC11U35_401/TOOLCHAIN_ARM_MICRO/system_LPC11Uxx.o has changed

Binary file TARGET_LPC11U35_401/TOOLCHAIN_ARM_STD/cmsis_nvic.o has changed

Binary file TARGET_LPC11U35_401/TOOLCHAIN_ARM_STD/mbed.ar has changed

Binary file TARGET_LPC11U35_401/TOOLCHAIN_ARM_STD/retarget.o has changed

Binary file TARGET_LPC11U35_401/TOOLCHAIN_ARM_STD/sys.o has changed

Binary file TARGET_LPC11U35_401/TOOLCHAIN_ARM_STD/system_LPC11Uxx.o has changed

Binary file TARGET_LPC1347/TOOLCHAIN_ARM_STD/cmsis_nvic.o has changed

Binary file TARGET_LPC1347/TOOLCHAIN_ARM_STD/mbed.ar has changed

Binary file TARGET_LPC1347/TOOLCHAIN_ARM_STD/retarget.o has changed

Binary file TARGET_LPC1347/TOOLCHAIN_ARM_STD/sys.o has changed

Binary file TARGET_LPC1347/TOOLCHAIN_ARM_STD/system_LPC13Uxx.o has changed

Binary file TARGET_LPC1768/TOOLCHAIN_ARM_STD/cmsis_nvic.o has changed

Binary file TARGET_LPC1768/TOOLCHAIN_ARM_STD/mbed.ar has changed

Binary file TARGET_LPC1768/TOOLCHAIN_ARM_STD/retarget.o has changed

Binary file TARGET_LPC1768/TOOLCHAIN_ARM_STD/sys.o has changed

Binary file TARGET_LPC1768/TOOLCHAIN_ARM_STD/system_LPC17xx.o has changed

Binary file TARGET_LPC1768/TOOLCHAIN_GCC_ARM/libmbed.a has changed

Binary file TARGET_LPC1768/TOOLCHAIN_GCC_CR/libmbed.a has changed

Binary file TARGET_LPC1768/TOOLCHAIN_GCC_CS/libmbed.a has changed

Binary file TARGET_LPC1768/TOOLCHAIN_IAR/cmsis_nvic.o has changed

Binary file TARGET_LPC1768/TOOLCHAIN_IAR/mbed.a has changed

Binary file TARGET_LPC1768/TOOLCHAIN_IAR/retarget.o has changed

Binary file TARGET_LPC1768/TOOLCHAIN_IAR/startup_LPC17xx.o has changed

Binary file TARGET_LPC1768/TOOLCHAIN_IAR/system_LPC17xx.o has changed

--- a/TARGET_LPC1768/device.h	Fri Dec 13 14:18:40 2013 +0200
+++ b/TARGET_LPC1768/device.h	Thu Dec 19 15:51:14 2013 +0200
@@ -26,6 +26,7 @@
 #define DEVICE_ANALOGOUT        1
 
 #define DEVICE_SERIAL           1
+#define DEVICE_SERIAL_FC        1
 
 #define DEVICE_I2C              1
 #define DEVICE_I2CSLAVE         1

--- a/TARGET_LPC1768/objects.h	Fri Dec 13 14:18:40 2013 +0200
+++ b/TARGET_LPC1768/objects.h	Thu Dec 19 15:51:14 2013 +0200
@@ -20,6 +20,7 @@
 #include "PortNames.h"
 #include "PeripheralNames.h"
 #include "PinNames.h"
+#include "gpio_object.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,7 +48,6 @@
 struct serial_s {
     LPC_UART_TypeDef *uart;
     int index;
-    uint8_t count;
 };
 
 struct analogin_s {
@@ -71,8 +71,6 @@
     LPC_SSP_TypeDef *spi;
 };
 
-#include "gpio_object.h"
-
 #ifdef __cplusplus
 }
 #endif

Binary file TARGET_LPC2368/TOOLCHAIN_ARM_STD/cmsis_nvic.o has changed

Binary file TARGET_LPC2368/TOOLCHAIN_ARM_STD/core_arm7.o has changed

Binary file TARGET_LPC2368/TOOLCHAIN_ARM_STD/mbed.ar has changed

Binary file TARGET_LPC2368/TOOLCHAIN_ARM_STD/retarget.o has changed

Binary file TARGET_LPC2368/TOOLCHAIN_ARM_STD/sys.o has changed

Binary file TARGET_LPC2368/TOOLCHAIN_ARM_STD/system_LPC23xx.o has changed

Binary file TARGET_LPC2368/TOOLCHAIN_ARM_STD/vector_realmonitor.o has changed

Binary file TARGET_LPC4088/TOOLCHAIN_ARM_STD/cmsis_nvic.o has changed

Binary file TARGET_LPC4088/TOOLCHAIN_ARM_STD/mbed.ar has changed

Binary file TARGET_LPC4088/TOOLCHAIN_ARM_STD/retarget.o has changed

Binary file TARGET_LPC4088/TOOLCHAIN_ARM_STD/sys.o has changed

Binary file TARGET_LPC4088/TOOLCHAIN_ARM_STD/system_LPC407x_8x_177x_8x.o has changed

Binary file TARGET_LPC4088/TOOLCHAIN_GCC_ARM/libmbed.a has changed

Binary file TARGET_LPC4088/TOOLCHAIN_GCC_CR/libmbed.a has changed

Binary file TARGET_LPC812/TOOLCHAIN_ARM_MICRO/cmsis_nvic.o has changed

Binary file TARGET_LPC812/TOOLCHAIN_ARM_MICRO/mbed.ar has changed

Binary file TARGET_LPC812/TOOLCHAIN_ARM_MICRO/retarget.o has changed

Binary file TARGET_LPC812/TOOLCHAIN_ARM_MICRO/sys.o has changed

Binary file TARGET_LPC812/TOOLCHAIN_ARM_MICRO/system_LPC8xx.o has changed

--- a/TARGET_LPC812/device.h	Fri Dec 13 14:18:40 2013 +0200
+++ b/TARGET_LPC812/device.h	Thu Dec 19 15:51:14 2013 +0200
@@ -26,6 +26,7 @@
 #define DEVICE_ANALOGOUT        0
 
 #define DEVICE_SERIAL           1
+#define DEVICE_SERIAL_FC        1
 
 #define DEVICE_I2C              1
 #define DEVICE_I2CSLAVE         0

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/cmsis_nvic.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/mbed.ar has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/misc.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/retarget.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_adc.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_bkp.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_can.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_cec.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_crc.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_dac.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_dbgmcu.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_dma.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_exti.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_flash.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_fsmc.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_gpio.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_i2c.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_iwdg.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_pwr.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_rcc.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_rtc.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_sdio.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_spi.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_tim.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_usart.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/stm32f10x_wwdg.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/sys.o has changed

Binary file TARGET_NUCLEO_F103RB/TOOLCHAIN_ARM_STD/system_stm32f10x.o has changed

--- a/TARGET_NUCLEO_F103RB/device.h	Fri Dec 13 14:18:40 2013 +0200
+++ b/TARGET_NUCLEO_F103RB/device.h	Thu Dec 19 15:51:14 2013 +0200
@@ -20,7 +20,7 @@
 #define DEVICE_PORTOUT          1
 #define DEVICE_PORTINOUT        1
 
-#define DEVICE_INTERRUPTIN      0
+#define DEVICE_INTERRUPTIN      1
 
 #define DEVICE_ANALOGIN         1
 #define DEVICE_ANALOGOUT        0
@@ -33,18 +33,18 @@
 #define DEVICE_SPI              1
 #define DEVICE_SPISLAVE         0
 
-#define DEVICE_RTC              0
+#define DEVICE_RTC              1
 
 #define DEVICE_PWMOUT           1
 
+#define DEVICE_SLEEP            1
+
 //=======================================
 
 #define DEVICE_SEMIHOST         0
 #define DEVICE_LOCALFILESYSTEM  0
 #define DEVICE_ID_LENGTH       24
 
-#define DEVICE_SLEEP            0
-
 #define DEVICE_DEBUG_AWARENESS  0
 
 #define DEVICE_STDIO_MESSAGES   1

--- a/TARGET_NUCLEO_F103RB/objects.h	Fri Dec 13 14:18:40 2013 +0200
+++ b/TARGET_NUCLEO_F103RB/objects.h	Thu Dec 19 15:51:14 2013 +0200
@@ -26,9 +26,9 @@
 #endif
 
 struct gpio_irq_s {
-    uint32_t port;
-    uint32_t pin;
     uint32_t ch;
+    IRQn_Type irq_n;
+    uint32_t event; // 0=none, 1=rise, 2=fall, 3=rise+fall
 };
 
 struct port_s {

--- a/pinmap.h	Fri Dec 13 14:18:40 2013 +0200
+++ b/pinmap.h	Thu Dec 19 15:51:14 2013 +0200
@@ -34,6 +34,7 @@
 uint32_t pinmap_peripheral(PinName pin, const PinMap* map);
 uint32_t pinmap_merge     (uint32_t a, uint32_t b);
 void     pinmap_pinout    (PinName pin, const PinMap *map);
+uint32_t pinmap_find_peripheral(PinName pin, const PinMap* map);
 
 #ifdef __cplusplus
 }

--- a/serial_api.h	Fri Dec 13 14:18:40 2013 +0200
+++ b/serial_api.h	Thu Dec 19 15:51:14 2013 +0200
@@ -37,6 +37,13 @@
     TxIrq
 } SerialIrq;
 
+typedef enum {
+    FlowControlNone,
+    FlowControlRTS,
+    FlowControlCTS,
+    FlowControlRTSCTS
+} FlowControl;
+
 typedef void (*uart_irq_handler)(uint32_t id, SerialIrq event);
 
 typedef struct serial_s serial_t;
@@ -60,6 +67,8 @@
 
 void serial_pinout_tx(PinName tx);
 
+void serial_set_flow_control(serial_t *obj, FlowControl type, PinName rxflow, PinName txflow);
+
 #ifdef __cplusplus
 }
 #endif