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

Timestamp:

Aug 4, 2026, 1:53:58 PM (25 hours ago)

Author:

f.jahn

Message:

Delta Sigma ADC auf 10Channel geändert.

File:

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

trunk/fw_g473rct/Core/Src/main.c

@@ -42 +42 @@
 #include "modbus.h"
 #include "chip_temperature.h"
-#include "battery_voltage.h"
+#include "battery_voltage_fast.h"
 #include "ads1260.h"
-#include "shunt_voltage.h"
+#include "shunt_voltage_fast.h"
 #include "fast_current.h"
 #include "int_bat_voltage.h"
@@ -92 +92 @@
 
 
-__IO uint32_t adc1Data[SAMPLE_ARRAY_SIZE] __attribute__((section(".RAM1_CRC")));
-__IO uint32_t adc2Data[SAMPLE_ARRAY_SIZE] __attribute__((section(".RAM1_CRC")));
-__IO uint32_t adc3Data[3];
-__IO uint32_t adc4Data[SAMPLE_ARRAY_SIZE] __attribute__((section(".RAM1_CRC")));
-__IO uint32_t adc5Data[4];
+__IO int32_t adc1Data[SAMPLE_ARRAY_SIZE] __attribute__((section(".RAM1_CRC")));
+__IO int32_t adc2Data[SAMPLE_ARRAY_SIZE] __attribute__((section(".RAM1_CRC")));
+__IO int32_t adc3Data[3];
+__IO int32_t adc4Data[SAMPLE_ARRAY_SIZE] __attribute__((section(".RAM1_CRC")));
+__IO int32_t adc5Data[4];
 int silentmode = 0;
 static volatile uint32_t newADC124Data = 0;
@@ -162 +162 @@
 
   /* USER CODE BEGIN Init */
-  
+  /* ------------------------------------------ INFO  -----------------
+   - Einige Module sind zum Stromsparen ausgeschaltet
+
+  */
   /* USER CODE END Init */
 
@@ -187 +190 @@
   MX_CRC_Init();
   MX_RTC_Init();
- // MX_IWDG_Init();
+  MX_IWDG_Init();
   MX_TIM3_Init();
+#ifndef  NO_USB_SUPPORT
   MX_USB_Device_Init();
   MX_UCPD1_Init();
+#endif
   /* USER CODE BEGIN 2 */
+
   printf("Test debug io\r\n");
-  printf("adc samplerate  core clock: %d kHz\r\n", (uint32_t) GetADCSampleRate() / 1000U);
+
   SYS_DATA_Init();
   WH_COUNTER_Init();
@@ -225 +231 @@
   mbInit(&modbusData, sys_data.s.parameter.baudrate, sys_data.s.parameter.parityMode, sys_data.s.parameter.stopBit, &huart2);
   HAL_IWDG_Refresh(&hiwdg);
+  HAL_Delay(500);
+  HAL_IWDG_Refresh(&hiwdg);
+
   // STM32G0 Chiptemperatur Kalibrierung
   CHIP_TEMPERATURE_Calibration();
 
