aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2017-01-11 10:09:55 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2017-01-11 10:09:55 +0000
commitadc15caea1119f2d2506df4aa0e76f35f325b6ae (patch)
tree92b48c5d89ba3fb0f31705230744b33b206266b0
parenta954fa43f4a1f24e9b67bad7c219a7846ae8b828 (diff)
downloadChibiOS-adc15caea1119f2d2506df4aa0e76f35f325b6ae.tar.gz
ChibiOS-adc15caea1119f2d2506df4aa0e76f35f325b6ae.tar.bz2
ChibiOS-adc15caea1119f2d2506df4aa0e76f35f325b6ae.zip
Fixed bug #810.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10027 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/hal/ports/STM32/STM32F7xx/stm32_registry.h4
-rw-r--r--readme.txt2
2 files changed, 4 insertions, 2 deletions
diff --git a/os/hal/ports/STM32/STM32F7xx/stm32_registry.h b/os/hal/ports/STM32/STM32F7xx/stm32_registry.h
index ff06fe86e..abcafeb66 100644
--- a/os/hal/ports/STM32/STM32F7xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32F7xx/stm32_registry.h
@@ -101,11 +101,11 @@
/* DAC attributes.*/
#define STM32_HAS_DAC1_CH1 TRUE
#define STM32_DAC1_CH1_DMA_MSK STM32_DMA_STREAM_ID_MSK(1, 5)
-#define STM32_DAC1_CH1_DMA_CHN 0x00070000
+#define STM32_DAC1_CH1_DMA_CHN 0x00700000
#define STM32_HAS_DAC1_CH2 TRUE
#define STM32_DAC1_CH2_DMA_MSK STM32_DMA_STREAM_ID_MSK(1, 6)
-#define STM32_DAC1_CH2_DMA_CHN 0x00700000
+#define STM32_DAC1_CH2_DMA_CHN 0x07000000
#define STM32_HAS_DAC2_CH1 FALSE
#define STM32_HAS_DAC2_CH2 FALSE
diff --git a/readme.txt b/readme.txt
index b1da2e655..a4a93a2cd 100644
--- a/readme.txt
+++ b/readme.txt
@@ -155,6 +155,8 @@
- NIL: Added STM32F7 demo.
- HAL: Fixed protocol violation in usbDisableEndpointsI() API (bug #811)
(backported to 16.1.7).
+- HAL: Fixed incorrect constants STM32_DAC1_CHx_DMA_CHN for STM32F7 (bug #810)
+ (backported to 16.1.7).
- HAL: Fixed redefined TIM in STM32F030 registry (bug #809)
(backported to 16.1.7).
- HAL: Fixed clock init in STM32F0x port which doesn't take in account