Merge branch 'master' of git@pixhawk.ethz.ch:qgroundcontrol

parameters_bravo.txt

@@ -20,25 +20,25 @@
 42	200	DEBUG_4	0
 42	200	DEBUG_5	0
 42	200	DEBUG_6	0
-42	200	GYRO_OFFSET_X	29868
+42	200	GYRO_OFFSET_X	29830
 42	200	GYRO_OFFSET_Y	29990
-42	200	GYRO_OFFSET_Z	29453
+42	200	GYRO_OFFSET_Z	29440
 42	200	MIX_OFFSET	0
 42	200	MIX_POSITION	0
 42	200	MIX_POS_YAW	0
 42	200	MIX_REMOTE	0
 42	200	MIX_Z_POSITION	0
 42	200	PID_ATT_AWU	0.3
-42	200	PID_ATT_D	30
-42	200	PID_ATT_I	60
-42	200	PID_ATT_P	90
+42	200	PID_ATT_D	20
+42	200	PID_ATT_I	40
+42	200	PID_ATT_P	60
 42	200	PID_POS_AWU	5
 42	200	PID_POS_D	2
-42	200	PID_POS_I	0.4
-42	200	PID_POS_P	1.8
+42	200	PID_POS_I	0.25
+42	200	PID_POS_P	1.7
 42	200	PID_POS_Z_AWU	3
 42	200	PID_POS_Z_D	0.2
-42	200	PID_POS_Z_I	0.4
+42	200	PID_POS_Z_I	0.2
 42	200	PID_POS_Z_LIM	0.3
 42	200	PID_POS_Z_P	0.5
 42	200	PID_YAWPOS_AWU	1
@@ -50,11 +50,11 @@
 42	200	PID_YAWSPEED_P	30
 42	200	PID_YAWSPE_AWU	1
 42	200	POS_SP_ACCEPT	0
-42	200	POS_SP_X	1.1
-42	200	POS_SP_Y	1.1
+42	200	POS_SP_X	3.7
+42	200	POS_SP_Y	0.3
 42	200	POS_SP_YAW	0
 42	200	POS_SP_Z	-0.8
-42	200	POS_TIMEOUT	2e+06
+42	200	POS_TIMEOUT	500000
 42	200	RC_NICK_CHAN	1
 42	200	RC_ROLL_CHAN	2
 42	200	RC_SAFETY_CHAN	5
@@ -66,9 +66,9 @@
 42	200	RC_TUNE_CHAN4	8
 42	200	RC_YAW_CHAN	4
 42	200	SEND_DEBUGCHAN	0
-42	200	SLOT_ATTITUDE	1
+42	200	SLOT_ATTITUDE	0
 42	200	SLOT_CONTROL	0
-42	200	SLOT_RAW_IMU	1
+42	200	SLOT_RAW_IMU	0
 42	200	SLOT_RC	0
 42	200	SYS_COMP_ID	200
 42	200	SYS_ID	42