diff options
| author | Rocco Marco Guglielmi <roccomarco.guglielmi@live.com> | 2016-12-21 21:30:56 +0000 |
|---|---|---|
| committer | Rocco Marco Guglielmi <roccomarco.guglielmi@live.com> | 2016-12-21 21:30:56 +0000 |
| commit | 2c4e4658059f5b972a142307f7be52147b5da353 (patch) | |
| tree | c3575a3dcdd059bdc37a0e2e19d81f245ad177ba | |
| parent | 5601a301d597df72aafdc53f7beaa06ba5002b23 (diff) | |
| download | ChibiOS-2c4e4658059f5b972a142307f7be52147b5da353.tar.gz ChibiOS-2c4e4658059f5b972a142307f7be52147b5da353.tar.bz2 ChibiOS-2c4e4658059f5b972a142307f7be52147b5da353.zip | |
Fixed Bug #802
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9983 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c | 4 | ||||
| -rw-r--r-- | 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).
|