From 1c1c8310fb68ac433f1d1c2e29f80d304450bce2 Mon Sep 17 00:00:00 2001 From: Ewoud Smeur Date: Tue, 24 Oct 2017 19:05:12 +0200 Subject: [PATCH 1/3] airframe, flightplan for fan demo --- conf/airframes/TUDELFT/tudelft_conf.xml | 11 ++ conf/airframes/TUDELFT/tudelft_fan_demo.xml | 192 ++++++++++++++++++++ conf/flight_plans/TUDELFT/fan_demo.xml | 77 ++++++++ 3 files changed, 280 insertions(+) create mode 100644 conf/airframes/TUDELFT/tudelft_fan_demo.xml create mode 100644 conf/flight_plans/TUDELFT/fan_demo.xml diff --git a/conf/airframes/TUDELFT/tudelft_conf.xml b/conf/airframes/TUDELFT/tudelft_conf.xml index 92b4f4cda2..3f280212f1 100644 --- a/conf/airframes/TUDELFT/tudelft_conf.xml +++ b/conf/airframes/TUDELFT/tudelft_conf.xml @@ -98,6 +98,17 @@ settings_modules="modules/air_data.xml [modules/geo_mag.xml] modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml" gui_color="#ffffcccaccca" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + + + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+ +
+ + + + + + + + + +
+ +
+ + +
+ +
+ + + + +
+ +
+ + + + + + +
+ +
+ + + + + +
+
diff --git a/conf/flight_plans/TUDELFT/fan_demo.xml b/conf/flight_plans/TUDELFT/fan_demo.xml new file mode 100644 index 0000000000..3de9de16f3 --- /dev/null +++ b/conf/flight_plans/TUDELFT/fan_demo.xml @@ -0,0 +1,77 @@ + + + +
+#include "autopilot.h" +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
From 7e0d5b0f1e35a507d86ba0b436183cc1661b286a Mon Sep 17 00:00:00 2001 From: Ewoud Smeur Date: Tue, 24 Oct 2017 19:06:16 +0200 Subject: [PATCH 2/3] add settings for indi_guidance --- conf/modules/guidance_indi.xml | 8 ++++++++ conf/modules/stabilization_indi.xml | 14 +++++++------- .../firmwares/rotorcraft/guidance/guidance_indi.h | 4 ++++ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/conf/modules/guidance_indi.xml b/conf/modules/guidance_indi.xml index 0c9f8dcfae..6030837813 100644 --- a/conf/modules/guidance_indi.xml +++ b/conf/modules/guidance_indi.xml @@ -6,6 +6,14 @@ Guidance controller for rotorcraft using INDI + + + + + + + +
diff --git a/conf/modules/stabilization_indi.xml b/conf/modules/stabilization_indi.xml index 2a85491ca3..9f77aa2659 100644 --- a/conf/modules/stabilization_indi.xml +++ b/conf/modules/stabilization_indi.xml @@ -37,13 +37,13 @@ - - - - - - - + + + + + + + diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_indi.h b/sw/airborne/firmwares/rotorcraft/guidance/guidance_indi.h index 50d6ac447b..43a8a1796c 100644 --- a/sw/airborne/firmwares/rotorcraft/guidance/guidance_indi.h +++ b/sw/airborne/firmwares/rotorcraft/guidance/guidance_indi.h @@ -41,4 +41,8 @@ extern void stabilization_attitude_set_setpoint_rp_quat_f(struct FloatEulers* in extern float guidance_indi_thrust_specific_force_gain; extern struct FloatVect3 euler_cmd; +// settings for guidance INDI +extern float guidance_indi_pos_gain; +extern float guidance_indi_speed_gain; + #endif /* GUIDANCE_INDI_H */ From f580c07814aa1068bf3f6960318b2417fc069cbe Mon Sep 17 00:00:00 2001 From: Ewoud Smeur Date: Tue, 24 Oct 2017 19:29:18 +0200 Subject: [PATCH 3/3] airframe cleanup --- conf/airframes/TUDELFT/tudelft_fan_demo.xml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/conf/airframes/TUDELFT/tudelft_fan_demo.xml b/conf/airframes/TUDELFT/tudelft_fan_demo.xml index 7045011905..e2e7956d07 100644 --- a/conf/airframes/TUDELFT/tudelft_fan_demo.xml +++ b/conf/airframes/TUDELFT/tudelft_fan_demo.xml @@ -27,23 +27,14 @@ - - - - - - - - - - + - + @@ -94,6 +85,14 @@ +
+ + + + + +
+