ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5192 from andreaslarssonublox/ublox_move_stdio_uart_defines 

Moved STDIO_UART defines for UBLOX_EVK_ODIN_W2
pull/5283/merge
Jimmy Brisson 2017-10-09 11:14:06 -05:00 committed by GitHub
parent 42532d7806 120c9ad56c
commit df484e7885
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_UBLOX_EVK_ODIN_W2/PeripheralNames.h
View File

@ -57,9 +57,8 @@ typedef enum {
UART_8 = (int)UART8_BASE UART_8 = (int)UART8_BASE
} UARTName; } UARTName;
#define STDIO_UART_TX PA_9 #define STDIO_UART_TX USBTX
#define STDIO_UART_RX PA_10 #define STDIO_UART_RX USBRX
#define STDIO_UART UART_1
typedef enum { typedef enum {
SPI_1 = (int)SPI1_BASE, SPI_1 = (int)SPI1_BASE,

4
targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_UBLOX_EVK_ODIN_W2/PinNames.h
View File

@ -166,8 +166,8 @@ typedef enum {
BUTTON2 = SW1, BUTTON2 = SW1,
// ST-Link // ST-Link
USBRX = PA_10, USBRX = MBED_CONF_TARGET_USB_RX,
USBTX = PA_9, USBTX = MBED_CONF_TARGET_USB_TX,
SWDIO = PA_15, SWDIO = PA_15,
SWCLK = PA_14, SWCLK = PA_14,
NTRST = PB_4, NTRST = PB_4,

17
targets/targets.json
View File

@ -1704,7 +1704,22 @@
"features": ["LWIP"], "features": ["LWIP"],
"release_versions": ["5"], "release_versions": ["5"],
"device_name": "STM32F439ZI", "device_name": "STM32F439ZI",
"bootloader_supported": true "bootloader_supported": true,
"config": {
"usb_tx": {
"help": "Value: D8(default) or D1",
"value": "D8"
},
"usb_rx": {
"help": "Value: D2(default) or D0",
"value": "D2"
},
"stdio_uart": {
"help": "Value: UART_1(default) or UART_3",
"value": "UART_1",
"macro_name": "STDIO_UART"
}
}
}, },
"UBLOX_C030": { "UBLOX_C030": {
"inherits": ["FAMILY_STM32"], "inherits": ["FAMILY_STM32"],