From 06ffb4cf8a90c6f63aa784f5599b74e74bd21415 Mon Sep 17 00:00:00 2001 From: jeromecoutant Date: Fri, 2 Dec 2016 13:47:05 +0100 Subject: [PATCH 1/2] STM32F2 : map ST HAL assert into MBED assert --- .../TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_conf.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_conf.h b/targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_conf.h index 059ed448970..1518ffb12cc 100644 --- a/targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_conf.h +++ b/targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_conf.h @@ -382,9 +382,8 @@ * If expr is true, it returns no value. * @retval None */ - #define assert_param(expr) ((expr) ? (void)0 : assert_failed((uint8_t *)__FILE__, __LINE__)) -/* Exported functions ------------------------------------------------------- */ - void assert_failed(uint8_t* file, uint32_t line); + #include "mbed_assert.h" + #define assert_param(expr) MBED_ASSERT(expr) #else #define assert_param(expr) ((void)0) #endif /* USE_FULL_ASSERT */ From 008a12327ceb31e5beb7a5b935feeaca0d762251 Mon Sep 17 00:00:00 2001 From: jeromecoutant Date: Fri, 9 Dec 2016 14:52:51 +0100 Subject: [PATCH 2/2] STM32F2 : correct ST HAL API call - GPIO: mode was not allowed by ST HAL API --- targets/TARGET_STM/TARGET_STM32F2/gpio_irq_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/targets/TARGET_STM/TARGET_STM32F2/gpio_irq_api.c b/targets/TARGET_STM/TARGET_STM32F2/gpio_irq_api.c index cf8fed9402d..c595b98ba6e 100644 --- a/targets/TARGET_STM/TARGET_STM32F2/gpio_irq_api.c +++ b/targets/TARGET_STM/TARGET_STM32F2/gpio_irq_api.c @@ -304,7 +304,7 @@ void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable) mode = STM_MODE_IT_FALLING; obj->event = EDGE_FALL; } else { // NONE or RISE - mode = STM_MODE_IT_EVT_RESET; + mode = STM_MODE_INPUT; obj->event = EDGE_NONE; } } @@ -313,7 +313,7 @@ void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable) mode = STM_MODE_IT_RISING; obj->event = EDGE_RISE; } else { // NONE or FALL - mode = STM_MODE_IT_EVT_RESET; + mode = STM_MODE_INPUT; obj->event = EDGE_NONE; } }