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 #671. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8490 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2015-11-14 18:38:36 +00:00
parent 3f53115539
commit 4031ccce3a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c
View File

@ -844,8 +844,11 @@ void i2c_lld_start(I2CDriver *i2cp) {
#endif #endif
/* Reset i2c peripheral, the TCIE bit will be handled separately.*/ /* Reset i2c peripheral, the TCIE bit will be handled separately.*/
dp->CR1 = i2cp->config->cr1 | I2C_CR1_ERRIE | I2C_CR1_NACKIE | dp->CR1 = i2cp->config->cr1 |
I2C_CR1_TXDMAEN | I2C_CR1_RXDMAEN; #if STM32_I2C_USE_DMA == TRUE
I2C_CR1_TXDMAEN | I2C_CR1_RXDMAEN | /* Enable only if using DMA */
#endif
I2C_CR1_ERRIE | I2C_CR1_NACKIE;
/* Setup I2C parameters.*/ /* Setup I2C parameters.*/
dp->TIMINGR = i2cp->config->timingr; dp->TIMINGR = i2cp->config->timingr;

1
readme.txt
View File

@ -134,6 +134,7 @@
- HAL: Updated STM32F0xx headers to STM32CubeF0 version 1.3.0. Added support - HAL: Updated STM32F0xx headers to STM32CubeF0 version 1.3.0. Added support
for STM32F030xC, STM32F070x6, STM32F070xB, STM32F091xC, for STM32F030xC, STM32F070x6, STM32F070xB, STM32F091xC,
STM32F098xx devices. STM32F098xx devices.
- HAL: Fixed STM32 I2Cv2 DMA conflict (bug #671)(backported to 3.0.4).
- HAL: Fixed I2S clock selection not working in STM32F4xx HAL (bug #667) - HAL: Fixed I2S clock selection not working in STM32F4xx HAL (bug #667)
(backported to 3.0.4 and 2.6.10). (backported to 3.0.4 and 2.6.10).
- HAL: Fixed differences in STM32F3 ADC macro definitions (bug #665) - HAL: Fixed differences in STM32F3 ADC macro definitions (bug #665)