Changeset 38 for trunk/fw_g473rct/Core/Src/main.c

Timestamp:

Nov 1, 2025, 5:29:27 PM (45 hours ago)

Author:

f.jahn

Message:

 

File:

• trunk/fw_g473rct/Core/Src/main.c (modified) (15 diffs)

trunk/fw_g473rct/Core/Src/main.c

@@ -24 +24 @@
 #include "fdcan.h"
 #include "i2c.h"
+#include "iwdg.h"
 #include "rtc.h"
 #include "spi.h"
@@ -62 +63 @@
 /* Private define ------------------------------------------------------------*/
 /* USER CODE BEGIN PD */
-
+#define MAX_OVERCURRENT_RETRYS  3
 /* USER CODE END PD */
 
@@ -157 +158 @@
   MX_CRC_Init();
   MX_RTC_Init();
+  MX_IWDG_Init();
   /* USER CODE BEGIN 2 */
   printf("Test debug io\r\n");
@@ -165 +167 @@
 
   startType_t startType = EEPROM_isFirstStart();
-
+  
   switch(startType)
   {
@@ -173 +175 @@
           case FIRST_START_ERROR:                                               EEPROM_fullRestore(&sys_data);            break;
   }
+  HAL_IWDG_Refresh(&hiwdg);
 
   if(HAL_GPIO_ReadPin(GPIO_INPUT_BTN_MODE_GPIO_Port, GPIO_INPUT_BTN_MODE_Pin) == GPIO_PIN_RESET)
@@ -183 +186 @@
     }
   }
-
+  HAL_IWDG_Refresh(&hiwdg);
   LoadBackupRegister();
 
@@ -189 +192 @@
     // Modbus Initialisierung
   mbInit(&modbusData, sys_data.s.parameter.baudrate, sys_data.s.parameter.parityMode, sys_data.s.parameter.stopBit, &huart2);
-
+  HAL_IWDG_Refresh(&hiwdg);
     // STM32G0 Chiptemperatur Kalibrierung
   CHIP_TEMPERATURE_Calibration();
@@ -198 +201 @@
   HAL_ADCEx_Calibration_Start(&hadc4, ADC_DIFFERENTIAL_ENDED);
   HAL_ADCEx_Calibration_Start(&hadc5, ADC_SINGLE_ENDED);
-
+  HAL_IWDG_Refresh(&hiwdg);
 
   //SET_BIT(hadc2.Instance->CFGR, ADC_CFGR_DMAEN); //Enable DMA transfer for ADC slave (ADC12_CCR.MDMA = 0b00 -> MDMA mode disabled)
@@ -232 +235 @@
 
   // ADS1260 Initialierung
+  HAL_IWDG_Refresh(&hiwdg);
   ADS1260_init();
+  HAL_IWDG_Refresh(&hiwdg);
   printf("ADS1260 Init\n");
   OUTPUTS_Init();
@@ -241 +246 @@
     HAL_GPIO_WritePin(LED_ERROR_GPIO_Port, LED_ERROR_Pin, GPIO_PIN_SET);
     HAL_Delay(350);
+        HAL_IWDG_Refresh(&hiwdg);
     HAL_GPIO_WritePin(LED_ERROR_GPIO_Port, LED_ERROR_Pin, GPIO_PIN_RESET);
     HAL_Delay(350);
+        HAL_IWDG_Refresh(&hiwdg);
   }
 
@@ -255 +262 @@
 
     /* USER CODE BEGIN 3 */
-if (newADC12Data == 1)
+        HAL_IWDG_Refresh(&hiwdg);
+        if (newADC12Data == 1)
     {
           //Mit ADC_DIV2,Sample time 12,5Cycklen, ADC Clock 50Mhz, Oversampling 256
@@ -306 +314 @@
     }
 
-         // Zeitbasis ms Systick;
+        
+        
+        // Zeitbasis ms Systick;
     newTime = HAL_GetTick();
-    timeDiff = newTime - oldTime;
-    oldTime = newTime;
-
-    if ((mode_button_disable_time > 0) && (timeDiff > 0))
-    {
-      mode_button_disable_time--;
-    }
-
-    // Zeitbasis Sekunde ber RTC
+    
+        if (newTime != oldTime) {
+          
+          oldTime = newTime;
+      
+          if (mode_button_disable_time > 0) 
+      {
+        mode_button_disable_time--;
+      }
+
+        }
+   
+
+        if (sys_data.s.values.overcurrentRetryCounter > MAX_OVERCURRENT_RETRYS)
+        {
+          printf("SHORT_CIRCUIT_PROTECTION\n");
+          sys_data.s.values.lvpState = OUTPUTS_LVP_SHORT_PROTECTION;
+          HAL_GPIO_WritePin(DISCHARGE_ENABLE_GPIO_Port, DISCHARGE_ENABLE_Pin, OUTPUTS_DISCHARGE_NOT_ALLOWED);
+
+          sys_data.s.values.lvpState = OUTPUTS_OVP_SHORT_PROTECTION;
+          HAL_GPIO_WritePin(CHARGE_ENABLE_GPIO_Port, CHARGE_ENABLE_Pin, OUTPUTS_CHARGE_NOT_ALLOWED);
+
+
+
+        }
+
+    // Zeitbasis Sekunde über RTC
     // muss immer sowohl das Zeit- als auch das Datumsregister lesen
     // da beide Shadowregister sind sonst wird die Zeit nicht mehr geupdatet
@@ -375 +403 @@
           case COMMAND_RESTORE_LAST_SAVED_VALUES:             EEPROM_readConfig(&sys_data);                                                                                               break;
           case COMMAND_STORE_WITH_SERIAL_NUMBER:              EEPROM_storeConfig(&sys_data,1);                                                                                    break;        // Seriennummer schreiben
-          case COMMAND_RESTART:                               NVIC_SystemReset();                                                                                                                 break;
+          case COMMAND_RESTART:                               while(1);                                                                                                                                   break;
           case COMMAND_BATTERY_CURRENT_OFFSET_CAL:            
                                 ADS_1260_BatteryCurrentOffsetCalibrationStart(&sys_data); 
@@ -465 +493 @@
   * in the RCC_OscInitTypeDef structure.
   */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI48|RCC_OSCILLATORTYPE_HSE
-                              |RCC_OSCILLATORTYPE_LSE;
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI48|RCC_OSCILLATORTYPE_LSI
+                              |RCC_OSCILLATORTYPE_HSE|RCC_OSCILLATORTYPE_LSE;
   RCC_OscInitStruct.HSEState = RCC_HSE_ON;
   RCC_OscInitStruct.LSEState = RCC_LSE_ON;
+  RCC_OscInitStruct.LSIState = RCC_LSI_ON;
   RCC_OscInitStruct.HSI48State = RCC_HSI48_ON;
   RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
@@ -768 +797 @@
   return  result;
 }
+
+
 /* USER CODE END 4 */