Changeset 18 for trunk/firmware_v2/Core

Timestamp:

Aug 19, 2025, 9:08:57 AM (9 days ago)

Author:

f.jahn

Message:

Fixing Project

Location:

trunk/firmware_v2/Core/Src

Files:

• stm32c0xx_it.c (modified) (2 diffs)
• tim.c (modified) (5 diffs)

trunk/firmware_v2/Core/Src/stm32c0xx_it.c

@@ -23 +23 @@
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
+
+#include <stdio.h>
+
 /* USER CODE END Includes */
 
@@ -172 +175 @@
 /* USER CODE BEGIN 1 */
 
+
+
+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)
+{
+        if (htim->Instance == TIM16)
+        {
+                static unsigned stateCnt;
+
+                capturedValue = HAL_TIM_ReadCapturedValue(htim, TIM_CHANNEL_1);
+                T[stateCnt++] = capturedValue + 65536U * overflowCnt;
+                overflowCnt = 0U;
+                
+                if (stateCnt >= STATE_NUM - 1)
+                {
+                        static uint32_t i;
+
+                        ibuf[i++] = T[0] + T[1] + T[2] + T[3];
+
+                        if (i >= AVG_NUM)
+                        {
+                                uint32_t sum = 0U;
+                                for (unsigned j = 0U; j < AVG_NUM; j++) sum += ibuf[j];
+                                avg = sum / AVG_NUM;
+                                psc = htim->Instance->PSC + 1;
+                                freq = HAL_RCC_GetPCLK1Freq() / (psc * avg);
+                                rpm = freq * 60U;
+                                printf("%u\n", rpm);
+                        }
+
+                        stateCnt = 0U;
+                }
+        }
+}
+
+//-----------------------------------------------------------------------------
+
+void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef* htim)
+{
+        if (htim->Instance == TIM16)
+        {
+                overflowCnt++;
+        }
+}
+
 /* USER CODE END 1 */

trunk/firmware_v2/Core/Src/tim.c

@@ -23 +23 @@
 /* USER CODE BEGIN 0 */
 
+#define STATE_NUM       (2U)
+#define AVG_NUM         (64U)
+
+uint32_t ic_buf[AVG_NUM][STATE_NUM];
+uint32_t ic_overflows[AVG_NUM][STATE_NUM];
+
 /* USER CODE END 0 */
 
@@ -58 +64 @@
     Error_Handler();
   }
-  sConfigIC.ICPolarity = TIM_INPUTCHANNELPOLARITY_BOTHEDGE;
+  sConfigIC.ICPolarity = TIM_INPUTCHANNELPOLARITY_FALLING;
   sConfigIC.ICSelection = TIM_ICSELECTION_DIRECTTI;
   sConfigIC.ICPrescaler = TIM_ICPSC_DIV1;
@@ -68 +74 @@
   /* USER CODE BEGIN TIM16_Init 2 */
 
-  HAL_TIM_IC_Start(&htim16, TIM_CHANNEL_1);
+  HAL_TIM_IC_Start_DMA(&htim16, TIM_CHANNEL_1, ic_buf, STATE_NUM * AVG_NUM);
 
   /* USER CODE END TIM16_Init 2 */
@@ -105 +111 @@
   }
   sConfigOC.OCMode = TIM_OCMODE_PWM1;
-  sConfigOC.Pulse = 155;
+  sConfigOC.Pulse = 64;
   sConfigOC.OCPolarity = TIM_OCPOLARITY_LOW;
   sConfigOC.OCNPolarity = TIM_OCNPOLARITY_HIGH;
@@ -131 +137 @@
   /* USER CODE END TIM17_Init 2 */
   HAL_TIM_MspPostInit(&htim17);
+
 }