Changeset 24 for trunk/firmware_v2/SES/src/main.c

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

File:

• trunk/firmware_v2/SES/src/main.c (modified) (5 diffs)

trunk/firmware_v2/SES/src/main.c

@@ -32 +32 @@
 #include "relais.h"
 #include "leds.h"
+#include "fan.h"
 #include "chip_temperature.h"
 #include "modeswitch.h"
@@ -141 +142 @@
 
 
+        
+extern uint32_t frequency, ic_overflows;
+  ic_overflows = 0U;
+  __HAL_TIM_SetCounter(&htim16, 0U);
+
+  HAL_TIM_Base_Start_IT(&htim16);
+  HAL_TIM_IC_Start_IT(&htim16, TIM_CHANNEL_1);
+  int oldcaptureValue=0;
+
+
   /* USER CODE END 2 */
 
@@ -166 +177 @@
         {
           msCounter = 0;
-      temperature = CHIP_TEMPERATURE_Exec(adcData[4]);
-          
-          if (temperature > 50)
+      CHIP_TEMPERATURE_Exec(adcData[4]);
+          temperature=CHIP_TEMPERATURE_GetTemp();
+          if ( temperature > 50)
           {  
                   pwm++;
@@ -178 +189 @@
                 if (pwm > 0) pwm--;
           }
-          SetFANSpeed(pwm);
-
-
-          if (temperature > 80)
-          {
-                  
-          
-          BUTTON_SetModeOff(); //Damit nicht von alleine wieder eingeschaltet wird
-                  LEDS_GN_Off();
-          LEDS_RT_BlinkCode_Start(BLINK_CODE_ERROR_TEMP, LED_RT_ON_TIME_WARN_TEMP, LED_RT_OFF_TIME, LED_RT_OFF_TIME *5); //Fehler Anzeigen
-          printf("Temperature too high!\n");
-          
-          }
-
-          // Starting measuring frequency of the FAN tacho output
-          static unsigned stage;
-          extern uint32_t freq, ic_overflows;
-
-          switch (stage)
-          {
-                  case 0:
-                          ic_overflows = 0U;
-                          __HAL_TIM_SetCounter(&htim16, 0U);
-                          HAL_TIM_Base_Start_IT(&htim16);
-                          HAL_TIM_IC_Start_IT(&htim16, TIM_CHANNEL_1);
-                          //printf("IC started\n");
-                          stage++;
-                          break;
-                  
-                  case 1: stage++; break;
-                  case 2: stage++; break;
-                  case 3: stage++; break;
-                  case 4: stage++; break;
-                  case 5: stage++; break;
-                  case 6:
-                          //printf("F = %u\n", freq);
-                          if (!freq)
-                          {
-                                  static unsigned zeroFreqCnt;
-
-                                  zeroFreqCnt++;
-                                  // Checking if we set last time non-zero FAN-speed, but
-                                  // tacho-sensor signal is absent more than 15 sec.
-                                  if (zeroFreqCnt > 3U && GetLastSpeed())
-                                  {
-                                          SetFANSpeed(0U);
-                                          // ACHTUNG! Der Lüfter ist kaputt!
-                                  }
-                          }
-                          stage = 0;
-                          break;
-          }
+         
+          FAN_SetSpeed(pwm);
 
           uin = VOLTAGE_MEAS_GetUin();
           uout = VOLTAGE_MEAS_GetUout();
-          printf("uin= %d, uout=%d, temp=%d, pwm=%d, fan=%d\r\n", uin, uout, temperature,pwm,freq);
+          uint32_t rpm;
+          rpm = frequency / 2;
+          rpm = rpm * 60;
+          printf("uin= %d, uout=%d, temp=%d, pwm=%d, fan=%d\r\n", uin, uout, temperature,pwm,rpm);
           
           
@@ -242 +206 @@
     switch (MODESWITCH_GetMode())
     {
-      case MODE_MAINSWITCH:
+      case MODE_MAINSWITCH: //0
         MODE_MAINSWITCH_Exec();
       break;
 
-      case MODE_MAINSWITCH_SECONDARYPROTECTION:
+      case MODE_MAINSWITCH_SECONDARYPROTECTION://1
         MODE_SECONDARYPROTECTION_Exec();
       break;
 
-      case MODE_MAINSWITCH_SECONDARYPROTECTION_PLUS:
+      case MODE_MAINSWITCH_SECONDARYPROTECTION_PLUS://2
         MODE_SECONDARYPROTECTION_PLUS_Exec();
       break;
 
-          case MODE_MAINSWITCH_LVP_OVP:
-     //   MODE_LVP_OVP_Exec();
-      break;
-
-      //case MODE_MAINSWITCH_LVP:
-      //  MODE_LVP_Exec();
-      //break;
-
-      //case MODE_MAINSWITCH_OVP:
-      //  MODE_OVP_Exec();
-      //break;
+          case MODE_MAINSWITCH_LVP_OVP://3
+        MODE_LVP_OVP_Exec();
+      break;
+
+      case MODE_MAINSWITCH_LVP://4
+        MODE_LVP_Exec();
+      break;
+
+      case MODE_MAINSWITCH_OVP://5
+        MODE_OVP_Exec();
+      break;