1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 21:35:44 +03:00

Merge remote-tracking branch 'multiwii/master'

Conflicts:
	obj/baseflight.hex
	src/config.c
	src/main.c
	src/mw.c
	src/mw.h
	src/serial_cli.c
This commit is contained in:
Dominic Clifton 2014-04-23 02:38:39 +01:00
commit e4c9fb585c
6 changed files with 13 additions and 12 deletions

View file

@ -69,7 +69,7 @@ int main(void)
serialPort_t* loopbackPort1 = NULL;
serialPort_t* loopbackPort2 = NULL;
#endif
systemInit(masterConfig.emfAvoidance);
systemInit(masterConfig.emf_avoidance);
initPrintfSupport();
ensureEEPROMContainsValidData();