From c0da3c4f42dd944a30199744679442cf2ef7b633 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Thu, 15 Nov 2018 16:24:32 +0000 Subject: Unified DAC demo. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12430 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c | 6 +++--- os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'os/hal') diff --git a/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c b/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c index 811918495..d71882b26 100644 --- a/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c +++ b/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c @@ -517,13 +517,13 @@ void dac_lld_start_conversion(DACDriver *dacp) { /* DAC configuration.*/ #if STM32_DAC_DUAL_MODE == FALSE - cr = DAC_CR_DMAEN1 | (dacp->grpp->trigger << 3) | DAC_CR_TEN1 | DAC_CR_EN1 | dacp->config->cr; + cr = DAC_CR_DMAEN1 | (dacp->grpp->trigger << DAC_CR_TSEL1_Pos) | DAC_CR_TEN1 | DAC_CR_EN1 | dacp->config->cr; dacp->params->dac->CR &= dacp->params->regmask; dacp->params->dac->CR |= cr << dacp->params->regshift; #else dacp->params->dac->CR = 0; - cr = DAC_CR_DMAEN1 | (dacp->grpp->trigger << 3) | DAC_CR_TEN1 | DAC_CR_EN1 | dacp->config->cr - | (dacp->grpp->trigger << 19) | DAC_CR_TEN2 | DAC_CR_EN2 | (dacp->config->cr << 16); + cr = DAC_CR_DMAEN1 | (dacp->grpp->trigger << DAC_CR_TSEL1_Pos) | DAC_CR_TEN1 | DAC_CR_EN1 | dacp->config->cr + | (dacp->grpp->trigger << DAC_CR_TSEL2_Pos) | DAC_CR_TEN2 | DAC_CR_EN2 | (dacp->config->cr << 16); dacp->params->dac->CR = cr; #endif } diff --git a/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.h b/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.h index c2b74f6b4..e5500a8f3 100644 --- a/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.h +++ b/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.h @@ -37,8 +37,6 @@ */ #define DAC_TRG_MASK 7U #define DAC_TRG(n) (n) -#define DAC_TRG_EXT 6U -#define DAC_TRG_SW 7U /** @} */ /*===========================================================================*/ -- cgit v1.2.3