YuanHongbin/Acc_Support_29V_HV2.x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Motor_Test' into 双柱双电机S型传感器独立分支

Browse Source 
# Conflicts:
#	Project/HC32F460/MDK/HC32F460.uvoptx
#	Project/HC32F460/source/Module/dc_motor/dc_motor.h
This commit is contained in:
cui635
2025-10-17 15:59:21 +08:00
parent 60b35ce978 00c12ac889
commit 0094de177e
8 changed files with 533 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Project/HC32F460/source/User/Src/bsp.c
+13 -12
View File
@@ -8,6 +8,7 @@
#include "CS1237_RIGHTUP.h"
#include "CS1237_RIGHTLOW.h"
#include "dc_motor.h"
#define SPI_MASTER_MODE
#define SPI3_MASTER_MODE
@@ -16,7 +17,7 @@
static void SystemClockConfig(void);
uint16_t m_au16Adc1SaValue[4];
uint16_t m_au16Adc1SaValue[ADC_CH_NUM * ADC_COLL];
void FlashWrite(uint32_t *wData, uint32_t wLen)
{
@@ -1165,15 +1166,15 @@ static void AdcSetChannelPinMode(uint32_t u32Channel)
static void AdcChannelConfig(void)
{
stc_adc_ch_cfg_t stcChCfg;
uint8_t au8Adc1SaSampTime[4] = {255, 255, 255, 255};
uint8_t au8Adc1SaSampTime[3] = {2255, 255, 255};
MEM_ZERO_STRUCT(stcChCfg);
stcChCfg.u32Channel = ADC1_CH0 | ADC1_CH1 | ADC1_CH2 | ADC1_CH3;
stcChCfg.u32Channel = ADC1_CH1 | ADC1_CH2 | ADC1_CH3;
stcChCfg.u8Sequence = ADC_SEQ_A;
stcChCfg.pu8SampTime = au8Adc1SaSampTime;
AdcSetChannelPinMode(ADC1_CH0);
// AdcSetChannelPinMode(ADC1_CH0);
AdcSetChannelPinMode(ADC1_CH1);
AdcSetChannelPinMode(ADC1_CH2);
AdcSetChannelPinMode(ADC1_CH3);
@@ -1212,12 +1213,12 @@ static void AdcDmaConfig(void)
MEM_ZERO_STRUCT(stcDmaCfg);
stcDmaCfg.u16BlockSize = 4;
stcDmaCfg.u16BlockSize = 3;
stcDmaCfg.u16TransferCnt = 0u;
stcDmaCfg.u32SrcAddr = (uint32_t)(&M4_ADC1->DR0);
stcDmaCfg.u32SrcAddr = (uint32_t)(&M4_ADC1->DR1);
stcDmaCfg.u32DesAddr = (uint32_t)(m_au16Adc1SaValue);
stcDmaCfg.u16DesRptSize = 4;
stcDmaCfg.u16SrcRptSize = 4;
stcDmaCfg.u16DesRptSize = ADC_SUM;
stcDmaCfg.u16SrcRptSize = 3;
stcDmaCfg.u32DmaLlp = 0u;
stcDmaCfg.stcSrcNseqCfg.u16Cnt = 0u;
stcDmaCfg.stcSrcNseqCfg.u32Offset = 0u;
@@ -1230,7 +1231,7 @@ static void AdcDmaConfig(void)
stcDmaCfg.stcDmaChCfg.enSrcNseqEn = Disable;
stcDmaCfg.stcDmaChCfg.enDesNseqEn = Disable;
stcDmaCfg.stcDmaChCfg.enTrnWidth = Dma16Bit;
stcDmaCfg.stcDmaChCfg.enLlpEn = Disable;
stcDmaCfg.stcDmaChCfg.enLlpEn = Enable;
/* Enable DMA interrupt. */
stcDmaCfg.stcDmaChCfg.enIntEn = Enable;
@@ -1362,9 +1363,9 @@ void BSP_Init(void)
//SdioInit();
//Spi_Config();
// Spi3_Config();
//Adc1_Config();
//Dma_Config();
dcmotor_init();
Adc1_Config();
Dma_Config();
//FeedDog();
SysTick_Init(1000u);
Project/HC32F460/source/User/Src/main.c
+3
View File
@@ -833,6 +833,7 @@ int main(void)
#endif
ReadLoopHandler();
DcmotorLoopHandler();
AdcLoopHander();
AppLoopHandler();
}
}
@@ -853,6 +854,7 @@ void SysTick_IrqHandler(void)
RIGHTUP_CS12371mSRoutine();
RIGHTLOW_CS12371mSRoutine();
Dcmotor1msRoutine();
Adc1mSRoutine();
}
/*****************************************************************************************
@@ -875,5 +877,6 @@ void RtcPeriod_IrqCallback(void)
void ADC_DMA_CallBack(void)
{
}