diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-03-22 23:54:13 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-03-22 23:54:13 +0000 |
| commit | 908a670dfc44111c1c1f3fdee0ebb7471c2ef079 (patch) | |
| tree | f6971b2c7feb93ad38c224d93a8d75f645f86087 /stmhal/stm32f4xx_hal_msp.c | |
| parent | 02fa0358005fed02e989e7b1ad9b31f7a9ae8637 (diff) | |
stmhal: Add intensity method for blue LED.
As part of this, rejig the way TIM3 is initialised, since it's now
shared by USB CDC and the blue LED PWM.
Diffstat (limited to 'stmhal/stm32f4xx_hal_msp.c')
| -rw-r--r-- | stmhal/stm32f4xx_hal_msp.c | 57 |
1 files changed, 21 insertions, 36 deletions
diff --git a/stmhal/stm32f4xx_hal_msp.c b/stmhal/stm32f4xx_hal_msp.c index c64f37795..a8587c384 100644 --- a/stmhal/stm32f4xx_hal_msp.c +++ b/stmhal/stm32f4xx_hal_msp.c @@ -5,16 +5,7 @@ * @version V1.0.1
* @date 26-February-2014
* @brief HAL MSP module.
- *
- @verbatim
- ===============================================================================
- ##### How to use this driver #####
- ===============================================================================
- [..]
- This file is generated automatically by MicroXplorer and eventually modified
- by the user
-
- @endverbatim
+ *
******************************************************************************
* @attention
*
@@ -56,25 +47,7 @@ #include "obj.h"
#include "servo.h"
-/** @addtogroup STM32F4xx_HAL_Driver
- * @{
- */
-
-/** @defgroup HAL_MSP
- * @brief HAL MSP module.
- * @{
- */
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private function prototypes -----------------------------------------------*/
-/* Private functions ---------------------------------------------------------*/
-
-/** @defgroup HAL_MSP_Private_Functions
- * @{
- */
+TIM_HandleTypeDef TIM3_Handle;
/**
* @brief Initializes the Global MSP.
@@ -83,9 +56,21 @@ */
void HAL_MspInit(void) {
// set up the timer for USBD CDC
- USBD_CDC_TIMx_CLK_ENABLE();
- HAL_NVIC_SetPriority(USBD_CDC_TIMx_IRQn, 6, 0);
- HAL_NVIC_EnableIRQ(USBD_CDC_TIMx_IRQn);
+ __TIM3_CLK_ENABLE();
+
+ TIM3_Handle.Instance = TIM3;
+ TIM3_Handle.Init.Period = (USBD_CDC_POLLING_INTERVAL*1000) - 1;
+ TIM3_Handle.Init.Prescaler = 84-1;
+ TIM3_Handle.Init.ClockDivision = 0;
+ TIM3_Handle.Init.CounterMode = TIM_COUNTERMODE_UP;
+ HAL_TIM_Base_Init(&TIM3_Handle);
+
+ HAL_NVIC_SetPriority(TIM3_IRQn, 6, 0);
+ HAL_NVIC_EnableIRQ(TIM3_IRQn);
+
+ if (HAL_TIM_Base_Start(&TIM3_Handle) != HAL_OK) {
+ /* Starting Error */
+ }
}
/**
@@ -94,9 +79,9 @@ void HAL_MspInit(void) { * @retval None
*/
void HAL_MspDeInit(void) {
- // reset USBD CDC timer
- USBD_CDC_TIMx_FORCE_RESET();
- USBD_CDC_TIMx_RELEASE_RESET();
+ // reset TIM3 timer
+ __TIM3_FORCE_RESET();
+ __TIM3_RELEASE_RESET();
}
/**
@@ -162,7 +147,7 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef *hrtc) }
void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
- if (htim == &USBD_CDC_TIM3_Handle) {
+ if (htim == &TIM3_Handle) {
USBD_CDC_HAL_TIM_PeriodElapsedCallback();
} else if (htim == &servo_TIM2_Handle) {
servo_timer_irq_callback();
|