Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 14:25:20 +03:00
Code Issues Wiki Activity

Merge remote-tracking branch 'multiwii/master'

Browse source 
Conflicts:
	src/board.h
	src/drv_timer.c
	src/mw.c
	src/sensors.c
This commit is contained in:
Dominic Clifton 2014-05-28 21:00:41 +01:00
commit 79a90b09ef
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/drivers/bus_i2c_stm32f10x.c
View file

@ -290,7 +290,7 @@ void i2cInit(I2C_TypeDef *I2C)
I2C_Cmd(I2Cx, ENABLE);
I2C_Init(I2Cx, &I2C_InitStructure);
NVIC_PriorityGroupConfig(0x500);
NVIC_PriorityGroupConfig(NVIC_PriorityGroup_2);
// I2C ER Interrupt
NVIC_InitStructure.NVIC_IRQChannel = I2C2_ER_IRQn;