Fixed Bug #803

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9987 35acf78f-673a-0410-8e92-d51de3d6d3f4

os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c

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

os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.h

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

readme.txt

@@ -153,6 +153,8 @@
 - RT:  Merged RT4.
 - NIL: Merged NIL2.
 - NIL: Added STM32F7 demo.
+- HAL: Added CR field to DAC configuration in STM32 port (bug #803)
+       (backported to 16.1.6).
 - 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)

testhal/STM32/STM32F3xx/DAC/main.c

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

testhal/STM32/STM32F4xx/DAC/main.c

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

testhal/STM32/STM32F4xx/DAC_DUAL/main.c

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

testhal/STM32/STM32L1xx/DAC/main.c

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