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

Timestamp:

Feb 14, 2025, 1:48:18 PM (3 months ago)

Author:

Zed

Message:

ADC3 with DMA was implemented.
DTS was activated.

Location:

ctrl/firmware/Main/CubeMX/Core

Files:

• Inc/adc.h (modified) (2 diffs)
• Inc/dts.h (added)
• Inc/stm32h7xx_hal_conf.h (modified) (1 diff)
• Src/adc.c (modified) (4 diffs)
• Src/dts.c (added)
• Src/main.c (modified) (2 diffs)

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

@@ -47 +47 @@
         struct
         {
+                uint16_t UBat;
                 uint16_t Vbat;
+                uint16_t Temp;
                 uint16_t Vref;
-                uint16_t CPUTemp;
-                uint16_t UBat;
         } Name;
 } __attribute__((packed, aligned(32))) ADC3_data_t;
@@ -60 +60 @@
 /* USER CODE BEGIN Prototypes */
 
-extern volatile uint16_t ADC3_values[2];
+extern volatile ADC3_data_t ADC3Data;
 
 /* USER CODE END Prototypes */

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

@@ -88 +88 @@
 /* #define HAL_MDIOS_MODULE_ENABLED   */
 /* #define HAL_PSSI_MODULE_ENABLED   */
-/* #define HAL_DTS_MODULE_ENABLED   */
+#define HAL_DTS_MODULE_ENABLED
 #define HAL_GPIO_MODULE_ENABLED
 #define HAL_DMA_MODULE_ENABLED

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

@@ -23 +23 @@
 /* USER CODE BEGIN 0 */
 
-volatile uint16_t ADC3_values[2] __attribute__((section(".BKP_RAM_4_DMA")));
+volatile ADC3_data_t ADC3Data __attribute__((section(".BKP_RAM_4_DMA")));
 
 /* USER CODE END 0 */
@@ -54 +54 @@
   hadc3.Init.LowPowerAutoWait = DISABLE;
   hadc3.Init.ContinuousConvMode = ENABLE;
-  hadc3.Init.NbrOfConversion = 2;
+  hadc3.Init.NbrOfConversion = 4;
   hadc3.Init.DiscontinuousConvMode = DISABLE;
   hadc3.Init.ExternalTrigConv = ADC_SOFTWARE_START;
@@ -89 +89 @@
   /** Configure Regular Channel
   */
+  sConfig.Channel = ADC_CHANNEL_VBAT;
+  sConfig.Rank = ADC_REGULAR_RANK_2;
+  if (HAL_ADC_ConfigChannel(&hadc3, &sConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /** Configure Regular Channel
+  */
   sConfig.Channel = ADC_CHANNEL_TEMPSENSOR;
-  sConfig.Rank = ADC_REGULAR_RANK_2;
+  sConfig.Rank = ADC_REGULAR_RANK_3;
+  if (HAL_ADC_ConfigChannel(&hadc3, &sConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /** Configure Regular Channel
+  */
+  sConfig.Channel = ADC_CHANNEL_VREFINT;
+  sConfig.Rank = ADC_REGULAR_RANK_4;
   if (HAL_ADC_ConfigChannel(&hadc3, &sConfig) != HAL_OK)
   {
@@ -103 +121 @@
 
   //if (HAL_OK != HAL_ADC_Start(&hadc3)) Error_Handler();
-  if (HAL_OK != HAL_ADC_Start_DMA(&hadc3, (uint32_t*)ADC3_values, 2/*ADC3_CHANNELS*/)) Error_Handler();
+  if (HAL_OK != HAL_ADC_Start_DMA(&hadc3, (uint32_t*)&ADC3Data, ADC3_CHANNELS)) Error_Handler();
   //__HAL_DMA_DISABLE_IT(&hdma_adc3, DMA_IT_HT);
 

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

@@ -23 +23 @@
 #include "bdma.h"
 #include "dma.h"
+#include "dts.h"
 #include "fatfs.h"
 #include "i2c.h"
@@ -145 +146 @@
   MX_I2C1_Init();
   MX_USART3_UART_Init();
+  MX_DTS_Init();
   /* USER CODE BEGIN 2 */