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

Timestamp:

Feb 14, 2025, 11:42:01 AM (3 months ago)

Author:

Zed

Message:

Fixing project.

Location:

ctrl/firmware/Main/CubeMX/Core

Files:

• Inc/stm32h7xx_it.h (modified) (1 diff)
• Src/adc.c (modified) (5 diffs)
• Src/main.c (modified) (3 diffs)
• Src/stm32h7xx_hal_msp.c (modified) (1 diff)
• Src/stm32h7xx_it.c (modified) (2 diffs)

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

@@ -67 +67 @@
 void TIM7_IRQHandler(void);
 void SPI4_IRQHandler(void);
-void MDMA_IRQHandler(void);
 void BDMA_Channel0_IRQHandler(void);
 void USART10_IRQHandler(void);

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

@@ -23 +23 @@
 /* USER CODE BEGIN 0 */
 
-ADC3_data_t ADC3_values         __attribute__((section(".BKP_RAM_4_DMA")));
+uint16_t ADC3_values[1] __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_ENABLE;
-  hadc3.Init.EOCSelection = ADC_EOC_SEQ_CONV;
+  hadc3.Init.ScanConvMode = ADC_SCAN_DISABLE;
+  hadc3.Init.EOCSelection = ADC_EOC_SINGLE_CONV;
   hadc3.Init.LowPowerAutoWait = DISABLE;
   hadc3.Init.ContinuousConvMode = ENABLE;
-  hadc3.Init.NbrOfConversion = 4;
+  hadc3.Init.NbrOfConversion = 1;
   hadc3.Init.DiscontinuousConvMode = DISABLE;
   hadc3.Init.ExternalTrigConv = ADC_SOFTWARE_START;
@@ -60 +60 @@
   hadc3.Init.DMAContinuousRequests = ENABLE;
   hadc3.Init.SamplingMode = ADC_SAMPLING_MODE_NORMAL;
-  hadc3.Init.ConversionDataManagement = ADC_CONVERSIONDATA_DR;
+  hadc3.Init.ConversionDataManagement = ADC_CONVERSIONDATA_DMA_CIRCULAR;
   hadc3.Init.Overrun = ADC_OVR_DATA_OVERWRITTEN;
   hadc3.Init.LeftBitShift = ADC_LEFTBITSHIFT_NONE;
   hadc3.Init.OversamplingMode = ENABLE;
   hadc3.Init.Oversampling.Ratio = ADC3_OVERSAMPLING_RATIO_256;
-  hadc3.Init.Oversampling.RightBitShift = ADC_RIGHTBITSHIFT_11;
+  hadc3.Init.Oversampling.RightBitShift = ADC_RIGHTBITSHIFT_8;
   hadc3.Init.Oversampling.TriggeredMode = ADC_TRIGGEREDMODE_SINGLE_TRIGGER;
   hadc3.Init.Oversampling.OversamplingStopReset = ADC_REGOVERSAMPLING_CONTINUED_MODE;
@@ -75 +75 @@
   /** Configure Regular Channel
   */
-  sConfig.Channel = ADC_CHANNEL_VBAT;
+  sConfig.Channel = ADC_CHANNEL_10;
   sConfig.Rank = ADC_REGULAR_RANK_1;
   sConfig.SamplingTime = ADC3_SAMPLETIME_640CYCLES_5;
@@ -86 +86 @@
     Error_Handler();
   }
-
-  /** Configure Regular Channel
-  */
-  sConfig.Channel = ADC_CHANNEL_VREFINT;
-  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_3;
-  if (HAL_ADC_ConfigChannel(&hadc3, &sConfig) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-  /** Configure Regular Channel
-  */
-  sConfig.Channel = ADC_CHANNEL_10;
-  sConfig.Rank = ADC_REGULAR_RANK_4;
-  sConfig.SamplingTime = ADC3_SAMPLETIME_2CYCLES_5;
-  if (HAL_ADC_ConfigChannel(&hadc3, &sConfig) != HAL_OK)
-  {
-    Error_Handler();
-  }
   /* USER CODE BEGIN ADC3_Init 2 */
 
+  HAL_Delay(100U);
   if (HAL_OK != HAL_ADCEx_Calibration_Start(&hadc3, ADC_CALIB_OFFSET, ADC_SINGLE_ENDED)) Error_Handler();
   if (HAL_OK != HAL_ADCEx_Calibration_Start(&hadc3, ADC_CALIB_OFFSET_LINEARITY, ADC_SINGLE_ENDED)) Error_Handler();
+  HAL_Delay(100U);
 
-  if (HAL_OK != HAL_ADC_Start_DMA(&hadc3, (uint32_t*)&ADC3_values, 2)) Error_Handler();
-  __HAL_DMA_DISABLE_IT(&hdma_adc3, DMA_IT_HT);
+  //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();
+  //__HAL_DMA_DISABLE_IT(&hdma_adc3, DMA_IT_HT);
 
 

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

@@ -25 +25 @@
 #include "fatfs.h"
 #include "i2c.h"
-#include "mdma.h"
 #include "memorymap.h"
 #include "rtc.h"
@@ -131 +130 @@
   MX_GPIO_Init();
   MX_DMA_Init();
-  //MX_MDMA_Init();
   MX_BDMA_Init();
   MX_RTC_Init();
   MX_SPI4_Init();
   MX_SDMMC1_SD_Init();
-  MX_USART3_UART_Init();
   MX_FATFS_Init();
   MX_TIM8_Init();
@@ -145 +142 @@
   MX_I2C2_Init();
   MX_ADC3_Init();
+  MX_TIM3_Init();
   MX_I2C1_Init();
-  MX_TIM3_Init();
+  MX_USART3_UART_Init();
   /* USER CODE BEGIN 2 */
 

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

@@ -74 +74 @@
   HAL_NVIC_SetPriority(PendSV_IRQn, 15, 0);
 
+  /** Enable the VREF clock
+  */
+  __HAL_RCC_VREF_CLK_ENABLE();
+
+  /** Disable the Internal Voltage Reference buffer
+  */
+  HAL_SYSCFG_DisableVREFBUF();
+
+  /** Configure the internal voltage reference buffer high impedance mode
+  */
+  HAL_SYSCFG_VREFBUF_HighImpedanceConfig(SYSCFG_VREFBUF_HIGH_IMPEDANCE_ENABLE);
+
   /* USER CODE BEGIN MspInit 1 */
 

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

@@ -62 +62 @@
 /* External variables --------------------------------------------------------*/
 extern DMA_HandleTypeDef hdma_adc3;
-extern MDMA_HandleTypeDef hmdma_mdma_channel0_sdmmc1_end_data_0;
 extern SD_HandleTypeDef hsd1;
 extern DMA_HandleTypeDef hdma_spi2_rx;
@@ -381 +380 @@
 
 /**
-  * @brief This function handles MDMA global interrupt.
-  */
-void MDMA_IRQHandler(void)
-{
-  /* USER CODE BEGIN MDMA_IRQn 0 */
-
-  /* USER CODE END MDMA_IRQn 0 */
-  HAL_MDMA_IRQHandler(&hmdma_mdma_channel0_sdmmc1_end_data_0);
-  /* USER CODE BEGIN MDMA_IRQn 1 */
-
-  /* USER CODE END MDMA_IRQn 1 */
-}
-
-/**
   * @brief This function handles BDMA channel0 global interrupt.
   */