Skip to content

Commit

Permalink
[conf] some cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
flixr committed May 18, 2014
1 parent 7a584de commit 844e8e9
Show file tree
Hide file tree
Showing 40 changed files with 177 additions and 248 deletions.
8 changes: 4 additions & 4 deletions conf/airframes/CDW/asctec_cdw.xml
Expand Up @@ -77,10 +77,10 @@

<command_laws>
<call fun="motor_mixing_run(autopilot_motors_on,FALSE,values)"/>
<set servo="FRONT" value="motor_mixing.commands[SERVO_FRONT]"/>
<set servo="BACK" value="motor_mixing.commands[SERVO_BACK]"/>
<set servo="RIGHT" value="motor_mixing.commands[SERVO_RIGHT]"/>
<set servo="LEFT" value="motor_mixing.commands[SERVO_LEFT]"/>
<set servo="FRONT" value="motor_mixing.commands[0]"/>
<set servo="BACK" value="motor_mixing.commands[1]"/>
<set servo="RIGHT" value="motor_mixing.commands[2]"/>
<set servo="LEFT" value="motor_mixing.commands[3]"/>
</command_laws>

<!-- ************************* SENSORS ************************* -->
Expand Down
8 changes: 4 additions & 4 deletions conf/airframes/CDW/tricopter_cdw.xml
Expand Up @@ -102,9 +102,9 @@ LiPo/LiIo-Zellen: 2-3

<command_laws>
<call fun="motor_mixing_run(autopilot_motors_on,FALSE,values)"/>
<set servo="FRONTRIGHT" value="motor_mixing.commands[SERVO_FRONTRIGHT]"/>
<set servo="FRONTLEFT" value="motor_mixing.commands[SERVO_FRONTLEFT]"/>
<set servo="BACK" value="motor_mixing.commands[SERVO_BACK]"/>
<set servo="FRONTRIGHT" value="motor_mixing.commands[0]"/>
<set servo="FRONTLEFT" value="motor_mixing.commands[1]"/>
<set servo="BACK" value="motor_mixing.commands[2]"/>
<set servo="TAIL" value="@YAW"/>
</command_laws>

Expand Down Expand Up @@ -220,7 +220,7 @@ LiPo/LiIo-Zellen: 2-3
<section name="SIMULATOR" prefix="NPS_">
<define name="ACTUATOR_NAMES" value="{&quot;front_motor&quot;, &quot;back_motor&quot;, &quot;right_motor&quot;, &quot;left_motor&quot;}"/>
<define name="JSBSIM_INIT" value="&quot;reset00&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_booz2_a1.h&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_default.h&quot;"/>
</section>

</airframe>
8 changes: 4 additions & 4 deletions conf/airframes/ENAC/quadrotor/blender.xml
Expand Up @@ -74,10 +74,10 @@

<command_laws>
<call fun="motor_mixing_run(autopilot_motors_on,FALSE,values)"/>
<set servo="FRONT" value="motor_mixing.commands[SERVO_FRONT]"/>
<set servo="BACK" value="motor_mixing.commands[SERVO_BACK]"/>
<set servo="RIGHT" value="motor_mixing.commands[SERVO_RIGHT]"/>
<set servo="LEFT" value="motor_mixing.commands[SERVO_LEFT]"/>
<set servo="FRONT" value="motor_mixing.commands[0]"/>
<set servo="BACK" value="motor_mixing.commands[1]"/>
<set servo="RIGHT" value="motor_mixing.commands[2]"/>
<set servo="LEFT" value="motor_mixing.commands[3]"/>
</command_laws>

<section name="IMU" prefix="IMU_">
Expand Down
8 changes: 4 additions & 4 deletions conf/airframes/ENAC/quadrotor/hen1.xml
Expand Up @@ -77,10 +77,10 @@

<command_laws>
<call fun="motor_mixing_run(autopilot_motors_on,FALSE,values)"/>
<set servo="FRONT" value="motor_mixing.commands[SERVO_FRONT]"/>
<set servo="BACK" value="motor_mixing.commands[SERVO_BACK]"/>
<set servo="RIGHT" value="motor_mixing.commands[SERVO_RIGHT]"/>
<set servo="LEFT" value="motor_mixing.commands[SERVO_LEFT]"/>
<set servo="FRONT" value="motor_mixing.commands[0]"/>
<set servo="BACK" value="motor_mixing.commands[1]"/>
<set servo="RIGHT" value="motor_mixing.commands[2]"/>
<set servo="LEFT" value="motor_mixing.commands[3]"/>
</command_laws>

