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

Fixed Bug #776. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_16.1.x@9779 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Rocco Marco Guglielmi 2016-09-24 12:04:38 +00:00
parent 7dcec01453
commit 6ac3f07937
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
os/hal/ports/STM32/LLD/DACv1/dac_lld.c
View File

@ -288,7 +288,7 @@ void dac_lld_stop(DACDriver *dacp) {
#if STM32_DAC_USE_DAC1_CH1 #if STM32_DAC_USE_DAC1_CH1
if (&DACD1 == dacp) { if (&DACD1 == dacp) {
if ((dacp->params->dac->CR & DAC_CR_EN2) == 0U) { if ((dacp->params->dac->CR & DAC_CR_EN1) == 0U) {
rccDisableDAC1(false); rccDisableDAC1(false);
} }
} }
@ -296,7 +296,7 @@ void dac_lld_stop(DACDriver *dacp) {
#if STM32_DAC_USE_DAC1_CH2 #if STM32_DAC_USE_DAC1_CH2
if (&DACD2 == dacp) { if (&DACD2 == dacp) {
if ((dacp->params->dac->CR & DAC_CR_EN1) == 0U) { if ((dacp->params->dac->CR & DAC_CR_EN2) == 0U) {
rccDisableDAC1(false); rccDisableDAC1(false);
} }
} }
@ -304,7 +304,7 @@ void dac_lld_stop(DACDriver *dacp) {
#if STM32_DAC_USE_DAC2_CH1 #if STM32_DAC_USE_DAC2_CH1
if (&DACD3 == dacp) { if (&DACD3 == dacp) {
if ((dacp->params->dac->CR & DAC_CR_EN2) == 0U) { if ((dacp->params->dac->CR & DAC_CR_EN1) == 0U) {
rccDisableDAC2(false); rccDisableDAC2(false);
} }
} }
@ -312,7 +312,7 @@ void dac_lld_stop(DACDriver *dacp) {
#if STM32_DAC_USE_DAC2_CH2 #if STM32_DAC_USE_DAC2_CH2
if (&DACD4 == dacp) { if (&DACD4 == dacp) {
if ((dacp->params->dac->CR & DAC_CR_EN1) == 0U) { if ((dacp->params->dac->CR & DAC_CR_EN2) == 0U) {
rccDisableDAC2(false); rccDisableDAC2(false);
} }
} }
@ -345,9 +345,11 @@ void dac_lld_put_channel(DACDriver *dacp,
*(&dacp->params->dac->DHR12R1 + dacp->params->dataoffset) = (uint32_t)sample; *(&dacp->params->dac->DHR12R1 + dacp->params->dataoffset) = (uint32_t)sample;
#endif #endif
} }
#if (STM32_HAS_DAC1_CH2 || STM32_HAS_DAC2_CH2)
else { else {
dacp->params->dac->DHR12R2 = (uint32_t)sample; dacp->params->dac->DHR12R2 = (uint32_t)sample;
} }
#endif
break; break;
case DAC_DHRM_12BIT_LEFT: case DAC_DHRM_12BIT_LEFT:
#if STM32_DAC_DUAL_MODE #if STM32_DAC_DUAL_MODE
@ -360,9 +362,11 @@ void dac_lld_put_channel(DACDriver *dacp,
*(&dacp->params->dac->DHR12L1 + dacp->params->dataoffset) = (uint32_t)sample; *(&dacp->params->dac->DHR12L1 + dacp->params->dataoffset) = (uint32_t)sample;
#endif #endif
} }
#if (STM32_HAS_DAC1_CH2 || STM32_HAS_DAC2_CH2)
else { else {
dacp->params->dac->DHR12L2 = (uint32_t)sample; dacp->params->dac->DHR12L2 = (uint32_t)sample;
} }
#endif
break; break;
case DAC_DHRM_8BIT_RIGHT: case DAC_DHRM_8BIT_RIGHT:
#if STM32_DAC_DUAL_MODE #if STM32_DAC_DUAL_MODE
@ -375,9 +379,11 @@ void dac_lld_put_channel(DACDriver *dacp,
*(&dacp->params->dac->DHR8R1 + dacp->params->dataoffset) = (uint32_t)sample; *(&dacp->params->dac->DHR8R1 + dacp->params->dataoffset) = (uint32_t)sample;
#endif #endif
} }
#if (STM32_HAS_DAC1_CH2 || STM32_HAS_DAC2_CH2)
else { else {
dacp->params->dac->DHR8R2 = (uint32_t)sample; dacp->params->dac->DHR8R2 = (uint32_t)sample;
} }
#endif
break; break;
default: default:
osalDbgAssert(false, "unexpected DAC mode"); osalDbgAssert(false, "unexpected DAC mode");

2
readme.txt
View File

@ -73,6 +73,8 @@
***************************************************************************** *****************************************************************************
*** 16.1.6 *** *** 16.1.6 ***
- HAL: Fixed DAC drier not compiling on STM32F051 and some bitmasks related
to DAC disabling (bug #776).
- HAL: Fixed addition semicolon in cpp wrapper (bug #774). - HAL: Fixed addition semicolon in cpp wrapper (bug #774).
- HAL: Fixed function gpt_lld_polled_delay() is broken on STM32 (bug #775). - HAL: Fixed function gpt_lld_polled_delay() is broken on STM32 (bug #775).
- HAL: Fixed invalid output initialization for STM32 DACx channels 2 - HAL: Fixed invalid output initialization for STM32 DACx channels 2