Changeset 19 for trunk/firmware_v2/Core/Src/tim.c

Timestamp:

Aug 19, 2025, 11:11:18 AM (8 days ago)

Author:

f.jahn

Message:

Fixing project before changing Timer16 to Timer3

File:

• trunk/firmware_v2/Core/Src/tim.c (modified) (7 diffs)

trunk/firmware_v2/Core/Src/tim.c

@@ -26 +26 @@
 #define AVG_NUM         (64U)
 
-uint32_t ic_buf[AVG_NUM][STATE_NUM];
-uint32_t ic_overflows[AVG_NUM][STATE_NUM];
+uint16_t ic_buf[AVG_NUM][STATE_NUM];
+uint32_t ic_overflows;
 
 /* USER CODE END 0 */
@@ -33 +33 @@
 TIM_HandleTypeDef htim16;
 TIM_HandleTypeDef htim17;
+DMA_HandleTypeDef hdma_tim16_ch1;
 
 /* TIM16 init function */
@@ -74 +75 @@
   /* USER CODE BEGIN TIM16_Init 2 */
 
-  HAL_TIM_IC_Start_DMA(&htim16, TIM_CHANNEL_1, ic_buf, STATE_NUM * AVG_NUM);
+  __HAL_TIM_ENABLE_IT(&htim16, TIM_IT_UPDATE);
+  HAL_TIM_IC_Start_DMA(&htim16, TIM_CHANNEL_1, (uint32_t*)ic_buf, STATE_NUM * AVG_NUM);
 
   /* USER CODE END TIM16_Init 2 */
@@ -134 +136 @@
   }
   /* USER CODE BEGIN TIM17_Init 2 */
+
+  
 
   /* USER CODE END TIM17_Init 2 */
@@ -163 +167 @@
     HAL_GPIO_Init(FAN_TACHO_GPIO_Port, &GPIO_InitStruct);
 
+    /* TIM16 DMA Init */
+    /* TIM16_CH1 Init */
+    hdma_tim16_ch1.Instance = DMA1_Channel2;
+    hdma_tim16_ch1.Init.Request = DMA_REQUEST_TIM16_CH1;
+    hdma_tim16_ch1.Init.Direction = DMA_PERIPH_TO_MEMORY;
+    hdma_tim16_ch1.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_tim16_ch1.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_tim16_ch1.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
+    hdma_tim16_ch1.Init.MemDataAlignment = DMA_MDATAALIGN_HALFWORD;
+    hdma_tim16_ch1.Init.Mode = DMA_CIRCULAR;
+    hdma_tim16_ch1.Init.Priority = DMA_PRIORITY_LOW;
+    if (HAL_DMA_Init(&hdma_tim16_ch1) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    __HAL_LINKDMA(tim_baseHandle,hdma[TIM_DMA_ID_CC1],hdma_tim16_ch1);
+
     /* TIM16 interrupt Init */
     HAL_NVIC_SetPriority(TIM16_IRQn, 0, 0);
@@ -228 +250 @@
     HAL_GPIO_DeInit(FAN_TACHO_GPIO_Port, FAN_TACHO_Pin);
 
+    /* TIM16 DMA DeInit */
+    HAL_DMA_DeInit(tim_baseHandle->hdma[TIM_DMA_ID_CC1]);
+
     /* TIM16 interrupt Deinit */
     HAL_NVIC_DisableIRQ(TIM16_IRQn);
@@ -249 +274 @@
 /* USER CODE BEGIN 1 */
 
+void SetFANSpeed(unsigned speed)
+{
+        const unsigned MAX_RPM = 1000U;                                                                                 // 100.0%
+
+        if (speed > MAX_RPM) speed = MAX_RPM;
+
+        const unsigned MAX_PWM = __HAL_TIM_GET_AUTORELOAD(&htim17);
+        const unsigned newPWM = (MAX_PWM * speed/ MAX_RPM);
+
+        __HAL_TIM_SET_COMPARE(&htim17, TIM_CHANNEL_1, newPWM);
+}
+
 /* USER CODE END 1 */