fix merge

This commit is contained in:
borisbstyle 2016-02-02 00:04:45 +01:00
parent 14c13085b7
commit efda3f86c1
1 changed files with 5 additions and 0 deletions

View File

@ -63,6 +63,7 @@
#include "io/serial_cli.h"
#include "io/serial_msp.h"
#include "io/statusindicator.h"
#include "io/asyncfatfs/asyncfatfs.h"
#include "rx/rx.h"
#include "rx/msp.h"
@ -744,6 +745,10 @@ void taskMainPidLoop(void)
writeMotors();
}
#ifdef USE_SDCARD
afatfs_poll();
#endif
#ifdef BLACKBOX
if (!cliMode && feature(FEATURE_BLACKBOX)) {
handleBlackbox();