<section name="IMU" prefix="IMU_">
Expand Down
8 changes: 4 additions & 4 deletions conf/airframes/TUDelft/IMAV2013/ardrone2_raw.xml
Expand Up @@ -67,10 +67,10 @@

<command_laws>
<call fun="motor_mixing_run(autopilot_motors_on,FALSE,values)"/>
<set servo="TOP_LEFT" value="motor_mixing.commands[SERVO_TOP_LEFT]"/>
<set servo="TOP_RIGHT" value="motor_mixing.commands[SERVO_TOP_RIGHT]"/>
<set servo="BOTTOM_LEFT" value="motor_mixing.commands[SERVO_BOTTOM_LEFT]"/>
<set servo="BOTTOM_RIGHT" value="motor_mixing.commands[SERVO_BOTTOM_RIGHT]"/>
<set servo="TOP_LEFT" value="motor_mixing.commands[0]"/>
<set servo="TOP_RIGHT" value="motor_mixing.commands[1]"/>
<set servo="BOTTOM_LEFT" value="motor_mixing.commands[2]"/>
<set servo="BOTTOM_RIGHT" value="motor_mixing.commands[3]"/>
</command_laws>

<include href="conf/airframes/TUDelft/IMAV2013/ARDrone/$AC_ID_calib.xml"/>
Expand Down
6 changes: 1 addition & 5 deletions conf/airframes/TUDelft/IMAV2013/chouchou_lisa_s.xml
Expand Up @@ -171,14 +171,10 @@
<define name="IGAIN" value="0"/>
</section>

<section name="MISC">
<define name="FACE_REINJ_1" value="1024"/>
</section>

<section name="SIMULATOR" prefix="NPS_">
<define name="ACTUATOR_NAMES" value="{&quot;front_motor&quot;, &quot;back_motor&quot;, &quot;right_motor&quot;, &quot;left_motor&quot;}"/>
<define name="JSBSIM_INIT" value="&quot;reset00&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_booz2_a1.h&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_default.h&quot;"/>
</section>

<modules main_freq="512">
Expand Down
6 changes: 1 addition & 5 deletions conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
Expand Up @@ -173,14 +173,10 @@
<define name="IGAIN" value="0"/>
</section>

<section name="MISC">
<define name="FACE_REINJ_1" value="1024"/>
</section>

<section name="SIMULATOR" prefix="NPS_">
<define name="ACTUATOR_NAMES" value="{&quot;front_motor&quot;, &quot;back_motor&quot;, &quot;right_motor&quot;, &quot;left_motor&quot;}"/>
<define name="JSBSIM_INIT" value="&quot;reset00&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_booz2_a1.h&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_default.h&quot;"/>
</section>

<modules main_freq="512">
Expand Down
4 changes: 0 additions & 4 deletions conf/airframes/TUDelft/IMAV2013/walkera_V120D02S.xml
Expand Up @@ -155,10 +155,6 @@
<define name="IGAIN" value="6"/>
</section>

<section name="MISC">
<define name="FACE_REINJ_1" value="1024"/>
</section>

<modules main_freq="512">
<load name="gps_ubx_ucenter.xml"/>
</modules>
Expand Down
4 changes: 0 additions & 4 deletions conf/airframes/TUDelft/IMAV2013/walkera_genius_v1.xml
Expand Up @@ -160,10 +160,6 @@
<define name="IGAIN" value="0"/>
</section>

<section name="MISC">
<define name="FACE_REINJ_1" value="1024"/>
</section>

<modules main_freq="512">
<load name="gps_ubx_ucenter.xml"/>
<load name="send_imu_mag_current.xml"/>
Expand Down
8 changes: 4 additions & 4 deletions conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml
Expand Up @@ -83,10 +83,10 @@

<command_laws>
<call fun="motor_mixing_run(autopilot_motors_on,FALSE,values)"/>
<set servo="FRONT" value="motor_mixing.commands[SERVO_FRONT]"/>
<set servo="BACK" value="motor_mixing.commands[SERVO_BACK]"/>
<set servo="RIGHT" value="motor_mixing.commands[SERVO_RIGHT]"/>
<set servo="LEFT" value="motor_mixing.commands[SERVO_LEFT]"/>
<set servo="FRONT" value="motor_mixing.commands[0]"/>
<set servo="BACK" value="motor_mixing.commands[1]"/>
<set servo="RIGHT" value="motor_mixing.commands[2]"/>
<set servo="LEFT" value="motor_mixing.commands[3]"/>
</command_laws>

