diff options
| author | Karl Palsson <karlp@tweak.net.au> | 2014-11-15 02:05:01 +0300 |
|---|---|---|
| committer | Karl Palsson <karlp@tweak.net.au> | 2014-11-15 02:05:01 +0300 |
| commit | 0b78c4f726d3cee178096797ffc22411267283da (patch) | |
| tree | e4d8ad25e8fb53ac402095b837f1cc074357d76a | |
| parent | fb95997b3b090ac74baf51c4a99779098d0d0f23 (diff) | |
stm32: f0: timers: input capture support rising/falling edgesdrafts/f0-input-capture
This is common code for f0234, keep renaming files as has become standard, even
if it's a suboptimal solution. This doesn't rename the header which was not
renamed for f3.
Reported-by: https://github.com/gtoonstra
| -rw-r--r-- | include/libopencm3/stm32/f0/timer.h | 2 | ||||
| -rw-r--r-- | lib/stm32/common/timer_common_f0234.c (renamed from lib/stm32/common/timer_common_f234.c) | 0 | ||||
| -rw-r--r-- | lib/stm32/f0/Makefile | 2 | ||||
| -rw-r--r-- | lib/stm32/f2/Makefile | 2 | ||||
| -rw-r--r-- | lib/stm32/f3/Makefile | 2 | ||||
| -rw-r--r-- | lib/stm32/f4/Makefile | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/include/libopencm3/stm32/f0/timer.h b/include/libopencm3/stm32/f0/timer.h index eac50c2e..5f59816c 100644 --- a/include/libopencm3/stm32/f0/timer.h +++ b/include/libopencm3/stm32/f0/timer.h @@ -32,6 +32,6 @@ #ifndef LIBOPENCM3_TIMER_H #define LIBOPENCM3_TIMER_H -#include <libopencm3/stm32/common/timer_common_all.h> +#include <libopencm3/stm32/common/timer_common_f24.h> #endif diff --git a/lib/stm32/common/timer_common_f234.c b/lib/stm32/common/timer_common_f0234.c index 1506408c..1506408c 100644 --- a/lib/stm32/common/timer_common_f234.c +++ b/lib/stm32/common/timer_common_f0234.c diff --git a/lib/stm32/f0/Makefile b/lib/stm32/f0/Makefile index 156171c9..883187dd 100644 --- a/lib/stm32/f0/Makefile +++ b/lib/stm32/f0/Makefile @@ -41,7 +41,7 @@ OBJS += gpio_common_all.o gpio_common_f0234.o crc_common_all.o \ pwr_common_all.o iwdg_common_all.o rtc_common_l1f024.o \ dma_common_l1f013.o exti_common_all.o spi_common_all.o \ spi_common_f03.o flash_common_f01.o dac_common_all.o \ - timer_common_all.o + timer_common_all.o timer_common_f0234.o VPATH += ../../usb:../:../../cm3:../common diff --git a/lib/stm32/f2/Makefile b/lib/stm32/f2/Makefile index 92916686..503245d7 100644 --- a/lib/stm32/f2/Makefile +++ b/lib/stm32/f2/Makefile @@ -39,7 +39,7 @@ OBJS = gpio.o rcc.o OBJS += crc_common_all.o dac_common_all.o dma_common_f24.o \ gpio_common_all.o gpio_common_f0234.o i2c_common_all.o \ iwdg_common_all.o rtc_common_l1f024.o spi_common_all.o \ - spi_common_l1f124.o timer_common_all.o timer_common_f234.o \ + spi_common_l1f124.o timer_common_all.o timer_common_f0234.o \ timer_common_f24.o usart_common_all.o usart_common_f124.o \ flash_common_f234.o flash_common_f24.o hash_common_f24.o \ crypto_common_f24.o exti_common_all.o rcc_common_all.o diff --git a/lib/stm32/f3/Makefile b/lib/stm32/f3/Makefile index 5ef282ad..4ece30b6 100644 --- a/lib/stm32/f3/Makefile +++ b/lib/stm32/f3/Makefile @@ -40,7 +40,7 @@ OBJS = rcc.o adc.o i2c.o usart.o dma.o flash.o OBJS += gpio_common_all.o gpio_common_f0234.o \ dac_common_all.o usart_common_all.o crc_common_all.o\ iwdg_common_all.o spi_common_all.o dma_common_l1f013.o\ - timer_common_all.o timer_common_f234.o flash_common_f234.o \ + timer_common_all.o timer_common_f0234.o flash_common_f234.o \ flash.o exti_common_all.o rcc_common_all.o spi_common_f03.o OBJS += usb.o usb_control.o usb_standard.o usb_f103.o diff --git a/lib/stm32/f4/Makefile b/lib/stm32/f4/Makefile index 475d9178..8810f6e0 100644 --- a/lib/stm32/f4/Makefile +++ b/lib/stm32/f4/Makefile @@ -43,7 +43,7 @@ OBJS += crc_common_all.o dac_common_all.o dma_common_f24.o \ gpio_common_all.o gpio_common_f0234.o i2c_common_all.o \ iwdg_common_all.o pwr_common_all.o rtc_common_l1f024.o \ spi_common_all.o spi_common_l1f124.o timer_common_all.o \ - timer_common_f234.o timer_common_f24.o usart_common_all.o \ + timer_common_f0234.o timer_common_f24.o usart_common_all.o \ usart_common_f124.o flash_common_f234.o flash_common_f24.o \ hash_common_f24.o crypto_common_f24.o exti_common_all.o \ rcc_common_all.o |