From 2c4e4658059f5b972a142307f7be52147b5da353 Mon Sep 17 00:00:00 2001 From: Rocco Marco Guglielmi Date: Wed, 21 Dec 2016 21:30:56 +0000 Subject: [PATCH] Fixed Bug #802 git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9983 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c | 4 +--- readme.txt | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) 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 c9ca8f8b0..e63af050f 100644 --- a/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c +++ b/os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c @@ -244,7 +244,7 @@ void dac_lld_start(DACDriver *dacp) { #endif #if STM32_DAC_USE_DAC2_CH2 - if (&DACD3 == dacp) { + if (&DACD4 == dacp) { rccEnableDAC2(false); channel = 1; } @@ -289,7 +289,6 @@ void dac_lld_stop(DACDriver *dacp) { #if STM32_DAC_USE_DAC1_CH1 if (&DACD1 == dacp) { if ((dacp->params->dac->CR & DAC_CR_EN1) == 0U) { - rccDisableDAC1(false); } } @@ -298,7 +297,6 @@ void dac_lld_stop(DACDriver *dacp) { #if STM32_DAC_USE_DAC1_CH2 if (&DACD2 == dacp) { if ((dacp->params->dac->CR & DAC_CR_EN2) == 0U) { - rccDisableDAC1(false); } } diff --git a/readme.txt b/readme.txt index cd12484e9..4fefee03d 100644 --- a/readme.txt +++ b/readme.txt @@ -150,6 +150,12 @@ - RT: Merged RT4. - NIL: Merged NIL2. - NIL: Added STM32F7 demo. +- HAL: Fixed wrong initialization for DACD4 in STM32 port (bug #802) + (backported to 16.1.6). +- HAL: Fixed tab instead of space in dac driver (bug #801) + (backported to 16.1.6). +- HAL: Fixed missing GPT and DAC in STM32F07/​9x mcuconf (bug #800) + (backported to 16.1.6). - HAL: Fixed STM32 RTCv2 driver does not handle the DST bit (bug #799) (backported to 16.1.6). - HAL: Fixed MAC driver broken on STM32F107 (bug #798)(backported to 16.1.6).