<section name="IMU" prefix="IMU_">
Expand Down
10 changes: 5 additions & 5 deletions conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
Expand Up @@ -81,10 +81,10 @@

<command_laws>
<call fun="motor_mixing_run(autopilot_motors_on,FALSE,values)"/>
<set servo="FRONT" value="motor_mixing.commands[SERVO_FRONT]"/>
<set servo="BACK" value="motor_mixing.commands[SERVO_BACK]"/>
<set servo="RIGHT" value="motor_mixing.commands[SERVO_RIGHT]"/>
<set servo="LEFT" value="motor_mixing.commands[SERVO_LEFT]"/>
<set servo="FRONT" value="motor_mixing.commands[0]"/>
<set servo="BACK" value="motor_mixing.commands[1]"/>
<set servo="RIGHT" value="motor_mixing.commands[2]"/>
<set servo="LEFT" value="motor_mixing.commands[3]"/>
</command_laws>

<section name="IMU" prefix="IMU_">
Expand Down Expand Up @@ -245,7 +245,7 @@
<define name="ACTUATOR_NAMES" value="{&quot;front_motor&quot;, &quot;back_motor&quot;, &quot;right_motor&quot;, &quot;left_motor&quot;}"/>
<define name="JSBSIM_INIT" value="&quot;reset00&quot;"/>
<define name="JSBSIM_MODEL" value="&quot;simple_quad&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_booz2_a1.h&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_default.h&quot;"/>
</section>

</airframe>
22 changes: 9 additions & 13 deletions conf/airframes/esden/cocto_lm2a2.xml
Expand Up @@ -66,14 +66,14 @@ B2L -> CW

<command_laws>
<call fun="motor_mixing_run(autopilot_motors_on,FALSE,values)"/>
<set servo="A1U" value="motor_mixing.commands[SERVO_A1U]"/>
<set servo="A1L" value="motor_mixing.commands[SERVO_A1L]"/>
<set servo="A2U" value="motor_mixing.commands[SERVO_A2U]"/>
<set servo="A2L" value="motor_mixing.commands[SERVO_A2L]"/>
<set servo="B1U" value="motor_mixing.commands[SERVO_B1U]"/>
<set servo="B1L" value="motor_mixing.commands[SERVO_B1L]"/>
<set servo="B2U" value="motor_mixing.commands[SERVO_B2U]"/>
<set servo="B2L" value="motor_mixing.commands[SERVO_B2L]"/>
<set servo="A1U" value="motor_mixing.commands[0]"/>
<set servo="A1L" value="motor_mixing.commands[1]"/>
<set servo="A2U" value="motor_mixing.commands[2]"/>
<set servo="A2L" value="motor_mixing.commands[3]"/>
<set servo="B1U" value="motor_mixing.commands[4]"/>
<set servo="B1L" value="motor_mixing.commands[5]"/>
<set servo="B2U" value="motor_mixing.commands[6]"/>
<set servo="B2L" value="motor_mixing.commands[7]"/>
</command_laws>

<section name="MIXING" prefix="MOTOR_MIXING_">
Expand Down Expand Up @@ -196,14 +196,10 @@ B2L -> CW
<define name="IGAIN" value="0"/>
</section>

<section name="MISC">
<define name="FACE_REINJ_1" value="1024"/>
</section>

<section name="SIMULATOR" prefix="NPS_">
<define name="ACTUATOR_NAMES" value="{&quot;front_motor&quot;, &quot;back_motor&quot;, &quot;right_motor&quot;, &quot;left_motor&quot;}"/>
<define name="JSBSIM_INIT" value="&quot;reset00&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_booz2_a1.h&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_default.h&quot;"/>
</section>

<modules main_freq="512">
Expand Down
14 changes: 5 additions & 9 deletions conf/airframes/esden/gain_scheduling_example.xml
Expand Up @@ -21,10 +21,10 @@

<command_laws>
<call fun="motor_mixing_run(autopilot_motors_on,FALSE,values)"/>
<set servo="A1" value="motor_mixing.commands[SERVO_A1]"/>
<set servo="A2" value="motor_mixing.commands[SERVO_A2]"/>
<set servo="B1" value="motor_mixing.commands[SERVO_B1]"/>
<set servo="B2" value="motor_mixing.commands[SERVO_B2]"/>
<set servo="A1" value="motor_mixing.commands[0]"/>
<set servo="A2" value="motor_mixing.commands[1]"/>
<set servo="B1" value="motor_mixing.commands[2]"/>
<set servo="B2" value="motor_mixing.commands[3]"/>

