first testing, started the code
This commit is contained in:
@@ -23,6 +23,9 @@
|
||||
/* USER CODE BEGIN Includes */
|
||||
|
||||
/* USER CODE END Includes */
|
||||
extern DMA_HandleTypeDef hdma_adc3;
|
||||
|
||||
extern DMA_HandleTypeDef hdma_adc4;
|
||||
|
||||
/* Private typedef -----------------------------------------------------------*/
|
||||
/* USER CODE BEGIN TD */
|
||||
@@ -128,10 +131,28 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc)
|
||||
/**ADC3 GPIO Configuration
|
||||
PB13 ------> ADC3_IN5
|
||||
*/
|
||||
GPIO_InitStruct.Pin = GPIO_PIN_13;
|
||||
GPIO_InitStruct.Pin = VOLTAGE_Pin;
|
||||
GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
|
||||
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
||||
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
|
||||
HAL_GPIO_Init(VOLTAGE_GPIO_Port, &GPIO_InitStruct);
|
||||
|
||||
/* ADC3 DMA Init */
|
||||
/* ADC3 Init */
|
||||
hdma_adc3.Instance = DMA1_Channel1;
|
||||
hdma_adc3.Init.Request = DMA_REQUEST_ADC3;
|
||||
hdma_adc3.Init.Direction = DMA_PERIPH_TO_MEMORY;
|
||||
hdma_adc3.Init.PeriphInc = DMA_PINC_DISABLE;
|
||||
hdma_adc3.Init.MemInc = DMA_MINC_ENABLE;
|
||||
hdma_adc3.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
|
||||
hdma_adc3.Init.MemDataAlignment = DMA_MDATAALIGN_HALFWORD;
|
||||
hdma_adc3.Init.Mode = DMA_CIRCULAR;
|
||||
hdma_adc3.Init.Priority = DMA_PRIORITY_HIGH;
|
||||
if (HAL_DMA_Init(&hdma_adc3) != HAL_OK)
|
||||
{
|
||||
Error_Handler();
|
||||
}
|
||||
|
||||
__HAL_LINKDMA(hadc,DMA_Handle,hdma_adc3);
|
||||
|
||||
/* USER CODE BEGIN ADC3_MspInit 1 */
|
||||
|
||||
@@ -162,10 +183,28 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc)
|
||||
/**ADC4 GPIO Configuration
|
||||
PB14 ------> ADC4_IN4
|
||||
*/
|
||||
GPIO_InitStruct.Pin = GPIO_PIN_14;
|
||||
GPIO_InitStruct.Pin = CURRENT_Pin;
|
||||
GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
|
||||
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
||||
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
|
||||
HAL_GPIO_Init(CURRENT_GPIO_Port, &GPIO_InitStruct);
|
||||
|
||||
/* ADC4 DMA Init */
|
||||
/* ADC4 Init */
|
||||
hdma_adc4.Instance = DMA1_Channel2;
|
||||
hdma_adc4.Init.Request = DMA_REQUEST_ADC4;
|
||||
hdma_adc4.Init.Direction = DMA_PERIPH_TO_MEMORY;
|
||||
hdma_adc4.Init.PeriphInc = DMA_PINC_DISABLE;
|
||||
hdma_adc4.Init.MemInc = DMA_MINC_ENABLE;
|
||||
hdma_adc4.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
|
||||
hdma_adc4.Init.MemDataAlignment = DMA_MDATAALIGN_HALFWORD;
|
||||
hdma_adc4.Init.Mode = DMA_CIRCULAR;
|
||||
hdma_adc4.Init.Priority = DMA_PRIORITY_VERY_HIGH;
|
||||
if (HAL_DMA_Init(&hdma_adc4) != HAL_OK)
|
||||
{
|
||||
Error_Handler();
|
||||
}
|
||||
|
||||
__HAL_LINKDMA(hadc,DMA_Handle,hdma_adc4);
|
||||
|
||||
/* USER CODE BEGIN ADC4_MspInit 1 */
|
||||
|
||||
@@ -196,8 +235,10 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc)
|
||||
/**ADC3 GPIO Configuration
|
||||
PB13 ------> ADC3_IN5
|
||||
*/
|
||||
HAL_GPIO_DeInit(GPIOB, GPIO_PIN_13);
|
||||
HAL_GPIO_DeInit(VOLTAGE_GPIO_Port, VOLTAGE_Pin);
|
||||
|
||||
/* ADC3 DMA DeInit */
|
||||
HAL_DMA_DeInit(hadc->DMA_Handle);
|
||||
/* USER CODE BEGIN ADC3_MspDeInit 1 */
|
||||
|
||||
/* USER CODE END ADC3_MspDeInit 1 */
|
||||
@@ -216,8 +257,10 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc)
|
||||
/**ADC4 GPIO Configuration
|
||||
PB14 ------> ADC4_IN4
|
||||
*/
|
||||
HAL_GPIO_DeInit(GPIOB, GPIO_PIN_14);
|
||||
HAL_GPIO_DeInit(CURRENT_GPIO_Port, CURRENT_Pin);
|
||||
|
||||
/* ADC4 DMA DeInit */
|
||||
HAL_DMA_DeInit(hadc->DMA_Handle);
|
||||
/* USER CODE BEGIN ADC4_MspDeInit 1 */
|
||||
|
||||
/* USER CODE END ADC4_MspDeInit 1 */
|
||||
@@ -244,10 +287,10 @@ void HAL_COMP_MspInit(COMP_HandleTypeDef* hcomp)
|
||||
/**COMP5 GPIO Configuration
|
||||
PB13 ------> COMP5_INP
|
||||
*/
|
||||
GPIO_InitStruct.Pin = GPIO_PIN_13;
|
||||
GPIO_InitStruct.Pin = VOLTAGE_Pin;
|
||||
GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
|
||||
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
||||
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
|
||||
HAL_GPIO_Init(VOLTAGE_GPIO_Port, &GPIO_InitStruct);
|
||||
|
||||
/* USER CODE BEGIN COMP5_MspInit 1 */
|
||||
|
||||
@@ -263,10 +306,10 @@ void HAL_COMP_MspInit(COMP_HandleTypeDef* hcomp)
|
||||
/**COMP7 GPIO Configuration
|
||||
PB14 ------> COMP7_INP
|
||||
*/
|
||||
GPIO_InitStruct.Pin = GPIO_PIN_14;
|
||||
GPIO_InitStruct.Pin = CURRENT_Pin;
|
||||
GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
|
||||
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
||||
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
|
||||
HAL_GPIO_Init(CURRENT_GPIO_Port, &GPIO_InitStruct);
|
||||
|
||||
/* USER CODE BEGIN COMP7_MspInit 1 */
|
||||
|
||||
@@ -292,7 +335,7 @@ void HAL_COMP_MspDeInit(COMP_HandleTypeDef* hcomp)
|
||||
/**COMP5 GPIO Configuration
|
||||
PB13 ------> COMP5_INP
|
||||
*/
|
||||
HAL_GPIO_DeInit(GPIOB, GPIO_PIN_13);
|
||||
HAL_GPIO_DeInit(VOLTAGE_GPIO_Port, VOLTAGE_Pin);
|
||||
|
||||
/* USER CODE BEGIN COMP5_MspDeInit 1 */
|
||||
|
||||
@@ -307,7 +350,7 @@ void HAL_COMP_MspDeInit(COMP_HandleTypeDef* hcomp)
|
||||
/**COMP7 GPIO Configuration
|
||||
PB14 ------> COMP7_INP
|
||||
*/
|
||||
HAL_GPIO_DeInit(GPIOB, GPIO_PIN_14);
|
||||
HAL_GPIO_DeInit(CURRENT_GPIO_Port, CURRENT_Pin);
|
||||
|
||||
/* USER CODE BEGIN COMP7_MspDeInit 1 */
|
||||
|
||||
@@ -561,6 +604,15 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* htim_base)
|
||||
/* USER CODE END TIM1_MspInit 0 */
|
||||
/* Peripheral clock enable */
|
||||
__HAL_RCC_TIM1_CLK_ENABLE();
|
||||
/* TIM1 interrupt Init */
|
||||
HAL_NVIC_SetPriority(TIM1_BRK_TIM15_IRQn, 0, 0);
|
||||
HAL_NVIC_EnableIRQ(TIM1_BRK_TIM15_IRQn);
|
||||
HAL_NVIC_SetPriority(TIM1_UP_TIM16_IRQn, 0, 0);
|
||||
HAL_NVIC_EnableIRQ(TIM1_UP_TIM16_IRQn);
|
||||
HAL_NVIC_SetPriority(TIM1_TRG_COM_TIM17_IRQn, 0, 0);
|
||||
HAL_NVIC_EnableIRQ(TIM1_TRG_COM_TIM17_IRQn);
|
||||
HAL_NVIC_SetPriority(TIM1_CC_IRQn, 0, 0);
|
||||
HAL_NVIC_EnableIRQ(TIM1_CC_IRQn);
|
||||
/* USER CODE BEGIN TIM1_MspInit 1 */
|
||||
|
||||
/* USER CODE END TIM1_MspInit 1 */
|
||||
@@ -584,6 +636,12 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base)
|
||||
/* USER CODE END TIM1_MspDeInit 0 */
|
||||
/* Peripheral clock disable */
|
||||
__HAL_RCC_TIM1_CLK_DISABLE();
|
||||
|
||||
/* TIM1 interrupt DeInit */
|
||||
HAL_NVIC_DisableIRQ(TIM1_BRK_TIM15_IRQn);
|
||||
HAL_NVIC_DisableIRQ(TIM1_UP_TIM16_IRQn);
|
||||
HAL_NVIC_DisableIRQ(TIM1_TRG_COM_TIM17_IRQn);
|
||||
HAL_NVIC_DisableIRQ(TIM1_CC_IRQn);
|
||||
/* USER CODE BEGIN TIM1_MspDeInit 1 */
|
||||
|
||||
/* USER CODE END TIM1_MspDeInit 1 */
|
||||
|
||||
Reference in New Issue
Block a user