1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 17:55:30 +03:00

Merge branch 'betaflight' into development

# Conflicts:
#	src/main/flight/pid.c
#	src/main/main.c
#	src/main/target/IRCFUSIONF3/target.h
This commit is contained in:
blckmn 2016-08-27 08:34:23 +10:00
commit 9bdb4a9b25
23 changed files with 333 additions and 57 deletions

View file

@ -604,7 +604,6 @@ void init(void)
setTargetPidLooptime((gyro.targetLooptime + LOOPTIME_SUSPEND_TIME) * masterConfig.pid_process_denom); // Initialize pid looptime
#ifdef BLACKBOX
initBlackbox();
#endif