diff --git a/lib/stm32/common/timer_common_all.c b/lib/stm32/common/timer_common_all.c index 9c8b5cc6..b9512f5b 100644 --- a/lib/stm32/common/timer_common_all.c +++ b/lib/stm32/common/timer_common_all.c @@ -1,4 +1,5 @@ -/** @addtogroup timer_file +/** @addtogroup timer_file Timer peripheral API +@ingroup peripheral_apis @author @htmlonly © @endhtmlonly 2010 Edward Cheeseman diff --git a/lib/stm32/f0/Makefile b/lib/stm32/f0/Makefile index f5b439a7..858e34ad 100644 --- a/lib/stm32/f0/Makefile +++ b/lib/stm32/f0/Makefile @@ -37,7 +37,7 @@ TGT_CFLAGS += $(STANDARD_FLAGS) ARFLAGS = rcs OBJS = can.o flash.o rcc.o dma.o rtc.o comparator.o \ - pwr.o timer.o adc.o desig.o + pwr.o adc.o desig.o OBJS += gpio_common_all.o gpio_common_f0234.o crc_common_all.o crc_v2.o \ pwr_common_v1.o iwdg_common_all.o rtc_common_l1f024.o \ diff --git a/lib/stm32/f0/timer.c b/lib/stm32/f0/timer.c deleted file mode 100644 index 88006834..00000000 --- a/lib/stm32/f0/timer.c +++ /dev/null @@ -1,34 +0,0 @@ -/** @defgroup timer_file Timers - * - * @ingroup STM32F0xx - * - * @brief libopencm3 STM32F0xx Timers - * - * @version 1.0.0 - * - * @date 11 July 2013 - * - */ - -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2010 Edward Cheeseman - * Copyright (C) 2011 Stephen Caudle - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include - diff --git a/lib/stm32/f1/timer.c b/lib/stm32/f1/timer.c index fd46742c..b04bd971 100644 --- a/lib/stm32/f1/timer.c +++ b/lib/stm32/f1/timer.c @@ -1,12 +1,5 @@ -/* This file is used for documentation purposes. It does not need -to be compiled. All source code is in the common area. -If there is any device specific code required it can be included here, -in which case this file must be added to the compile list. */ - -/** @defgroup timer_file Timers - -@ingroup STM32F1xx - +/** @defgroup timer_file +@ingroup peripheral_apis @brief libopencm3 STM32F1xx Timers @version 1.0.0 @@ -37,6 +30,8 @@ in which case this file must be added to the compile list. */ #include +/**@{*/ + /*---------------------------------------------------------------------------*/ /** @brief Set Input Polarity @@ -55,3 +50,4 @@ void timer_ic_set_polarity(uint32_t timer_peripheral, enum tim_ic_id ic, } } +/**@}*/ \ No newline at end of file diff --git a/lib/stm32/f2/timer.c b/lib/stm32/f2/timer.c deleted file mode 100644 index 6600705a..00000000 --- a/lib/stm32/f2/timer.c +++ /dev/null @@ -1,38 +0,0 @@ -/* This file is used for documentation purposes. It does not need -to be compiled. All source code is in the common area. -If there is any device specific code required it can be included here, -in which case this file must be added to the compile list. */ - -/** @defgroup timer_file Timers - -@ingroup STM32F2xx - -@brief libopencm3 STM32F2xx Timers - -@version 1.0.0 - -@date 18 August 2012 - -*/ - -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2010 Edward Cheeseman - * Copyright (C) 2011 Stephen Caudle - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include diff --git a/lib/stm32/f3/timer.c b/lib/stm32/f3/timer.c deleted file mode 100644 index 0e9ac3d4..00000000 --- a/lib/stm32/f3/timer.c +++ /dev/null @@ -1,33 +0,0 @@ -/** @defgroup timer_file TIMER - * - * @ingroup STM32F3xx - * - * @brief libopencm3 STM32F3xx Timers - * - * @version 1.0.0 - * - * @date 11 July 2013 - * - * LGPL License Terms @ref lgpl_license - */ - -/* - * This file is part of the libopencm3 project. - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include - - diff --git a/lib/stm32/f4/timer.c b/lib/stm32/f4/timer.c deleted file mode 100644 index 72ecd8df..00000000 --- a/lib/stm32/f4/timer.c +++ /dev/null @@ -1,38 +0,0 @@ -/* This file is used for documentation purposes. It does not need -to be compiled. All source code is in the common area. -If there is any device specific code required it can be included here, -in which case this file must be added to the compile list. */ - -/** @defgroup timer_file Timers - -@ingroup STM32F4xx - -@brief libopencm3 STM32F4xx Timers - -@version 1.0.0 - -@date 18 August 2012 - -*/ - -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2010 Edward Cheeseman - * Copyright (C) 2011 Stephen Caudle - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - */ - -#include diff --git a/lib/stm32/l1/Makefile b/lib/stm32/l1/Makefile index db8f3bf8..68a6b6ee 100644 --- a/lib/stm32/l1/Makefile +++ b/lib/stm32/l1/Makefile @@ -43,7 +43,7 @@ OBJS += gpio_common_all.o gpio_common_f0234.o OBJS += i2c_common_v1.o iwdg_common_all.o OBJS += pwr_common_v1.o pwr_common_v2.o rtc_common_l1f024.o OBJS += spi_common_all.o spi_common_v1.o spi_common_v1_frf.o -OBJS += timer_common_all.o +OBJS += timer.o timer_common_all.o OBJS += usart_common_all.o usart_common_f124.o OBJS += exti_common_all.o OBJS += rcc_common_all.o diff --git a/lib/stm32/l1/timer.c b/lib/stm32/l1/timer.c index ab69c622..f9ce5dd0 100644 --- a/lib/stm32/l1/timer.c +++ b/lib/stm32/l1/timer.c @@ -1,7 +1,5 @@ -/** @defgroup timer_file Timers - -@ingroup STM32L1xx - +/** @defgroup timer_file +@ingroup peripheral_apis @brief libopencm3 STM32L1xx Timers @version 1.0.0 @@ -30,10 +28,10 @@ * along with this library. If not, see . */ -/**@{*/ - #include +/**@{*/ + /*---------------------------------------------------------------------------*/ /** @brief Set Timer Option