Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 08:45:36 +03:00
Code Issues Wiki Activity

Merge branch 'master' into betaflight

Browse source 
Conflicts:
	src/main/config/config.c
	src/main/flight/imu.c
This commit is contained in:
borisbstyle 2015-09-29 01:03:25 +02:00
commit c944083f73
11 changed files with 765 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/mw.c
View file

@ -267,7 +267,7 @@ void annexCode(void)
if (ibatTimeSinceLastServiced >= IBATINTERVAL) {
ibatLastServiced = currentTime;
updateCurrentMeter((ibatTimeSinceLastServiced / 1000), &masterConfig.rxConfig, masterConfig.flight3DConfig.deadband3d_throttle);
updateCurrentMeter(ibatTimeSinceLastServiced, &masterConfig.rxConfig, masterConfig.flight3DConfig.deadband3d_throttle);
}
}