From d828023e470157eb09a76b3a28a29944fe586028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Thu, 22 Dec 2016 08:06:28 +0100 Subject: [PATCH] SITL startup config: set SYS_MC_EST_GROUP so that we know which estimator was used in the log file --- posix-configs/SITL/init/ekf2/iris | 1 + posix-configs/SITL/init/ekf2/multiple_iris | 1 + posix-configs/SITL/init/ekf2/plane | 1 + posix-configs/SITL/init/ekf2/solo | 1 + posix-configs/SITL/init/ekf2/standard_vtol | 1 + posix-configs/SITL/init/ekf2/tailsitter | 1 + posix-configs/SITL/init/ekf2/typhoon_h480 | 1 + posix-configs/SITL/init/inav/iris | 1 + posix-configs/SITL/init/inav/iris_opt_flow | 1 + posix-configs/SITL/init/lpe/iris | 1 + posix-configs/SITL/init/lpe/iris_opt_flow | 1 + posix-configs/SITL/init/lpe/plane | 1 + posix-configs/SITL/init/lpe/standard_vtol | 1 + posix-configs/SITL/init/lpe/typhoon_h480 | 1 + 14 files changed, 14 insertions(+) diff --git a/posix-configs/SITL/init/ekf2/iris b/posix-configs/SITL/init/ekf2/iris index 1c080211f4..276c321ac1 100644 --- a/posix-configs/SITL/init/ekf2/iris +++ b/posix-configs/SITL/init/ekf2/iris @@ -3,6 +3,7 @@ param load param set MAV_TYPE 2 param set SYS_AUTOSTART 4010 param set SYS_RESTART_TYPE 2 +param set SYS_MC_EST_GROUP 2 dataman start param set BAT_N_CELLS 3 param set CAL_GYRO0_ID 2293768 diff --git a/posix-configs/SITL/init/ekf2/multiple_iris b/posix-configs/SITL/init/ekf2/multiple_iris index 17b7674b64..c894392c5e 100644 --- a/posix-configs/SITL/init/ekf2/multiple_iris +++ b/posix-configs/SITL/init/ekf2/multiple_iris @@ -3,6 +3,7 @@ param load param set MAV_TYPE 2 param set SYS_AUTOSTART 4010 param set SYS_RESTART_TYPE 2 +param set SYS_MC_EST_GROUP 2 dataman start param set BAT_N_CELLS 3 param set CAL_GYRO0_ID 2293768 diff --git a/posix-configs/SITL/init/ekf2/plane b/posix-configs/SITL/init/ekf2/plane index 8b4d1dc341..f7755ae80d 100644 --- a/posix-configs/SITL/init/ekf2/plane +++ b/posix-configs/SITL/init/ekf2/plane @@ -3,6 +3,7 @@ param load param set MAV_TYPE 1 param set SYS_AUTOSTART 3033 param set SYS_RESTART_TYPE 2 +param set SYS_MC_EST_GROUP 2 dataman start param set BAT_N_CELLS 3 param set CAL_GYRO0_ID 2293768 diff --git a/posix-configs/SITL/init/ekf2/solo b/posix-configs/SITL/init/ekf2/solo index c6d9c9935a..692c48dfb1 100644 --- a/posix-configs/SITL/init/ekf2/solo +++ b/posix-configs/SITL/init/ekf2/solo @@ -3,6 +3,7 @@ param load param set MAV_TYPE 2 param set SYS_AUTOSTART 4010 param set SYS_RESTART_TYPE 2 +param set SYS_MC_EST_GROUP 2 dataman start param set BAT_N_CELLS 3 param set CAL_GYRO0_ID 2293768 diff --git a/posix-configs/SITL/init/ekf2/standard_vtol b/posix-configs/SITL/init/ekf2/standard_vtol index e1015223fe..b4cccc5c04 100644 --- a/posix-configs/SITL/init/ekf2/standard_vtol +++ b/posix-configs/SITL/init/ekf2/standard_vtol @@ -6,6 +6,7 @@ param set VT_MOT_COUNT 4 param set VT_TRANS_THR 0.75 param set SYS_AUTOSTART 13006 param set SYS_RESTART_TYPE 2 +param set SYS_MC_EST_GROUP 2 dataman start param set BAT_N_CELLS 3 param set CAL_GYRO0_ID 2293768 diff --git a/posix-configs/SITL/init/ekf2/tailsitter b/posix-configs/SITL/init/ekf2/tailsitter index 6c058ce20b..13faecfdcb 100644 --- a/posix-configs/SITL/init/ekf2/tailsitter +++ b/posix-configs/SITL/init/ekf2/tailsitter @@ -4,6 +4,7 @@ param set MAV_TYPE 20 param set VT_TYPE 0 param set SYS_AUTOSTART 4010 param set SYS_RESTART_TYPE 2 +param set SYS_MC_EST_GROUP 2 dataman start param set BAT_N_CELLS 3 param set CAL_GYRO0_ID 2293768 diff --git a/posix-configs/SITL/init/ekf2/typhoon_h480 b/posix-configs/SITL/init/ekf2/typhoon_h480 index 97337eccd2..4f96892257 100644 --- a/posix-configs/SITL/init/ekf2/typhoon_h480 +++ b/posix-configs/SITL/init/ekf2/typhoon_h480 @@ -3,6 +3,7 @@ param load param set MAV_TYPE 13 param set SYS_AUTOSTART 6001 param set SYS_RESTART_TYPE 2 +param set SYS_MC_EST_GROUP 2 dataman start param set BAT_N_CELLS 3 param set CAL_GYRO0_ID 2293768 diff --git a/posix-configs/SITL/init/inav/iris b/posix-configs/SITL/init/inav/iris index 1c69fd5c2f..d531b34a16 100644 --- a/posix-configs/SITL/init/inav/iris +++ b/posix-configs/SITL/init/inav/iris @@ -7,6 +7,7 @@ param set MC_YAW_P 2.0 param set MC_YAWRATE_P 0.35 param set SYS_AUTOSTART 4010 param set SYS_RESTART_TYPE 2 +param set SYS_MC_EST_GROUP 0 dataman start param set CAL_GYRO0_ID 2293768 param set CAL_ACC0_ID 1376264 diff --git a/posix-configs/SITL/init/inav/iris_opt_flow b/posix-configs/SITL/init/inav/iris_opt_flow index 17d580ba3e..9ffe752f41 100644 --- a/posix-configs/SITL/init/inav/iris_opt_flow +++ b/posix-configs/SITL/init/inav/iris_opt_flow @@ -3,6 +3,7 @@ param load param set MAV_TYPE 2 param set SYS_AUTOSTART 4010 param set SYS_RESTART_TYPE 2 +param set SYS_MC_EST_GROUP 0 dataman start param set BAT_N_CELLS 3 param set CAL_GYRO0_ID 2293768 diff --git a/posix-configs/SITL/init/lpe/iris b/posix-configs/SITL/init/lpe/iris index aea1cf918d..c2b37e76e3 100644 --- a/posix-configs/SITL/init/lpe/iris +++ b/posix-configs/SITL/init/lpe/iris @@ -3,6 +3,7 @@ param load param set MAV_TYPE 2 param set SYS_AUTOSTART 4010 param set SYS_RESTART_TYPE 2 +param set SYS_MC_EST_GROUP 1 dataman start param set BAT_N_CELLS 3 param set CAL_GYRO0_ID 2293768 diff --git a/posix-configs/SITL/init/lpe/iris_opt_flow b/posix-configs/SITL/init/lpe/iris_opt_flow index 4284bee8b3..4e82e16282 100644 --- a/posix-configs/SITL/init/lpe/iris_opt_flow +++ b/posix-configs/SITL/init/lpe/iris_opt_flow @@ -3,6 +3,7 @@ param load param set MAV_TYPE 2 param set SYS_AUTOSTART 4010 param set SYS_RESTART_TYPE 2 +param set SYS_MC_EST_GROUP 1 dataman start param set BAT_N_CELLS 3 param set CAL_GYRO0_ID 2293768 diff --git a/posix-configs/SITL/init/lpe/plane b/posix-configs/SITL/init/lpe/plane index 8b4d1dc341..89b9965109 100644 --- a/posix-configs/SITL/init/lpe/plane +++ b/posix-configs/SITL/init/lpe/plane @@ -3,6 +3,7 @@ param load param set MAV_TYPE 1 param set SYS_AUTOSTART 3033 param set SYS_RESTART_TYPE 2 +param set SYS_MC_EST_GROUP 1 dataman start param set BAT_N_CELLS 3 param set CAL_GYRO0_ID 2293768 diff --git a/posix-configs/SITL/init/lpe/standard_vtol b/posix-configs/SITL/init/lpe/standard_vtol index 7c71521a3f..7ca845a591 100644 --- a/posix-configs/SITL/init/lpe/standard_vtol +++ b/posix-configs/SITL/init/lpe/standard_vtol @@ -6,6 +6,7 @@ param set VT_MOT_COUNT 4 param set VT_TRANS_THR 0.75 param set SYS_AUTOSTART 13006 param set SYS_RESTART_TYPE 2 +param set SYS_MC_EST_GROUP 1 dataman start param set BAT_N_CELLS 3 param set CAL_GYRO0_ID 2293768 diff --git a/posix-configs/SITL/init/lpe/typhoon_h480 b/posix-configs/SITL/init/lpe/typhoon_h480 index 2ecd0b5899..ee24ed9a5f 100644 --- a/posix-configs/SITL/init/lpe/typhoon_h480 +++ b/posix-configs/SITL/init/lpe/typhoon_h480 @@ -3,6 +3,7 @@ param load param set MAV_TYPE 13 param set SYS_AUTOSTART 6001 param set SYS_RESTART_TYPE 2 +param set SYS_MC_EST_GROUP 1 dataman start param set BAT_N_CELLS 3 param set CAL_GYRO0_ID 2293768