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

Fixed bug #1100. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@15505 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2022-03-14 09:07:37 +00:00
parent 7c3b54d051
commit f5114d9839
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
os/hal/ports/STM32/LLD/DACv1/hal_dac_lld.c
View File

@ -668,7 +668,11 @@ void dac_lld_start_conversion(DACDriver *dacp) {
dmaStreamSetPeripheral(dacp->dma, &dacp->params->dac->DHR12R1 + dmaStreamSetPeripheral(dacp->dma, &dacp->params->dac->DHR12R1 +
dacp->params->dataoffset); dacp->params->dataoffset);
dmamode = dacp->params->dmamode | dmamode = dacp->params->dmamode |
STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_HWORD; #if STM32_DMA_ADVANCED == FALSE
STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_HWORD;
#else
STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD;
#endif
break; break;
case DAC_DHRM_12BIT_LEFT: case DAC_DHRM_12BIT_LEFT:
osalDbgAssert(dacp->grpp->num_channels == 1, "invalid number of channels"); osalDbgAssert(dacp->grpp->num_channels == 1, "invalid number of channels");
@ -676,7 +680,11 @@ void dac_lld_start_conversion(DACDriver *dacp) {
dmaStreamSetPeripheral(dacp->dma, &dacp->params->dac->DHR12L1 + dmaStreamSetPeripheral(dacp->dma, &dacp->params->dac->DHR12L1 +
dacp->params->dataoffset); dacp->params->dataoffset);
dmamode = dacp->params->dmamode | dmamode = dacp->params->dmamode |
STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_HWORD; #if STM32_DMA_ADVANCED == FALSE
STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_HWORD;
#else
STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD;
#endif
break; break;
case DAC_DHRM_8BIT_RIGHT: case DAC_DHRM_8BIT_RIGHT:
osalDbgAssert(dacp->grpp->num_channels == 1, "invalid number of channels"); osalDbgAssert(dacp->grpp->num_channels == 1, "invalid number of channels");
@ -684,7 +692,11 @@ void dac_lld_start_conversion(DACDriver *dacp) {
dmaStreamSetPeripheral(dacp->dma, &dacp->params->dac->DHR8R1 + dmaStreamSetPeripheral(dacp->dma, &dacp->params->dac->DHR8R1 +
dacp->params->dataoffset); dacp->params->dataoffset);
dmamode = dacp->params->dmamode | dmamode = dacp->params->dmamode |
STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_BYTE; #if STM32_DMA_ADVANCED == FALSE
STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_BYTE;
#else
STM32_DMA_CR_MSIZE_BYTE | STM32_DMA_CR_MSIZE_BYTE;
#endif
/* In this mode the size of the buffer is halved because two samples /* In this mode the size of the buffer is halved because two samples
packed in a single dacsample_t element.*/ packed in a single dacsample_t element.*/
@ -712,7 +724,11 @@ void dac_lld_start_conversion(DACDriver *dacp) {
dmaStreamSetPeripheral(dacp->dma, &dacp->params->dac->DHR8RD); dmaStreamSetPeripheral(dacp->dma, &dacp->params->dac->DHR8RD);
dmamode = dacp->params->dmamode | dmamode = dacp->params->dmamode |
STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_HWORD; #if STM32_DMA_ADVANCED == FALSE
STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_HWORD;
#else
STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD;
#endif
n /= 2; n /= 2;
break; break;
#endif #endif

3
readme.txt
View File

@ -121,7 +121,8 @@
ARMv7-M and ARMv8-M-ML. ARMv7-M and ARMv8-M-ML.
- NEW: On STM32WBxx added a check on STM32_LSI_ENABLE required by IWDG. - NEW: On STM32WBxx added a check on STM32_LSI_ENABLE required by IWDG.
- NEW: Added SPIv2 support also to STM32WB and STM32WL. - NEW: Added SPIv2 support also to STM32WB and STM32WL.
- FIX: Reverted bug #1100 (backported to 20.3.5)(backported to 21.11.2). - FIX: Re-opened and fixed bug #1100
(backported to 20.3.5)(backported to 21.11.2).
- FIX: Fixed invalid cumulative time stat in RT (bug #1222) - FIX: Fixed invalid cumulative time stat in RT (bug #1222)
(backported to 21.11.2). (backported to 21.11.2).
- FIX: Fixed incorrect type cast in TIME_I2US() (bug #1221) - FIX: Fixed incorrect type cast in TIME_I2US() (bug #1221)