andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@16322 27425a3e-05d8-49a3-a47f-9c15f0e5edd8

This commit is contained in:
fxcoder 2023-07-09 12:34:46 +00:00
parent 51588d23a2
commit 047402a73f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c
View File

@ -461,9 +461,9 @@ void dac_lld_start(DACDriver *dacp) {
#if STM32_DAC_HAS_MCR == TRUE #if STM32_DAC_HAS_MCR == TRUE
dacp->params->dac->MCR = dacp->config->mcr; dacp->params->dac->MCR = dacp->config->mcr;
#endif #endif
/* Enable and initialise both CH1 and CH2. Mask out DMA and calibrate.*/ /* Enable and initialise both CH1 and CH2. Mask out DMA enable.*/
reg = dacp->config->cr; reg = dacp->config->cr;
reg &= ~(DAC_CR_DMAEN1 | DAC_CR_DMAEN2 | DAC_CR_CEN1 | DAC_CR_CEN2); reg &= ~(DAC_CR_DMAEN1 | DAC_CR_DMAEN2);
dacp->params->dac->CR = DAC_CR_EN2 | DAC_CR_EN1 | reg; dacp->params->dac->CR = DAC_CR_EN2 | DAC_CR_EN1 | reg;
dac_lld_put_channel(dacp, 0U, (dacsample_t)dacp->config->init); dac_lld_put_channel(dacp, 0U, (dacsample_t)dacp->config->init);
dac_lld_put_channel(dacp, 1U, (dacsample_t)(dacp->config->init >> dac_lld_put_channel(dacp, 1U, (dacsample_t)(dacp->config->init >>
@ -774,9 +774,9 @@ void dac_lld_start_conversion(DACDriver *dacp) {
STM32_DMA_CR_HTIE | STM32_DMA_CR_TCIE); STM32_DMA_CR_HTIE | STM32_DMA_CR_TCIE);
dmaStreamEnable(dacp->dma); dmaStreamEnable(dacp->dma);
/* DAC configuration. Mask out DMA and calibration.*/ /* DAC configuration. Mask out DMA enable*/
cr = dacp->params->dac->CR; cr = dacp->params->dac->CR;
// cr &= ~(DAC_CR_CEN1 | DAC_CR_CEN2 | DAC_CR_DMAEN2); cr &= ~(DAC_CR_DMAEN2);
#if STM32_DAC_DUAL_MODE == FALSE #if STM32_DAC_DUAL_MODE == FALSE
/* Start the DMA on the single channel.*/ /* Start the DMA on the single channel.*/
cr &= dacp->params->regmask; cr &= dacp->params->regmask;