Changeset 71 for trunk/fw_g473rct/Core/Src/adc.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/adc.c (modified) (10 diffs)

trunk/fw_g473rct/Core/Src/adc.c

@@ -54 +54 @@
   */
   hadc1.Instance = ADC1;
-  hadc1.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
+  hadc1.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV1;
   hadc1.Init.Resolution = ADC_RESOLUTION_12B;
   hadc1.Init.DataAlign = ADC_DATAALIGN_RIGHT;
@@ -120 +120 @@
   */
   hadc2.Instance = ADC2;
-  hadc2.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
+  hadc2.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV1;
   hadc2.Init.Resolution = ADC_RESOLUTION_12B;
   hadc2.Init.DataAlign = ADC_DATAALIGN_RIGHT;
@@ -179 +179 @@
   */
   hadc3.Instance = ADC3;
-  hadc3.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
+  hadc3.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV256;
   hadc3.Init.Resolution = ADC_RESOLUTION_12B;
   hadc3.Init.DataAlign = ADC_DATAALIGN_RIGHT;
@@ -192 +192 @@
   hadc3.Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE;
   hadc3.Init.DMAContinuousRequests = ENABLE;
-  hadc3.Init.Overrun = ADC_OVR_DATA_OVERWRITTEN;
+  hadc3.Init.Overrun = ADC_OVR_DATA_PRESERVED;
   hadc3.Init.OversamplingMode = ENABLE;
   hadc3.Init.Oversampling.Ratio = ADC_OVERSAMPLING_RATIO_256;
@@ -263 +263 @@
   */
   hadc4.Instance = ADC4;
-  hadc4.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
+  hadc4.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV1;
   hadc4.Init.Resolution = ADC_RESOLUTION_12B;
   hadc4.Init.DataAlign = ADC_DATAALIGN_RIGHT;
@@ -276 +276 @@
   hadc4.Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_RISING;
   hadc4.Init.DMAContinuousRequests = DISABLE;
-  hadc4.Init.Overrun = ADC_OVR_DATA_PRESERVED;
+  hadc4.Init.Overrun = ADC_OVR_DATA_OVERWRITTEN;
   hadc4.Init.OversamplingMode = ENABLE;
   hadc4.Init.Oversampling.Ratio = ADC_OVERSAMPLING_RATIO_256;
@@ -291 +291 @@
   sConfig.Channel = ADC_CHANNEL_4;
   sConfig.Rank = ADC_REGULAR_RANK_1;
-  sConfig.SamplingTime = ADC_SAMPLETIME_640CYCLES_5;
+  sConfig.SamplingTime = ADC_SAMPLETIME_6CYCLES_5;
   sConfig.SingleDiff = ADC_DIFFERENTIAL_ENDED;
   sConfig.OffsetNumber = ADC_OFFSET_NONE;
@@ -321 +321 @@
   */
   hadc5.Instance = ADC5;
-  hadc5.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
+  hadc5.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV256;
   hadc5.Init.Resolution = ADC_RESOLUTION_12B;
   hadc5.Init.DataAlign = ADC_DATAALIGN_RIGHT;
@@ -596 +596 @@
     hdma_adc4.Init.PeriphInc = DMA_PINC_DISABLE;
     hdma_adc4.Init.MemInc = DMA_MINC_ENABLE;
-    hdma_adc4.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
+    hdma_adc4.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
     hdma_adc4.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
     hdma_adc4.Init.Mode = DMA_NORMAL;
@@ -788 +788 @@
 
 /* USER CODE BEGIN 1 */
-
+uint32_t GetADCClockHz(void)
+{
+    uint32_t hclk = HAL_RCC_GetHCLKFreq();
+
+    uint32_t ckmode =
+        (ADC12_COMMON->CCR & ADC_CCR_CKMODE) >> ADC_CCR_CKMODE_Pos;
+
+    switch (ckmode)
+    {
+        case 0x1:     // HCLK/1
+            return hclk;
+
+        case 0x2:     // HCLK/2
+            return hclk / 2;
+
+        case 0x3:     // HCLK/4
+            return hclk / 4;
+
+        default:      // Asynchroner ADC-Takt
+            // Hier muss die RCC-Konfiguration ausgewertet werden
+            // (PLL, SYSCLK, HSI usw.)
+            return 0;
+    }
+}
+
+float GetADCSampleRate(void)
+{
+    uint32_t adc_clk = GetADCClockHz();
+
+    if(adc_clk == 0)
+        return 0.0f;
+
+    float sample_cycles = 6.5f;
+    float conversion_cycles = 12.5f;
+
+    return adc_clk / (sample_cycles + conversion_cycles);
+}
 /* USER CODE END 1 */