Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 00:05:33 +03:00
Code Issues Wiki Activity

Merge branch 'master' into serial-cleanup

Browse source 
Conflicts:
	src/main/telemetry/hott.c
This commit is contained in:
Dominic Clifton 2015-03-03 17:21:43 +00:00
commit dca984ff88
10 changed files with 47 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/main.c
View file

@ -392,7 +392,7 @@ void init(void)
m25p16_init();
}
#endif
#ifdef SPRACINGF3
#if defined(SPRACINGF3) || defined(CC3D)
m25p16_init();
#endif
flashfsInit();