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

Fixed Fixed Bug #803 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_16.1.x@9986 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Rocco Marco Guglielmi 2016-12-26 09:53:07 +00:00
parent dbfdc5faed
commit 3f189580ad
7 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,7 +249,9 @@ void dac_lld_start(DACDriver *dacp) {
channel = 1; channel = 1;
} }
#endif #endif
/* Copying user configuration into cr */
dacp->params->dac->CR = dacp->config->cr;
/* Enabling DAC in SW triggering mode initially, initializing data to /* Enabling DAC in SW triggering mode initially, initializing data to
zero.*/ zero.*/
#if STM32_DAC_DUAL_MODE == FALSE #if STM32_DAC_DUAL_MODE == FALSE

4
os/hal/ports/STM32/LLD/DACv1/dac_lld.h
View File

@ -371,6 +371,10 @@ typedef struct {
* @brief DAC data holding register mode. * @brief DAC data holding register mode.
*/ */
dacdhrmode_t datamode; dacdhrmode_t datamode;
/**
* @brief DAC control register.
*/
uint32_t cr;
} DACConfig; } DACConfig;
/** /**

1
readme.txt
View File

@ -73,6 +73,7 @@
***************************************************************************** *****************************************************************************
*** 16.1.6 *** *** 16.1.6 ***
- HAL: Added CR field to DAC configuration in STM32 port (bug #803).
- HAL: Fixed wrong initialization for DACD4 in STM32 port (bug #802). - HAL: Fixed wrong initialization for DACD4 in STM32 port (bug #802).
- HAL: Fixed tab instead of space in dac driver (bug #801). - HAL: Fixed tab instead of space in dac driver (bug #801).
- HAL: Fixed missing GPT and DAC in STM32F07/?9x mcuconf (bug #800). - HAL: Fixed missing GPT and DAC in STM32F07/?9x mcuconf (bug #800).

3
testhal/STM32/STM32F3xx/DAC/main.c
View File

@ -89,7 +89,8 @@ static void error_cb1(DACDriver *dacp, dacerror_t err) {
static const DACConfig dac1cfg1 = { static const DACConfig dac1cfg1 = {
.init = 2047U, .init = 2047U,
.datamode = DAC_DHRM_12BIT_RIGHT .datamode = DAC_DHRM_12BIT_RIGHT,
.cr = 0
}; };
static const DACConversionGroup dacgrpcfg1 = { static const DACConversionGroup dacgrpcfg1 = {

3
testhal/STM32/STM32F4xx/DAC/main.c
View File

@ -89,7 +89,8 @@ static void error_cb1(DACDriver *dacp, dacerror_t err) {
static const DACConfig dac1cfg1 = { static const DACConfig dac1cfg1 = {
.init = 2047U, .init = 2047U,
.datamode = DAC_DHRM_12BIT_RIGHT .datamode = DAC_DHRM_12BIT_RIGHT,
.cr = 0
}; };
static const DACConversionGroup dacgrpcfg1 = { static const DACConversionGroup dacgrpcfg1 = {

3
testhal/STM32/STM32F4xx/DAC_DUAL/main.c
View File

@ -89,7 +89,8 @@ static void error_cb1(DACDriver *dacp, dacerror_t err) {
static const DACConfig dac1cfg1 = { static const DACConfig dac1cfg1 = {
.init = 2047U, .init = 2047U,
.datamode = DAC_DHRM_12BIT_RIGHT_DUAL .datamode = DAC_DHRM_12BIT_RIGHT_DUAL,
.cr = 0
}; };
static const DACConversionGroup dacgrpcfg1 = { static const DACConversionGroup dacgrpcfg1 = {

3
testhal/STM32/STM32L1xx/DAC/main.c
View File

@ -89,7 +89,8 @@ static void error_cb1(DACDriver *dacp, dacerror_t err) {
static const DACConfig dac1cfg1 = { static const DACConfig dac1cfg1 = {
.init = 2047U, .init = 2047U,
.datamode = DAC_DHRM_12BIT_RIGHT .datamode = DAC_DHRM_12BIT_RIGHT,
.cr = 0
}; };
static const DACConversionGroup dacgrpcfg1 = { static const DACConversionGroup dacgrpcfg1 = {