Changeset 19 for trunk/firmware_v2/Core

Timestamp:

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

Author:

f.jahn

Message:

Fixing project before changing Timer16 to Timer3

Location:

trunk/firmware_v2/Core

Files:

• Inc/stm32c0xx_it.h (modified) (1 diff)
• Inc/tim.h (modified) (1 diff)
• Src/dma.c (modified) (1 diff)
• Src/stm32c0xx_it.c (modified) (5 diffs)
• Src/tim.c (modified) (7 diffs)

trunk/firmware_v2/Core/Inc/stm32c0xx_it.h

@@ -53 +53 @@
 void SysTick_Handler(void);
 void DMA1_Channel1_IRQHandler(void);
+void DMA1_Channel2_3_IRQHandler(void);
 void TIM16_IRQHandler(void);
 /* USER CODE BEGIN EFP */

trunk/firmware_v2/Core/Inc/tim.h

@@ -48 +48 @@
 /* USER CODE BEGIN Prototypes */
 
+void SetFANSpeed(unsigned speed);
+
 /* USER CODE END Prototypes */
 

trunk/firmware_v2/Core/Src/dma.c

@@ -47 +47 @@
   HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn);
+  /* DMA1_Channel2_3_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel2_3_IRQn, 0, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel2_3_IRQn);
 
 }

trunk/firmware_v2/Core/Src/stm32c0xx_it.c

@@ -60 +60 @@
 /* External variables --------------------------------------------------------*/
 extern DMA_HandleTypeDef hdma_adc1;
+extern DMA_HandleTypeDef hdma_tim16_ch1;
 extern TIM_HandleTypeDef htim16;
 /* USER CODE BEGIN EV */
@@ -160 +161 @@
 
 /**
+  * @brief This function handles DMA1 channel 2 and channel 3 interrupts.
+  */
+void DMA1_Channel2_3_IRQHandler(void)
+{
+  /* USER CODE BEGIN DMA1_Channel2_3_IRQn 0 */
+
+  /* USER CODE END DMA1_Channel2_3_IRQn 0 */
+  HAL_DMA_IRQHandler(&hdma_tim16_ch1);
+  /* USER CODE BEGIN DMA1_Channel2_3_IRQn 1 */
+
+  /* USER CODE END DMA1_Channel2_3_IRQn 1 */
+}
+
+/**
   * @brief This function handles TIM16 global interrupt.
   */
@@ -177 +192 @@
 
 
-uint32_t capturedValue;
-uint32_t previousCaptureValue;
-uint32_t frequency;
-uint32_t overflowCnt;
-uint32_t T[STATE_NUM];
-
-static uint32_t avg;
-static uint32_t psc;
-static uint32_t freq;
-static uint32_t rpm;
+//uint32_t capturedValue;
+//uint32_t previousCaptureValue;
+//uint32_t frequency;
+//uint32_t overflowCnt;
+//uint32_t T[STATE_NUM];
+
+//static uint32_t avg;
+//static uint32_t psc;
+//static uint32_t freq;
+//static uint32_t rpm;
 
 
 void HAL_TIM_IC_CaptureCallback(TIM_HandleTypeDef* htim)
 {
+        extern uint32_t ic_overflows;
+
         if (htim->Instance == TIM16)
         {
-                static unsigned stateCnt;
-
+                printf("Full\n");
+                ic_overflows = 0U;
+                /*static unsigned stateCnt;
+  
                 capturedValue = HAL_TIM_ReadCapturedValue(htim, TIM_CHANNEL_1);
                 T[stateCnt++] = capturedValue + 65536U * overflowCnt;
@@ -217 +236 @@
 
                         stateCnt = 0U;
-                }
+                }*/
         }
 }
@@ -225 +244 @@
 void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef* htim)
 {
+        extern uint32_t ic_overflows;
+
         if (htim->Instance == TIM16)
         {
-                overflowCnt++;
+                ic_overflows++;
+                printf("Ovf\n");
+                //ic_overflows %= 
         }
 }
 
+//-----------------------------------------------------------------------------
+
+void HAL_TIM_IC_CaptureHalfCpltCallback(TIM_HandleTypeDef *htim)
+{
+        extern uint32_t ic_overflows;
+
+        if (htim->Instance == TIM16)
+        {
+                printf("Half\n");
+                ic_overflows = 0U;
+        }
+}
+
 /* USER CODE END 1 */

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 */