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

parameters_bravo.txt

 # Onboard parameters for system MAV 042
 #
 # MAV ID  COMPONENT ID  PARAM NAME  VALUE (FLOAT)
+42	1	POSFILTER	1
+42	1	POSFILTERWEIGHT	0.03
+42	1	PROTOCOLTIMEOUT¿	2e+06
+42	1	SETPOINTDELAY	1e+06
+42	1	YAWTOLERANCE	0.1745
+42	100	42	42
+42	100	SYS_ID	42
+42	120	DOWN_PITCH	-0.026
+42	120	DOWN_ROLL	-0.022
+42	120	DOWN_X	0
+42	120	DOWN_Y	0
+42	120	DOWN_YAW	3.14159
+42	120	DOWN_Z	-0.088
 42	200	ACC_NAV_OFFS_X	0
 42	200	ACC_NAV_OFFS_Y	0
 42	200	ACC_NAV_OFFS_Z	-1000
-42	200	ACC_OFFSET_X	0
-42	200	ACC_OFFSET_Y	0
-42	200	ACC_OFFSET_Z	0
 42	200	ATT_KAL_IYAW	1
 42	200	ATT_KAL_KACC	0.0033
 42	200	ATT_OFFSET_X	0
 42	200	ATT_OFFSET_Y	0
 42	200	ATT_OFFSET_Z	-0.08
+42	200	CAL_ACC_X	0
+42	200	CAL_ACC_Y	0
+42	200	CAL_ACC_Z	0
+42	200	CAL_GYRO_X	29809
+42	200	CAL_GYRO_Y	29959
+42	200	CAL_GYRO_Z	29455
+42	200	CAL_TEMP	51.5
 42	200	CAM_EXP	1000
 42	200	CAM_INTERVAL	36000
 42	200	DEBUG_1	0
@@ -20,33 +37,30 @@
 42	200	DEBUG_4	0
 42	200	DEBUG_5	0
 42	200	DEBUG_6	0
-42	200	GYRO_OFFSET_X	29884
-42	200	GYRO_OFFSET_Y	29943
-42	200	GYRO_OFFSET_Z	29479
 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	10
-42	200	PID_ATT_I	20
+42	200	PID_ATT_D	15
+42	200	PID_ATT_I	15
 42	200	PID_ATT_LIM	100
-42	200	PID_ATT_P	55
+42	200	PID_ATT_P	45
 42	200	PID_POS_AWU	5
 42	200	PID_POS_D	2
-42	200	PID_POS_I	0.25
+42	200	PID_POS_I	0.3
 42	200	PID_POS_LIM	0.2
-42	200	PID_POS_P	1.7
+42	200	PID_POS_P	1.8
 42	200	PID_POS_Z_AWU	3
 42	200	PID_POS_Z_D	0.2
-42	200	PID_POS_Z_I	0.2
+42	200	PID_POS_Z_I	0.3
 42	200	PID_POS_Z_LIM	0.3
-42	200	PID_POS_Z_P	0.3
+42	200	PID_POS_Z_P	0.5
 42	200	PID_YAWPOS_AWU	1
 42	200	PID_YAWPOS_D	1
 42	200	PID_YAWPOS_I	0.1
-42	200	PID_YAWPOS_LIM	2
+42	200	PID_YAWPOS_LIM	3
 42	200	PID_YAWPOS_P	5
 42	200	PID_YAWSPEED_D	0
 42	200	PID_YAWSPEED_I	5
@@ -54,11 +68,11 @@
 42	200	PID_YAWSPE_AWU	1
 42	200	PID_YAWSPE_LIM	50
 42	200	POS_SP_ACCEPT	1
-42	200	POS_SP_X	1.1
-42	200	POS_SP_Y	1.1
+42	200	POS_SP_X	1.36206
+42	200	POS_SP_Y	2.89715
 42	200	POS_SP_YAW	0
-42	200	POS_SP_Z	-0.8
-42	200	POS_TIMEOUT	1e+06
+42	200	POS_SP_Z	-0.7
+42	200	POS_TIMEOUT	2e+06
 42	200	RC_NICK_CHAN	1
 42	200	RC_ROLL_CHAN	2
 42	200	RC_SAFETY_CHAN	5
@@ -81,7 +95,6 @@
 42	200	SYS_TYPE	2
 42	200	UART_0_BAUD	115200
 42	200	UART_1_BAUD	57600
-42	200	VEL_DAMP	0.95
 42	200	VEL_OFFSET_X	0
 42	200	VEL_OFFSET_Y	0
 42	200	VEL_OFFSET_Z	0