Changeset 95 for ctrl/firmware/Main/CubeMX/Core

Timestamp:

Feb 14, 2025, 12:15:38 PM (3 months ago)

Author:

Zed

Message:

Fixing project.

Location:

ctrl/firmware/Main/CubeMX/Core

Files:

• Inc/adc.h (modified) (3 diffs)
• Src/adc.c (modified) (4 diffs)

ctrl/firmware/Main/CubeMX/Core/Inc/adc.h

@@ -40 +40 @@
 
 #define ADC3_CHANNELS   (4U)
+#define VREF                    (3000U)
 
 typedef union ADC3_data_t
@@ -50 +51 @@
                 uint16_t CPUTemp;
                 uint16_t UBat;
-        };
+        } Name;
 } __attribute__((packed, aligned(32))) ADC3_data_t;
 
@@ -58 +59 @@
 
 /* USER CODE BEGIN Prototypes */
+
+extern volatile uint16_t ADC3_values[2];
 
 /* USER CODE END Prototypes */

ctrl/firmware/Main/CubeMX/Core/Src/adc.c

@@ -23 +23 @@
 /* USER CODE BEGIN 0 */
 
-uint16_t ADC3_values[1] __attribute__((section(".BKP_RAM_4_DMA")));
+volatile uint16_t ADC3_values[2] __attribute__((section(".BKP_RAM_4_DMA")));
 
 /* USER CODE END 0 */
@@ -50 +50 @@
   hadc3.Init.Resolution = ADC_RESOLUTION_12B;
   hadc3.Init.DataAlign = ADC3_DATAALIGN_RIGHT;
-  hadc3.Init.ScanConvMode = ADC_SCAN_DISABLE;
-  hadc3.Init.EOCSelection = ADC_EOC_SINGLE_CONV;
+  hadc3.Init.ScanConvMode = ADC_SCAN_ENABLE;
+  hadc3.Init.EOCSelection = ADC_EOC_SEQ_CONV;
   hadc3.Init.LowPowerAutoWait = DISABLE;
   hadc3.Init.ContinuousConvMode = ENABLE;
-  hadc3.Init.NbrOfConversion = 1;
+  hadc3.Init.NbrOfConversion = 2;
   hadc3.Init.DiscontinuousConvMode = DISABLE;
   hadc3.Init.ExternalTrigConv = ADC_SOFTWARE_START;
@@ -86 +86 @@
     Error_Handler();
   }
+
+  /** Configure Regular Channel
+  */
+  sConfig.Channel = ADC_CHANNEL_TEMPSENSOR;
+  sConfig.Rank = ADC_REGULAR_RANK_2;
+  if (HAL_ADC_ConfigChannel(&hadc3, &sConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
   /* USER CODE BEGIN ADC3_Init 2 */
 
@@ -94 +103 @@
 
   //if (HAL_OK != HAL_ADC_Start(&hadc3)) Error_Handler();
-  if (HAL_OK != HAL_ADC_Start_DMA(&hadc3, (uint32_t*)ADC3_values, 1/*ADC3_CHANNELS*/)) Error_Handler();
+  if (HAL_OK != HAL_ADC_Start_DMA(&hadc3, (uint32_t*)ADC3_values, 2/*ADC3_CHANNELS*/)) Error_Handler();
   //__HAL_DMA_DISABLE_IT(&hdma_adc3, DMA_IT_HT);