From 2c97fea1e441105e591aa48fd2f8af228731e82a Mon Sep 17 00:00:00 2001 From: bcostm Date: Mon, 12 Sep 2016 13:02:20 +0200 Subject: [PATCH] STM32F3xx - Fix build errors --- hal/targets.json | 10 +--------- .../hal/TARGET_STM/TARGET_STM32F3/PeripheralPins.h | 4 ++-- .../TARGET_NUCLEO_F303K8/PeripheralPins.c | 2 -- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/hal/targets.json b/hal/targets.json index aa53e07dda..4ce3dc6871 100644 --- a/hal/targets.json +++ b/hal/targets.json @@ -1040,11 +1040,7 @@ "extra_labels": ["STM", "STM32F3", "STM32F303", "STM32F303VC"], "macros": ["DEVICE_RTC_LSI=1"], "supported_toolchains": ["GCC_ARM"], -<<<<<<< 1a501c3bb8be167bb9cf38e5742dd60c191c4e04 - "device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"] -======= "device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"] ->>>>>>> STM32F3xx - Enable SERIAL_FC in targets.json }, "DISCO_F334C8": { "inherits": ["Target"], @@ -1055,13 +1051,9 @@ "supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"], "progen": {"target": "disco-f334c8"}, "detect_code": ["0810"], -<<<<<<< 1a501c3bb8be167bb9cf38e5742dd60c191c4e04 - "device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"], -======= "device_has": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "RTC_LSI", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"], ->>>>>>> STM32F3xx - Enable SERIAL_FC in targets.json "default_lib": "small", - "release_versions": ["2"] + "release_versions": ["2"] }, "DISCO_F407VG": { "inherits": ["Target"], diff --git a/hal/targets/hal/TARGET_STM/TARGET_STM32F3/PeripheralPins.h b/hal/targets/hal/TARGET_STM/TARGET_STM32F3/PeripheralPins.h index 70bb7ae2cb..433c630400 100644 --- a/hal/targets/hal/TARGET_STM/TARGET_STM32F3/PeripheralPins.h +++ b/hal/targets/hal/TARGET_STM/TARGET_STM32F3/PeripheralPins.h @@ -55,8 +55,8 @@ extern const PinMap PinMap_PWM[]; extern const PinMap PinMap_UART_TX[]; extern const PinMap PinMap_UART_RX[]; -extern const PinMap_UART_RTS[]; -extern const PinMap_UART_CTS[]; +extern const PinMap PinMap_UART_RTS[]; +extern const PinMap PinMap_UART_CTS[]; //*** SPI *** diff --git a/hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F303K8/PeripheralPins.c b/hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F303K8/PeripheralPins.c index 16ffc58799..6cdd198636 100644 --- a/hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F303K8/PeripheralPins.c +++ b/hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F303K8/PeripheralPins.c @@ -146,14 +146,12 @@ const PinMap PinMap_UART_RX[] = { const PinMap PinMap_UART_RTS[] = { {PA_1, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, - {PB_14, UART_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, {PA_12, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, {NC, NC, 0} }; const PinMap PinMap_UART_CTS[] = { {PA_0, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, - {PB_13, UART_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, {PA_11, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, {PA_13, UART_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, {NC, NC, 0}