From 0c7c7d2637e8971cac39a8810297978eeef66ff0 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 7 May 2016 06:45:04 +0000 Subject: [PATCH] Fixed bug #739. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9438 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/ports/STM32/STM32F4xx/stm32_registry.h | 10 ++++++++-- readme.txt | 7 +++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/os/hal/ports/STM32/STM32F4xx/stm32_registry.h b/os/hal/ports/STM32/STM32F4xx/stm32_registry.h index ecff41099..eb9ce86a5 100644 --- a/os/hal/ports/STM32/STM32F4xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32F4xx/stm32_registry.h @@ -800,8 +800,14 @@ #define STM32_CAN_MAX_FILTERS 28 /* DAC attributes.*/ -#define STM32_HAS_DAC1_CH1 FALSE -#define STM32_HAS_DAC1_CH2 FALSE +#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 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 0x07000000 + #define STM32_HAS_DAC2_CH1 FALSE #define STM32_HAS_DAC2_CH2 FALSE diff --git a/readme.txt b/readme.txt index 537554c93..11b549d9d 100644 --- a/readme.txt +++ b/readme.txt @@ -79,8 +79,6 @@ ***************************************************************************** *** Next *** -- HAL: Fixed bug in interrupt handlers in STM32F4xx EXT driver (bug #738). -- HAL: Fixed clock enabling in STM32 ADCv3 (bug #737). - VAR: Cortex-M VTOR initialization is now performed in startup files and no more in port initialization. - VAR: Changed GCC asm files extension from .s to .S because conventions. @@ -113,6 +111,11 @@ - RT: Merged RT4. - NIL: Merged NIL2. - NIL: Added STM32F7 demo. +- HAL: Fixed DAC driver not enabled for STM32F4x7 and STM32F4x9 devices + (bug #739)(backported to 3.0.6 and 16.1.5). +- HAL: Fixed bug in interrupt handlers in STM32F4xx EXT driver (bug #738) + (backported to 16.1.5). +- HAL: Fixed clock enabling in STM32 ADCv3 (bug #737). - HAL: Fixed missing SDC initialization in RT-STM32F103-OLIMEX_STM32_P103 demo (bug #735)(backported to 16.1.5). - HAL: Fixed STM32 dac bug when using only channel 2 in direct mode (bug #734)