Skip to content

Commit bb2d03f

Browse files
authored
Merge pull request #3213 from bcostm/factorize_ticker
STM32: Refactor us_ticker.c + hal_tick.c files
2 parents c7d5ef0 + da23ef1 commit bb2d03f

File tree

109 files changed

+494
-7942
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+494
-7942
lines changed
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/**
2+
******************************************************************************
3+
* @file hal_tick.h
4+
* @author MCD Application Team
5+
* @brief Initialization of HAL tick
6+
******************************************************************************
7+
* @attention
8+
*
9+
* <h2><center>&copy; COPYRIGHT(c) 2014 STMicroelectronics</center></h2>
10+
*
11+
* Redistribution and use in source and binary forms, with or without modification,
12+
* are permitted provided that the following conditions are met:
13+
* 1. Redistributions of source code must retain the above copyright notice,
14+
* this list of conditions and the following disclaimer.
15+
* 2. Redistributions in binary form must reproduce the above copyright notice,
16+
* this list of conditions and the following disclaimer in the documentation
17+
* and/or other materials provided with the distribution.
18+
* 3. Neither the name of STMicroelectronics nor the names of its contributors
19+
* may be used to endorse or promote products derived from this software
20+
* without specific prior written permission.
21+
*
22+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
23+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
24+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
25+
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
26+
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27+
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
28+
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
29+
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
30+
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
31+
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32+
*
33+
******************************************************************************
34+
*/
35+
#ifndef __HAL_TICK_H
36+
#define __HAL_TICK_H
37+
38+
#ifdef __cplusplus
39+
extern "C" {
40+
#endif
41+
42+
#include "stm32f0xx.h"
43+
#include "cmsis_nvic.h"
44+
45+
#define TIM_MST TIM1
46+
#define TIM_MST_UP_IRQ TIM1_BRK_UP_TRG_COM_IRQn
47+
#define TIM_MST_OC_IRQ TIM1_CC_IRQn
48+
#define TIM_MST_RCC __TIM1_CLK_ENABLE()
49+
50+
#define TIM_MST_RESET_ON __TIM1_FORCE_RESET()
51+
#define TIM_MST_RESET_OFF __TIM1_RELEASE_RESET()
52+
53+
#define TIM_MST_16BIT 1 // 1=16-bit timer, 0=32-bit timer
54+
55+
#define TIM_MST_PCLK 2 // Select the peripheral clock number (1 or 2)
56+
57+
#define HAL_TICK_DELAY (1000) // 1 ms
58+
59+
#ifdef __cplusplus
60+
}
61+
#endif
62+
63+
#endif // __HAL_TICK_H
64+
65+
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F030R8/device/hal_tick.c

Lines changed: 0 additions & 178 deletions
This file was deleted.

targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F030R8/device/hal_tick.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,12 @@
5050
#define TIM_MST_RESET_ON __TIM1_FORCE_RESET()
5151
#define TIM_MST_RESET_OFF __TIM1_RELEASE_RESET()
5252

53+
#define TIM_MST_16BIT 1 // 1=16-bit timer, 0=32-bit timer
54+
55+
#define TIM_MST_PCLK 2 // Select the peripheral clock number (1 or 2)
56+
5357
#define HAL_TICK_DELAY (1000) // 1 ms
5458

55-
5659
#ifdef __cplusplus
5760
}
5861
#endif

0 commit comments

Comments
 (0)