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

Timestamp:

Jun 5, 2026, 1:30:00 PM (5 days ago)

Author:

f.jahn

Message:

vor cube code generierung

File:

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

trunk/fw_g473rct/Core/Src/main.c

@@ -86 +86 @@
 /* USER CODE BEGIN PV */
 
+
 uint32_t bootLoaderMark __attribute__((section(".no_init")));
 
@@ -91 +92 @@
 
 
-__IO uint32_t adc1Data[SAMPLE_ARRAY_SIZE];
-__IO uint32_t adc2Data[SAMPLE_ARRAY_SIZE];
+__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];
+__IO uint32_t adc4Data[SAMPLE_ARRAY_SIZE] __attribute__((section(".RAM1_CRC")));
 __IO uint32_t adc5Data[4];
-int silentmode =0;
+int silentmode = 0;
 static volatile uint32_t newADC124Data = 0;
 static volatile uint32_t newADC3Data = 0;
@@ -119 +120 @@
 void DoNothing(void){};
 void processUSB(ring_buffer_t* const ring_in_buff, ring_buffer_t* const ring_out_buff);
-
+void ADC2_SetOffset(uint32_t channel, int16_t offset);
 /* USER CODE END PFP */
 
@@ -135 +136 @@
 
   /* USER CODE BEGIN 1 */
-
-  CheckRAMHWParity();
+  
+  //CheckRAMHWParity();
 
   if (bootLoaderMark == GOTO_SYSTEM_BOOTLOADER_MARK)
@@ -143 +144 @@
           JumpToBootloader();
   }
-
+  
   uint8_t firstStartCatcher;
   int mode_button_disable_time=0;
@@ -161 +162 @@
 
   /* USER CODE BEGIN Init */
-
+  
   /* USER CODE END Init */
 
@@ -170 +171 @@
   printf("System core clock: %uMHz\n", SystemCoreClock / 1000000U);
   /* USER CODE END SysInit */
-
+  
   /* Initialize all configured peripherals */
   MX_GPIO_Init();
@@ -186 +187 @@
   MX_CRC_Init();
   MX_RTC_Init();
-  MX_IWDG_Init();
+ // MX_IWDG_Init();
   MX_TIM3_Init();
   MX_USB_Device_Init();
@@ -192 +193 @@
   /* 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();
   AH_COUNTER_Init();
-
+  
   startType_t startType = EEPROM_isFirstStart();
 
@@ -205 +207 @@
           case FIRST_START_ERROR:                                               EEPROM_fullRestore(&sys_data);            break;
   }
+  
   HAL_IWDG_Refresh(&hiwdg);
 
@@ -218 +221 @@
   HAL_IWDG_Refresh(&hiwdg);
   LoadBackupRegister();
-
+  
   // 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
+  // STM32G0 Chiptemperatur Kalibrierung
   CHIP_TEMPERATURE_Calibration();
 
@@ -247 +250 @@
   printf("ADS1260 Init\n");
   OUTPUTS_Init();
-
+  
   //Display Adress with Error LED blinks
   for (int n = 0; n < sys_data.s.parameter.slave_address; n++)
@@ -260 +263 @@
         HAL_IWDG_Refresh(&hiwdg);
   }
-
+  
   /* USER CODE END 2 */
 
   /* USBPD initialisation ---------------------------------*/
   MX_USBPD_Init();
-
+  
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
@@ -274 +277 @@
 
     /* USER CODE BEGIN 3 */
-        HAL_IWDG_Refresh(&hiwdg);
-        if (newADC124Data == 1)
+    HAL_IWDG_Refresh(&hiwdg);
+    if (newADC124Data == 7)
     {
           SHUNT_VOLTAGE_Exec( adc4Data[0]);
@@ -287 +290 @@
           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);
+
+
+
+
           if (HAL_ADC_Start_DMA(&hadc1,(uint32_t*)adc1Data,SAMPLE_ARRAY_SIZE)) Error_Handler(); //Start ADC interleaved mode
           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
         }
 
@@ -356 +368 @@
       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);
       }
@@ -379 +391 @@
 
       sys_data.s.values.efficiency = EFFICIENCY_Exec();
-
-#ifdef DEBUG
-          /*if (sys_data.s.values.onTime % 5U == 0U)
-          {
-                  static char* Buf = "Hello everybody!\r\n";
-                  const unsigned BufLen = strlen(Buf);
-                  CDC_Transmit_FS((uint8_t*)Buf, BufLen - 1);
-          }*/
-#endif
     }
 
@@ -421 +424 @@
           case COMMAND_SET_RDP_LEVEL1_AND_BOOTSEL:            SetBootFromFlashAndReadOutProtection();                                                                     break;
                   case COMMAND_GOTO_SYS_BOOTLOADER:                                       bootLoaderMark = GOTO_SYSTEM_BOOTLOADER_MARK;
-                                                                                                                          HAL_NVIC_SystemReset();
+                                                                                                                          HAL_NVIC_SystemReset();                                                                                                         break;
+                  case COMMAND_SET_VOLTAGE_MEAS_TO_ZERO:                          BATTERY_VOLTAGE_ZeroCal();                                                                                              break;          
+                                                                                                                        
           default:                                            printf("UNKNOWN COMMAND\n");
         }
@@ -799 +804 @@
  void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
  {
-    if (hadc->Instance==ADC1)
+        if (hadc->Instance==ADC1)
         {
-          newADC124Data=1;
-        }
-
-        if (hadc->Instance==ADC3)
+          newADC124Data |= 1;
+        }
+        else if (hadc->Instance == ADC2)
+        {
+          newADC124Data |= 2;
+        }
+        else if (hadc->Instance==ADC3)
         {
           newADC3Data=1;
         }
-
-        if (hadc->Instance==ADC5)
+        else if (hadc->Instance==ADC4)
+        {
+          newADC124Data |=4;
+        }
+        else if (hadc->Instance==ADC5)
         {
           newADC5Data=1;
@@ -1066 +1077 @@
         }
 }
+
 
 /* USER CODE END 4 */