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

Merge branch 'GTune' of https://github.com/MJ666/cleanflight into

Browse source 
MJ666-Harakiri_PID_update

Conflicts:
	Makefile
	src/main/blackbox/blackbox_fielddefs.h
	src/main/flight/pid.c
	src/main/io/serial_msp.c
	src/main/mw.c
	src/main/target/ALIENWIIF3/target.h
	src/main/target/CC3D/target.h
	src/main/target/NAZE/target.h
	src/main/target/NAZE32PRO/target.h
	src/main/target/SPARKY/target.h
This commit is contained in:
Dominic Clifton 2015-10-06 20:16:37 +01:00
commit 123a4ccfc5
33 changed files with 497 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/io/rc_controls.h
View file

@ -48,6 +48,7 @@ typedef enum {
BOXSERVO3,
BOXBLACKBOX,
BOXFAILSAFE,
BOXGTUNE,
CHECKBOX_ITEM_COUNT
} boxId_e;