<let var="aileron_feedback_left" value="-@YAW"/>
<let var="aileron_feedback_right" value="-@YAW"/>
Expand Down Expand Up @@ -179,14 +179,10 @@
<define name="IGAIN" value="0"/>
</section>

<section name="MISC">
<define name="FACE_REINJ_1" value="1024"/>
</section>

<section name="SIMULATOR" prefix="NPS_">
<define name="ACTUATOR_NAMES" value="{&quot;front_motor&quot;, &quot;back_motor&quot;, &quot;right_motor&quot;, &quot;left_motor&quot;}"/>
<define name="JSBSIM_INIT" value="&quot;reset00&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_booz2_a1.h&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_default.h&quot;"/>
</section>

<!--//////////////INCLUDE THE GAIN SCHEDULING MODULE\\\\\\\\\\\\\\\\-->
Expand Down
18 changes: 7 additions & 11 deletions conf/airframes/esden/hexy_ll11a2pwm.xml
Expand Up @@ -29,12 +29,12 @@

<command_laws>
<call fun="motor_mixing_run(autopilot_motors_on,FALSE,values)"/>
<set servo="FRONT_LEFT" value="motor_mixing.commands[SERVO_FRONT_LEFT]"/>
<set servo="FRONT_RIGHT" value="motor_mixing.commands[SERVO_FRONT_RIGHT]"/>
<set servo="RIGHT" value="motor_mixing.commands[SERVO_RIGHT]"/>
<set servo="BACK_RIGHT" value="motor_mixing.commands[SERVO_BACK_RIGHT]"/>
<set servo="BACK_LEFT" value="motor_mixing.commands[SERVO_BACK_LEFT]"/>
<set servo="LEFT" value="motor_mixing.commands[SERVO_LEFT]"/>
<set servo="FRONT_LEFT" value="motor_mixing.commands[0]"/>
<set servo="FRONT_RIGHT" value="motor_mixing.commands[1]"/>
<set servo="RIGHT" value="motor_mixing.commands[2]"/>
<set servo="BACK_RIGHT" value="motor_mixing.commands[3]"/>
<set servo="BACK_LEFT" value="motor_mixing.commands[4]"/>
<set servo="LEFT" value="motor_mixing.commands[5]"/>
</command_laws>

<section name="MIXING" prefix="MOTOR_MIXING_">
Expand Down Expand Up @@ -193,14 +193,10 @@
<define name="IGAIN" value="0"/>
</section>

<section name="MISC">
<define name="FACE_REINJ_1" value="1024"/>
</section>

<section name="SIMULATOR" prefix="NPS_">
<define name="ACTUATOR_NAMES" value="{&quot;front_motor&quot;, &quot;back_motor&quot;, &quot;right_motor&quot;, &quot;left_motor&quot;}"/>
<define name="JSBSIM_INIT" value="&quot;reset00&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_booz2_a1.h&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_default.h&quot;"/>
</section>

<modules main_freq="512">
Expand Down
18 changes: 7 additions & 11 deletions conf/airframes/esden/hexy_lm2a2pwm.xml
Expand Up @@ -29,12 +29,12 @@

<command_laws>
<call fun="motor_mixing_run(autopilot_motors_on,FALSE,values)"/>
<set servo="FRONT_LEFT" value="motor_mixing.commands[SERVO_FRONT_LEFT]"/>
<set servo="FRONT_RIGHT" value="motor_mixing.commands[SERVO_FRONT_RIGHT]"/>
<set servo="RIGHT" value="motor_mixing.commands[SERVO_RIGHT]"/>
<set servo="BACK_RIGHT" value="motor_mixing.commands[SERVO_BACK_RIGHT]"/>
<set servo="BACK_LEFT" value="motor_mixing.commands[SERVO_BACK_LEFT]"/>
<set servo="LEFT" value="motor_mixing.commands[SERVO_LEFT]"/>
<set servo="FRONT_LEFT" value="motor_mixing.commands[0]"/>
<set servo="FRONT_RIGHT" value="motor_mixing.commands[1]"/>
<set servo="RIGHT" value="motor_mixing.commands[2]"/>
<set servo="BACK_RIGHT" value="motor_mixing.commands[3]"/>
<set servo="BACK_LEFT" value="motor_mixing.commands[4]"/>
<set servo="LEFT" value="motor_mixing.commands[5]"/>
</command_laws>

<section name="MIXING" prefix="MOTOR_MIXING_">
Expand Down Expand Up @@ -154,14 +154,10 @@
<define name="IGAIN" value="0"/>
</section>

