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

Timestamp:

Aug 31, 2025, 6:56:29 PM (3 days ago)

Author:

f.jahn

Message:

Shunt Temperatursensor aktiviert

File:

• trunk/fw_g473rct/SES/src/main.c (modified) (9 diffs)

trunk/fw_g473rct/SES/src/main.c

@@ -39 +39 @@
 #include "battery_voltage.h"
 #include "ads1260.h"
+#include "shunt_voltage.h"
+#include "fast_current.h"
+#include "int_bat_voltage.h"
+#include "chip_temperature.h"
+#include "shunt_temperature.h"
 /* USER CODE END Includes */
 
@@ -61 +66 @@
 modbus_t modbusData __attribute__((section(".RAM1")));
 
-__IO uint16_t adc12Data[2] __attribute__((section(".RAM1")));
+__IO uint16_t adc12Data[100][2] __attribute__((section(".RAM1")));
 __IO uint32_t adc1Data[1] __attribute__((section(".RAM1")));
 __IO uint32_t adc2Data[1] __attribute__((section(".RAM1")));
@@ -68 +73 @@
 __IO uint32_t adc5Data[4] __attribute__((section(".RAM1")));
 int silentmode =0;
-static volatile uint32_t newADC1Data = 0;
-static volatile uint32_t newADC2Data = 0;
+static volatile uint32_t newADC12Data = 0;
+static volatile uint32_t newADC3Data = 0;
+static volatile uint32_t newADC4Data = 0;
+static volatile uint32_t newADC5Data = 0;
 /* USER CODE END PV */
 
@@ -95 +102 @@
     uint8_t firstStartCatcher;
         int mode_button_disable_time=0;
+        uint32_t adc12_time;
+        uint32_t adc12_lasttime;
   /* USER CODE END 1 */
 
@@ -160 +169 @@
 
     // STM32G0 Chiptemperatur Kalibrierung
-  CHIP_TEMPERATURE_Calibration(/*&sys_data*/);
+  CHIP_TEMPERATURE_Calibration();
 
   HAL_ADCEx_Calibration_Start(&hadc1, ADC_DIFFERENTIAL_ENDED);
@@ -169 +178 @@
 
 
-
   //SET_BIT(hadc2.Instance->CFGR, ADC_CFGR_DMAEN); //Enable DMA transfer for ADC slave (ADC12_CCR.MDMA = 0b00 -> MDMA mode disabled)
   //HAL_DMA_Start(hadc2.DMA_Handle,(uint32_t)&hadc2.Instance->DR, (uint32_t)adc2Data,1); //Start ADC slave DMA 
@@ -175 +183 @@
   
     //HAL_ADC_Start_DMA(&hadc2, (uint32_t*)adc2Data, 1);
-  if (HAL_ADCEx_MultiModeStart_DMA(&hadc1,(uint32_t *)adc12Data,1))  //Start ADC interleaved mode
+  if (HAL_ADCEx_MultiModeStart_DMA(&hadc1,(uint32_t *)adc12Data,100))  //Start ADC interleaved mode
   {
      /* Start Error */
      Error_Handler();
   }
+
+  if (HAL_ADC_Start_DMA(&hadc3, (uint32_t *) adc3Data , 3))
+  {
+     /* Start Error */
+     Error_Handler();
+  }
+
+  if (HAL_ADC_Start_DMA(&hadc4, (uint32_t *) adc4Data , 1))
+  {
+     /* Start Error */
+     Error_Handler();
+  }
+
 
   if (HAL_ADC_Start_DMA(&hadc5, (uint32_t *) adc5Data , 4))
@@ -196 +217 @@
 
     /* USER CODE BEGIN 3 */
-        if (newADC1Data == 1)
-    {
-          BATTERY_VOLTAGE_Exec( adc12Data[1]);
-        }
-
+        if (newADC12Data == 1)
+    {
+          //Mit ADC_DIV2,Sample time 12,5Cycklen, ADC Clock 50Mhz, Oversampling 256
+          //Tconv = 6400 Takte = 0,128ms Pro Konvertierung. Also für 100 messwerte 12,8mS
+          BATTERY_VOLTAGE_Exec( adc12Data[0][1]);
+          FAST_CURRENT_Exec(adc12Data[0][0]); 
+          newADC12Data = 0;
+          adc12_time = HAL_GetTick() - adc12_lasttime;
+          adc12_lasttime = HAL_GetTick();
+
+        }
+
+
+        if (newADC3Data == 1)
+    {
+          SHUNT_TEMPERATURE_Exec(adc3Data[0]);
+        }
+
+
+        if (newADC4Data == 1)
+    {
+          SHUNT_VOLTAGE_Exec( adc4Data[0]);
+        }
+
+
+        if (newADC5Data == 1)
+    {
+          CHIP_TEMPERATURE_Exec(adc5Data[0]);
+          INT_BAT_VOLTAGE_Exec( adc5Data[1]);
+          sys_data.s.values.ovp_sense =  (adc5Data[2] * VREF * 21 ) / 65536.0;
+      sys_data.s.values.lvp_sense =  (adc5Data[3] * VREF * 21 ) / 65536.0;
+        }
 
         if(sys_data.s.parameter.command != 0)
@@ -327 +375 @@
     if (hadc->Instance==ADC1)
         {
-          newADC1Data=1;
-        }
-
-        if (hadc->Instance==ADC2)
+          newADC12Data=1;
+        }
+
+        if (hadc->Instance==ADC3)
         {
-          newADC2Data=1;
+          newADC3Data=1;
+        }
+
+
+        if (hadc->Instance==ADC4)
+        {
+          newADC4Data=1;
+        }
+
+        if (hadc->Instance==ADC5)
+        {
+          newADC5Data=1;
         }
  }