Changeset 24 for trunk/firmware_v2/Core

Timestamp:

Aug 23, 2025, 3:27:52 PM (4 days ago)

Author:

f.jahn

Message:

LVP, OVP, LVP

OVP modes implementiert

• Lüftersteuerung in eigenes Modul verlagert

Location:

trunk/firmware_v2/Core

Files:

• Inc/tim.h (modified) (2 diffs)
• Src/stm32c0xx_it.c (modified) (3 diffs)
• Src/tim.c (modified) (3 diffs)

trunk/firmware_v2/Core/Inc/tim.h

@@ -39 +39 @@
 /* USER CODE BEGIN Private defines */
 
-#define STATE_NUM       (3U)
 
 /* USER CODE END Private defines */
@@ -50 +49 @@
 /* USER CODE BEGIN Prototypes */
 
-void SetFANSpeed(unsigned speed);                 // Von 0 bis 100
-unsigned GetLastSpeed(void);
+
 
 /* USER CODE END Prototypes */

trunk/firmware_v2/Core/Src/stm32c0xx_it.c

@@ -64 +64 @@
 extern TIM_HandleTypeDef htim16;
 /* USER CODE BEGIN EV */
-
+ uint32_t captureValue = 0;
+ uint32_t previousCaptureValue = 0;
+ uint32_t frequency = 0;
+ uint32_t ic_overflows = 0;
 /* USER CODE END EV */
 
@@ -179 +182 @@
 void HAL_TIM_IC_CaptureCallback(TIM_HandleTypeDef* htim)
 {
-        extern uint32_t ic_overflows, freq;
-        extern uint32_t period[STATE_NUM];
-
-        if (htim->Instance == TIM16)
-        {
-                static unsigned state;
-                
-                period[state] = HAL_TIM_ReadCapturedValue(htim, TIM_CHANNEL_1) + 65536 * ic_overflows;
-                //__HAL_TIM_SetCounter(htim, 0U);
-                ic_overflows = 0U;
-                state++;
-                if (state >= STATE_NUM)
-                {
-                        state = 0;
-                        HAL_TIM_Base_Stop_IT(htim);
-                        HAL_TIM_IC_Stop_IT(htim, TIM_CHANNEL_1);
-                        uint32_t timerClock_Hz = HAL_RCC_GetPCLK1Freq();
-                        uint32_t icClock_Hz = timerClock_Hz / (htim->Instance->PSC + 1);
-                        freq = (icClock_Hz * 30U) / (period[2] - period[1]);
-                }
-        }
+    if (htim->Channel == HAL_TIM_ACTIVE_CHANNEL_1) {
+        captureValue = HAL_TIM_ReadCapturedValue(htim, TIM_CHANNEL_1);
+        frequency = HAL_RCC_GetPCLK1Freq() / (htim->Instance->PSC  + 1) / (captureValue);
+        //previousCaptureValue = captureValue;
+                htim->Instance->CNT=0; //Timer zurücksetzen, damit normalerweise kein Overflow auftritt. Nur bei  Drehzahl 0 oder Nahe 0 wird OVL ausgelöst
+                ic_overflows=0; 
+    }
 }
 
@@ -206 +195 @@
 void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef* htim)
 {
-        extern uint32_t ic_overflows, freq;
+        
 
         if (htim->Instance == TIM16)
         {
                 ic_overflows++;
-                if (ic_overflows > 10U) freq = 0;
+                if (ic_overflows > 0) frequency = 0;
         }
 }

trunk/firmware_v2/Core/Src/tim.c

@@ -25 +25 @@
 #include <stdio.h>
 
-uint32_t period[STATE_NUM];
-uint32_t freq;
-uint32_t ic_overflows;
+
+
+
 
 /* USER CODE END 0 */
@@ -48 +48 @@
   /* USER CODE END TIM16_Init 1 */
   htim16.Instance = TIM16;
-  htim16.Init.Prescaler = 23;
+  htim16.Init.Prescaler = 119;
   htim16.Init.CounterMode = TIM_COUNTERMODE_UP;
   htim16.Init.Period = 65535;
@@ -247 +247 @@
 /* USER CODE BEGIN 1 */
 
-static unsigned lastSpeed;
-
-void SetFANSpeed(unsigned speed)
-{
-        const unsigned MAX_RPM = 100U;                                                                                  // 100.0%
-
-        if (speed > MAX_RPM) speed = MAX_RPM;
-
-        lastSpeed = speed;
-
-        const unsigned MAX_PWM = __HAL_TIM_GET_AUTORELOAD(&htim17) + 1U;
-        //printf("%u", MAX_PWM);
-        const unsigned newPWM = (MAX_PWM * speed/ MAX_RPM);
-
-        __HAL_TIM_SET_COMPARE(&htim17, TIM_CHANNEL_1, newPWM);
-}
-
-//-----------------------------------------------------------------------------
-
-unsigned GetLastSpeed(void)
-{
-        return lastSpeed;
-}
 
 /* USER CODE END 1 */