<section name="MISC">
<define name="FACE_REINJ_1" value="1024"/>
</section>

<section name="SIMULATOR" prefix="NPS_">
<define name="ACTUATOR_NAMES" value="{&quot;front_motor&quot;, &quot;back_motor&quot;, &quot;right_motor&quot;, &quot;left_motor&quot;}"/>
<define name="JSBSIM_INIT" value="&quot;reset00&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_booz2_a1.h&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_default.h&quot;"/>
</section>

<modules main_freq="512">
Expand Down
15 changes: 7 additions & 8 deletions conf/airframes/esden/lisa2_hex.xml
Expand Up @@ -29,12 +29,12 @@

<command_laws>
<call fun="motor_mixing_run(autopilot_motors_on,FALSE,values)"/>
<set servo="FRONT_LEFT" value="motor_mixing.commands[SERVO_FRONT_LEFT]"/>
<set servo="FRONT_RIGHT" value="motor_mixing.commands[SERVO_FRONT_RIGHT]"/>
<set servo="RIGHT" value="motor_mixing.commands[SERVO_RIGHT]"/>
<set servo="BACK_RIGHT" value="motor_mixing.commands[SERVO_BACK_RIGHT]"/>
<set servo="BACK_LEFT" value="motor_mixing.commands[SERVO_BACK_LEFT]"/>
<set servo="LEFT" value="motor_mixing.commands[SERVO_LEFT]"/>
<set servo="FRONT_LEFT" value="motor_mixing.commands[0]"/>
<set servo="FRONT_RIGHT" value="motor_mixing.commands[1]"/>
<set servo="RIGHT" value="motor_mixing.commands[2]"/>
<set servo="BACK_RIGHT" value="motor_mixing.commands[3]"/>
<set servo="BACK_LEFT" value="motor_mixing.commands[4]"/>
<set servo="LEFT" value="motor_mixing.commands[5]"/>
</command_laws>

<section name="MIXING" prefix="MOTOR_MIXING_">
Expand Down Expand Up @@ -162,7 +162,6 @@
</section>

<section name="MISC">
<define name="FACE_REINJ_1" value="1024"/>
<define name="USE_EARTH_BOUND_RC_SETPOINT" value="FALSE"/>
<define name="USE_REFERENCE_SYSTEM" value="FALSE"/>
<define name="NO_RC_THRUST_LIMIT" value="TRUE"/>
Expand All @@ -172,7 +171,7 @@
<section name="SIMULATOR" prefix="NPS_">
<define name="ACTUATOR_NAMES" value="{&quot;front_motor&quot;, &quot;back_motor&quot;, &quot;right_motor&quot;, &quot;left_motor&quot;}"/>
<define name="JSBSIM_INIT" value="&quot;reset00&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_booz2_a1.h&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_default.h&quot;"/>
</section>

<modules main_freq="512">
Expand Down
10 changes: 5 additions & 5 deletions conf/airframes/esden/qs_asp22.xml
Expand Up @@ -21,10 +21,10 @@

<command_laws>
<call fun="motor_mixing_run(autopilot_motors_on,FALSE,values)"/>
<set servo="A1" value="motor_mixing.commands[SERVO_A1]"/>
<set servo="A2" value="motor_mixing.commands[SERVO_A2]"/>
<set servo="B1" value="motor_mixing.commands[SERVO_B1]"/>
<set servo="B2" value="motor_mixing.commands[SERVO_B2]"/>
<set servo="A1" value="motor_mixing.commands[0]"/>
<set servo="A2" value="motor_mixing.commands[1]"/>
<set servo="B1" value="motor_mixing.commands[2]"/>
<set servo="B2" value="motor_mixing.commands[3]"/>

<let var="aileron_feedback_left" value="-@YAW"/>
<let var="aileron_feedback_right" value="-@YAW"/>
Expand Down Expand Up @@ -197,7 +197,7 @@
<section name="SIMULATOR" prefix="NPS_">
<define name="ACTUATOR_NAMES" value="{&quot;front_motor&quot;, &quot;back_motor&quot;, &quot;right_motor&quot;, &quot;left_motor&quot;}"/>
<define name="JSBSIM_INIT" value="&quot;reset00&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_booz2_a1.h&quot;"/>
<define name="SENSORS_PARAMS" value="&quot;nps_sensors_params_default.h&quot;"/>
</section>

<modules main_freq="512">
Expand Down

0 comments on commit 844e8e9

Please sign in to comment.