Kevin Kadooka / mbed-dev

Fork of mbed-dev build 137, last build before FAT file system appears to be broken. Also reduced HSE timeout time in STM4XX HAL

Fork of mbed-dev by mbed official

targets/TARGET_STM/hal_tick_16b.c@165:e614a9f1c9e2, 2017-05-26 (annotated)

Committer:
AnnaBridge
Date:
Fri May 26 12:39:01 2017 +0100
Revision:
165:e614a9f1c9e2
Parent:
156:95d6b41a828b 
This updates the lib to the mbed lib v 143

Who changed what in which revision?

UserRevisionLine numberNew contents of line
<> 153:fa9ff456f731 1 /* mbed Microcontroller Library
<> 153:fa9ff456f731 2 * Copyright (c) 2006-2016 ARM Limited
<> 153:fa9ff456f731 3 *
<> 153:fa9ff456f731 4 * Licensed under the Apache License, Version 2.0 (the "License");
<> 153:fa9ff456f731 5 * you may not use this file except in compliance with the License.
<> 153:fa9ff456f731 6 * You may obtain a copy of the License at
<> 153:fa9ff456f731 7 *
<> 153:fa9ff456f731 8 * http://www.apache.org/licenses/LICENSE-2.0
<> 153:fa9ff456f731 9 *
<> 153:fa9ff456f731 10 * Unless required by applicable law or agreed to in writing, software
<> 153:fa9ff456f731 11 * distributed under the License is distributed on an "AS IS" BASIS,
<> 153:fa9ff456f731 12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
<> 153:fa9ff456f731 13 * See the License for the specific language governing permissions and
<> 153:fa9ff456f731 14 * limitations under the License.
<> 153:fa9ff456f731 15 */
<> 153:fa9ff456f731 16 #include "hal_tick.h"
<> 153:fa9ff456f731 17
<> 153:fa9ff456f731 18 // A 16-bit timer is used
<> 153:fa9ff456f731 19 #if TIM_MST_16BIT
<> 153:fa9ff456f731 20
<> 153:fa9ff456f731 21 #define DEBUG_TICK 0 // Set to 1 to toggle a pin (see below which pin) at each tick
<> 153:fa9ff456f731 22
<> 153:fa9ff456f731 23 extern TIM_HandleTypeDef TimMasterHandle;
<> 153:fa9ff456f731 24
<> 153:fa9ff456f731 25 extern volatile uint32_t SlaveCounter;
<> 153:fa9ff456f731 26 extern volatile uint32_t oc_int_part;
<> 153:fa9ff456f731 27 extern volatile uint16_t oc_rem_part;
<> 153:fa9ff456f731 28 extern volatile uint8_t tim_it_update;
<> 153:fa9ff456f731 29 extern volatile uint32_t tim_it_counter;
<> 153:fa9ff456f731 30
<> 153:fa9ff456f731 31 volatile uint32_t PreviousVal = 0;
<> 153:fa9ff456f731 32
<> 153:fa9ff456f731 33 void us_ticker_irq_handler(void);
<> 153:fa9ff456f731 34 void set_compare(uint16_t count);
<> 153:fa9ff456f731 35
<> 153:fa9ff456f731 36 #if defined(TARGET_STM32F0)
<> 153:fa9ff456f731 37 void timer_update_irq_handler(void) {
<> 153:fa9ff456f731 38 #else
<> 153:fa9ff456f731 39 void timer_irq_handler(void)
<> 153:fa9ff456f731 40 {
<> 153:fa9ff456f731 41 #endif
<> 153:fa9ff456f731 42 uint16_t cnt_val = TIM_MST->CNT;
<> 153:fa9ff456f731 43 TimMasterHandle.Instance = TIM_MST;
<> 153:fa9ff456f731 44
<> 153:fa9ff456f731 45 // Clear Update interrupt flag
<> 153:fa9ff456f731 46 if (__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_UPDATE) == SET) {
<> 153:fa9ff456f731 47 if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_UPDATE) == SET) {
<> 153:fa9ff456f731 48 __HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_UPDATE);
<> 153:fa9ff456f731 49 SlaveCounter++;
<> 153:fa9ff456f731 50 tim_it_counter = cnt_val + (uint32_t)(SlaveCounter << 16);
<> 153:fa9ff456f731 51 tim_it_update = 1;
<> 153:fa9ff456f731 52 }
<> 153:fa9ff456f731 53 }
<> 153:fa9ff456f731 54
<> 153:fa9ff456f731 55 #if defined(TARGET_STM32F0)
<> 153:fa9ff456f731 56 } // end timer_update_irq_handler function
<> 153:fa9ff456f731 57 // Used for mbed timeout (channel 1) and HAL tick (channel 2)
<> 153:fa9ff456f731 58 void timer_oc_irq_handler(void)
<> 153:fa9ff456f731 59 {
<> 153:fa9ff456f731 60 uint16_t cnt_val = TIM_MST->CNT;
<> 153:fa9ff456f731 61 TimMasterHandle.Instance = TIM_MST;
<> 153:fa9ff456f731 62 #endif
<> 153:fa9ff456f731 63
<> 153:fa9ff456f731 64 // Channel 1 for mbed timeout
<> 153:fa9ff456f731 65 if (__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_CC1) == SET) {
<> 153:fa9ff456f731 66 if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_CC1) == SET) {
<> 153:fa9ff456f731 67 __HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_CC1);
<> 153:fa9ff456f731 68 if (oc_rem_part > 0) {
<> 153:fa9ff456f731 69 set_compare(oc_rem_part); // Finish the remaining time left
<> 153:fa9ff456f731 70 oc_rem_part = 0;
<> 153:fa9ff456f731 71 } else {
<> 153:fa9ff456f731 72 if (oc_int_part > 0) {
<> 153:fa9ff456f731 73 set_compare(0xFFFF);
<> 153:fa9ff456f731 74 oc_rem_part = cnt_val; // To finish the counter loop the next time
<> 153:fa9ff456f731 75 oc_int_part--;
<> 153:fa9ff456f731 76 } else {
<> 153:fa9ff456f731 77 us_ticker_irq_handler();
<> 153:fa9ff456f731 78 }
<> 153:fa9ff456f731 79 }
<> 153:fa9ff456f731 80 }
<> 153:fa9ff456f731 81 }
<> 153:fa9ff456f731 82
<> 153:fa9ff456f731 83 // Channel 2 for HAL tick
<> 153:fa9ff456f731 84 if (__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_CC2) == SET) {
<> 153:fa9ff456f731 85 if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_CC2) == SET) {
<> 153:fa9ff456f731 86 __HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_CC2);
AnnaBridge 165:e614a9f1c9e2 87 uint32_t val = __HAL_TIM_GET_COUNTER(&TimMasterHandle);
<> 153:fa9ff456f731 88 if ((val - PreviousVal) >= HAL_TICK_DELAY) {
<> 153:fa9ff456f731 89 // Increment HAL variable
<> 153:fa9ff456f731 90 HAL_IncTick();
<> 153:fa9ff456f731 91 // Prepare next interrupt
AnnaBridge 165:e614a9f1c9e2 92 __HAL_TIM_SET_COMPARE(&TimMasterHandle, TIM_CHANNEL_2, val + HAL_TICK_DELAY);
<> 153:fa9ff456f731 93 PreviousVal = val;
<> 153:fa9ff456f731 94 #if DEBUG_TICK > 0
<> 153:fa9ff456f731 95 HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
<> 153:fa9ff456f731 96 #endif
<> 153:fa9ff456f731 97 }
<> 153:fa9ff456f731 98 }
<> 153:fa9ff456f731 99 }
<> 153:fa9ff456f731 100 }
<> 153:fa9ff456f731 101
<> 153:fa9ff456f731 102 // Reconfigure the HAL tick using a standard timer instead of systick.
<> 153:fa9ff456f731 103 HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
<> 153:fa9ff456f731 104 {
<> 153:fa9ff456f731 105 // Enable timer clock
<> 153:fa9ff456f731 106 TIM_MST_RCC;
<> 153:fa9ff456f731 107
<> 153:fa9ff456f731 108 // Reset timer
<> 153:fa9ff456f731 109 TIM_MST_RESET_ON;
<> 153:fa9ff456f731 110 TIM_MST_RESET_OFF;
<> 153:fa9ff456f731 111
<> 153:fa9ff456f731 112 // Update the SystemCoreClock variable
<> 153:fa9ff456f731 113 SystemCoreClockUpdate();
<> 153:fa9ff456f731 114
<> 153:fa9ff456f731 115 // Configure time base
<> 153:fa9ff456f731 116 TimMasterHandle.Instance = TIM_MST;
<> 153:fa9ff456f731 117 TimMasterHandle.Init.Period = 0xFFFF;
<> 153:fa9ff456f731 118 TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 us tick
<> 153:fa9ff456f731 119 TimMasterHandle.Init.ClockDivision = 0;
<> 153:fa9ff456f731 120 TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP;
<> 156:95d6b41a828b 121 #ifdef TARGET_STM32F0
<> 156:95d6b41a828b 122 TimMasterHandle.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
<> 156:95d6b41a828b 123 #endif
<> 153:fa9ff456f731 124 HAL_TIM_Base_Init(&TimMasterHandle);
<> 153:fa9ff456f731 125
<> 153:fa9ff456f731 126 // Configure output compare channel 1 for mbed timeout (enabled later when used)
<> 153:fa9ff456f731 127 HAL_TIM_OC_Start(&TimMasterHandle, TIM_CHANNEL_1);
<> 153:fa9ff456f731 128
<> 153:fa9ff456f731 129 // Configure output compare channel 2 for HAL tick
<> 153:fa9ff456f731 130 HAL_TIM_OC_Start(&TimMasterHandle, TIM_CHANNEL_2);
AnnaBridge 165:e614a9f1c9e2 131 PreviousVal = __HAL_TIM_GET_COUNTER(&TimMasterHandle);
AnnaBridge 165:e614a9f1c9e2 132 __HAL_TIM_SET_COMPARE(&TimMasterHandle, TIM_CHANNEL_2, PreviousVal + HAL_TICK_DELAY);
<> 153:fa9ff456f731 133
<> 153:fa9ff456f731 134 // Configure interrupts
<> 153:fa9ff456f731 135 // Update interrupt used for 32-bit counter
<> 153:fa9ff456f731 136 // Output compare channel 1 interrupt for mbed timeout
<> 153:fa9ff456f731 137 // Output compare channel 2 interrupt for HAL tick
<> 153:fa9ff456f731 138 #if defined(TARGET_STM32F0)
<> 153:fa9ff456f731 139 NVIC_SetVector(TIM_MST_UP_IRQ, (uint32_t)timer_update_irq_handler);
<> 153:fa9ff456f731 140 NVIC_EnableIRQ(TIM_MST_UP_IRQ);
<> 153:fa9ff456f731 141 NVIC_SetPriority(TIM_MST_UP_IRQ, 0);
<> 153:fa9ff456f731 142 NVIC_SetVector(TIM_MST_OC_IRQ, (uint32_t)timer_oc_irq_handler);
<> 153:fa9ff456f731 143 NVIC_EnableIRQ(TIM_MST_OC_IRQ);
<> 153:fa9ff456f731 144 NVIC_SetPriority(TIM_MST_OC_IRQ, 1);
<> 153:fa9ff456f731 145 #else
<> 153:fa9ff456f731 146 NVIC_SetVector(TIM_MST_IRQ, (uint32_t)timer_irq_handler);
<> 153:fa9ff456f731 147 NVIC_EnableIRQ(TIM_MST_IRQ);
<> 153:fa9ff456f731 148 #endif
<> 153:fa9ff456f731 149
<> 153:fa9ff456f731 150 // Enable interrupts
<> 153:fa9ff456f731 151 __HAL_TIM_ENABLE_IT(&TimMasterHandle, TIM_IT_UPDATE); // For 32-bit counter
<> 153:fa9ff456f731 152 __HAL_TIM_ENABLE_IT(&TimMasterHandle, TIM_IT_CC2); // For HAL tick
<> 153:fa9ff456f731 153
<> 153:fa9ff456f731 154 // Enable timer
<> 153:fa9ff456f731 155 HAL_TIM_Base_Start(&TimMasterHandle);
<> 153:fa9ff456f731 156
<> 153:fa9ff456f731 157 #if DEBUG_TICK > 0
AnnaBridge 165:e614a9f1c9e2 158 __HAL_RCC_GPIOB_CLK_ENABLE();
<> 153:fa9ff456f731 159 GPIO_InitTypeDef GPIO_InitStruct;
<> 153:fa9ff456f731 160 GPIO_InitStruct.Pin = GPIO_PIN_6;
<> 153:fa9ff456f731 161 GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
<> 153:fa9ff456f731 162 GPIO_InitStruct.Pull = GPIO_PULLUP;
<> 153:fa9ff456f731 163 GPIO_InitStruct.Speed = GPIO_SPEED_FAST;
<> 153:fa9ff456f731 164 HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
<> 153:fa9ff456f731 165 #endif
<> 153:fa9ff456f731 166
<> 153:fa9ff456f731 167 return HAL_OK;
<> 153:fa9ff456f731 168 }
<> 153:fa9ff456f731 169
<> 153:fa9ff456f731 170 void HAL_SuspendTick(void)
<> 153:fa9ff456f731 171 {
<> 153:fa9ff456f731 172 TimMasterHandle.Instance = TIM_MST;
<> 153:fa9ff456f731 173 __HAL_TIM_DISABLE_IT(&TimMasterHandle, TIM_IT_CC2);
<> 153:fa9ff456f731 174 }
<> 153:fa9ff456f731 175
<> 153:fa9ff456f731 176 void HAL_ResumeTick(void)
<> 153:fa9ff456f731 177 {
<> 153:fa9ff456f731 178 TimMasterHandle.Instance = TIM_MST;
<> 153:fa9ff456f731 179 __HAL_TIM_ENABLE_IT(&TimMasterHandle, TIM_IT_CC2);
<> 153:fa9ff456f731 180 }
<> 153:fa9ff456f731 181
<> 153:fa9ff456f731 182 #endif // TIM_MST_16BIT