Diff: targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/us_ticker.c

Revision:

304:89b9c3a9a045

Parent:

237:f3da66175598

--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/us_ticker.c	Fri Aug 29 11:45:07 2014 +0100
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F334R8/us_ticker.c	Fri Aug 29 17:15:07 2014 +0100
@@ -51,7 +51,7 @@
     // Configure time base
     TimMasterHandle.Instance = TIM_MST;
     TimMasterHandle.Init.Period            = 0xFFFFFFFF;
-    TimMasterHandle.Init.Prescaler         = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 µs tick
+    TimMasterHandle.Init.Prescaler         = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 �s tick
     TimMasterHandle.Init.ClockDivision     = 0;
     TimMasterHandle.Init.CounterMode       = TIM_COUNTERMODE_UP;
     TimMasterHandle.Init.RepetitionCounter = 0;
@@ -70,10 +70,10 @@
     return TIM_MST->CNT;
 }
 
-void us_ticker_set_interrupt(unsigned int timestamp)
+void us_ticker_set_interrupt(timestamp_t timestamp)
 {
     // Set new output compare value
-    __HAL_TIM_SetCompare(&TimMasterHandle, TIM_CHANNEL_1, timestamp);
+    __HAL_TIM_SetCompare(&TimMasterHandle, TIM_CHANNEL_1, (uint32_t)timestamp);
     // Enable IT
     __HAL_TIM_ENABLE_IT(&TimMasterHandle, TIM_IT_CC1);
 }