-  HAL_ADCEx_Calibration_Start(&hadc1, ADC_DIFFERENTIAL_ENDED);
-  HAL_ADCEx_Calibration_Start(&hadc2, ADC_DIFFERENTIAL_ENDED);
-  HAL_ADCEx_Calibration_Start(&hadc3, ADC_SINGLE_ENDED);
-  HAL_ADCEx_Calibration_Start(&hadc4, ADC_DIFFERENTIAL_ENDED);
-  HAL_ADCEx_Calibration_Start(&hadc5, ADC_SINGLE_ENDED);
+  if (HAL_ADCEx_Calibration_Start(&hadc1, ADC_DIFFERENTIAL_ENDED) != HAL_OK) Error_Handler();
+  if (HAL_ADCEx_Calibration_Start(&hadc2, ADC_DIFFERENTIAL_ENDED) != HAL_OK) Error_Handler();
+  if (HAL_ADCEx_Calibration_Start(&hadc3, ADC_SINGLE_ENDED) != HAL_OK) Error_Handler();
+  if (HAL_ADCEx_Calibration_Start(&hadc4, ADC_DIFFERENTIAL_ENDED) != HAL_OK) Error_Handler();
+  if (HAL_ADCEx_Calibration_Start(&hadc5, ADC_SINGLE_ENDED) != HAL_OK) Error_Handler();
+
+
+
+  printf("%u, %u, %u\n", LL_ADC_GetCalibrationFactor(ADC1, LL_ADC_DIFFERENTIAL_ENDED), LL_ADC_GetCalibrationFactor(ADC2, LL_ADC_DIFFERENTIAL_ENDED), LL_ADC_GetCalibrationFactor(ADC4, LL_ADC_DIFFERENTIAL_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)
@@ -267 +281 @@
 
   /* USBPD initialisation ---------------------------------*/
+#ifndef NO_USB_SUPPORT
   MX_USBPD_Init();
-  
+#endif
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
@@ -274 +289 @@
   {
     /* USER CODE END WHILE */
+#ifndef NO_USB_SUPPORT
     USBPD_DPM_Run();
-
+#endif
     /* USER CODE BEGIN 3 */
     HAL_IWDG_Refresh(&hiwdg);
     if (newADC124Data == 7)
     {
-          SHUNT_VOLTAGE_Exec( adc4Data[0]);
+
+          SHUNT_VOLTAGE_FAST_Exec( adc4Data[SAMPLE_ARRAY_SIZE-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( adc2Data[SAMPLE_ARRAY_SIZE-1]);
+          BATTERY_VOLTAGE_FAST_Exec( adc2Data[SAMPLE_ARRAY_SIZE-1]);
           FAST_CURRENT_Exec(adc1Data[SAMPLE_ARRAY_SIZE-1]); 
           ESR_FAST_Exec();
@@ -290 +307 @@
           newADC124Data = 0;
 
-        //Auskommentiert, bringt komiscxherweise Spannungsschwankungen, beim loggen,... Spannung springt bis zu 50mv
-        //   HAL_ADCEx_Calibration_Start(&hadc1, ADC_DIFFERENTIAL_ENDED);
-        //   HAL_ADCEx_Calibration_Start(&hadc2, ADC_DIFFERENTIAL_ENDED);
-        //   HAL_ADCEx_Calibration_Start(&hadc4, ADC_DIFFERENTIAL_ENDED);
-
-
 
 
@@ -301 +312 @@
           if (HAL_ADC_Start_DMA(&hadc2,(uint32_t*)adc2Data,SAMPLE_ARRAY_SIZE)) Error_Handler(); //Start ADC interleaved mode
           if (HAL_ADC_Start_DMA(&hadc4,(uint32_t*)adc4Data,SAMPLE_ARRAY_SIZE)) Error_Handler(); //Start ADC interleaved mode
+          
+  
         }
 
@@ -368 +381 @@
       if (silentmode == 0)
       {
-        //HAL_GPIO_TogglePin(LED_FUNCTION_GPIO_Port, LED_FUNCTION_Pin);
+        HAL_GPIO_TogglePin(LED_FUNCTION_GPIO_Port, LED_FUNCTION_Pin);
                 //HAL_GPIO_TogglePin(AUX_EN_GPIO_Port, AUX_EN_Pin);
       }
@@ -425 +438 @@
                   case COMMAND_GOTO_SYS_BOOTLOADER:                                       bootLoaderMark = GOTO_SYSTEM_BOOTLOADER_MARK;
                                                                                                                           HAL_NVIC_SystemReset();                                                                                                         break;
-                  case COMMAND_SET_VOLTAGE_MEAS_TO_ZERO:                          BATTERY_VOLTAGE_ZeroCal();                                                                                              break;          
+                  case COMMAND_SET_VOLTAGE_MEAS_TO_ZERO:                          BATTERY_VOLTAGE_FAST_ZeroCal();
+                                                                                                                          ADS1260_BatteryVoltageZeroCal();
+                                                                                                                          ADS1260_ShuntVoltageZeroCal();
+                                                                                                                          SHUNT_VOLTAGE_FAST_ZeroCal();
+                                                                                                                          break;          
                                                                                                                         
           default:                                            printf("UNKNOWN COMMAND\n");
@@ -475 +492 @@
     }
 
+        //HAL_SuspendTick();
+        //HAL_PWR_EnterSLEEPMode(PWR_MAINREGULATOR_ON, PWR_SLEEPENTRY_WFI);
+        //HAL_ResumeTick();
+
+
+#ifndef NO_USB_SUPPORT 
         if (rb_available(&usb_in_buff) > 8)                                                                                     // 8 minimum packet size in Modbus RTU RHR/WHR
         {       // Theres something in our USB buffer. We need to process it
                 processUSB(&usb_in_buff, &usb_out_buff);
         }
+
 
         if (rb_available(&usb_out_buff) > 0)
@@ -499 +523 @@
                 lastTime_ms = HAL_GetTick();
         }
-  
+#endif
   }
   /* USER CODE END 3 */
@@ -563 +587 @@
 /* USER CODE BEGIN 4 */
 
+#ifndef NO_USB_SUPPORT 
 void processUSB(ring_buffer_t* const ring_in_buff, ring_buffer_t* const ring_out_buff)
 {
@@ -719 +744 @@
         }
 }
-
+#endif
 //------------------------------------------------------------------------------
 
@@ -804 +829 @@
  void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
  {
-        if (hadc->Instance==ADC1)
+        if (hadc->Instance == ADC1)
         {
           newADC124Data |= 1;
@@ -814 +839 @@
         else if (hadc->Instance==ADC3)
         {
-          newADC3Data=1;
+          newADC3Data = 1;
         }
         else if (hadc->Instance==ADC4)
         {
-          newADC124Data |=4;
+          newADC124Data |= 4;
         }
         else if (hadc->Instance==ADC5)
         {
-          newADC5Data=1;
+          newADC5Data = 1;
         }
  }