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

Merge remote-tracking branch 'multiwii/master'

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

5
src/config.c
View file

@ -313,7 +313,7 @@ static void resetConf(void)
masterConfig.serialConfig.reboot_character = 'R';
masterConfig.looptime = 3500;
masterConfig.emfAvoidance = 0;
masterConfig.emf_avoidance = 0;
masterConfig.rssi_aux_channel = 0;
currentProfile.pidController = 0;
@ -324,9 +324,10 @@ static void resetConf(void)
currentProfile.controlRateConfig.rollPitchRate = 0;
currentProfile.controlRateConfig.yawRate = 0;
currentProfile.dynThrPID = 0;
currentProfile.tpaBreakPoint = 1500;
currentProfile.tpa_breakpoint = 1500;
currentProfile.controlRateConfig.thrMid8 = 50;
currentProfile.controlRateConfig.thrExpo8 = 0;
// for (i = 0; i < CHECKBOXITEMS; i++)
// cfg.activate[i] = 0;