Ok thanks, Tobias. Now I'm sure I messed things up completely. Your patch can't be applied:tobias wrote:I've tested with your code an I think there has been some merge problems. The files i2croutines.c, i2croutines.h and nvic.c where not as they should. I have attached a patch so you can update them. Then the I2C2 bus should work again.Code: Select all
git apply i2cfix.patch
Have to have a closer look at this.i2cfix.patch:11: trailing whitespace.
void i2cInterruptHandlerI2c2(void);
i2cfix.patch:12: trailing whitespace.
void i2cErrorInterruptHandler(I2C_TypeDef* I2Cx);
i2cfix.patch:26: trailing whitespace.
/* Buffer of data to be received by I2C1, I2C2 */
i2cfix.patch:27: trailing whitespace.
uint8_t* Buffer_Rx1;
i2cfix.patch:28: trailing whitespace.
uint8_t* Buffer_Tx1;
error: Anwendung des Patches fehlgeschlagen: drivers/interface/i2croutines.h:132
error: drivers/interface/i2croutines.h: Patch konnte nicht angewendet werden
error: Anwendung des Patches fehlgeschlagen: drivers/src/i2croutines.c:32
error: drivers/src/i2croutines.c: Patch konnte nicht angewendet werden
error: Anwendung des Patches fehlgeschlagen: drivers/src/nvic.c:224
error: drivers/src/nvic.c: Patch konnte nicht angewendet werden
Did this to revert my local master branch to the original state from bitcraze's repo and pushed it to my fork (origin/master):
Code: Select all
git fetch upstream
git checkout master
git reset --hard upstream/master
git push origin master --force