Update AggieAir configs

This commit is contained in:
Michal Podhradsky
2018-01-12 11:36:51 -08:00
parent 2b71fdeba4
commit 528a7b5882
5 changed files with 38 additions and 25 deletions
+4 -4
View File
@@ -4,14 +4,14 @@
AggieAir Blujayujay
-->
<airframe name="Bl">
<airframe name="Blujay">
<firmware name="fixedwing">
<target name="ap" board="lisa_mx_2.1">
<module name="radio_control" type="sbus">
<configure name="SBUS_PORT" value="UART5"/>
</module>
<configure name="HAS_LUFTBOOT" value="1"/>
<configure name="HAS_LUFTBOOT" value="0"/>
<configure name="FLASH_MODE" value="DFU"/>
</target>
@@ -82,8 +82,8 @@ AggieAir Blujayujay
<servo name="FLAP" no="0" min="900" neutral="1500" max="2100"/>
<servo name="AILERON_RIGHT" no="1" min="900" neutral="1500" max="2100"/>
<servo name="AILERON_LEFT" no="2" min="2100" neutral="1500" max="900"/>
<servo name="ELEVATOR" no="3" min="2100" neutral="1500" max="900"/>
<servo name="RUDDER" no="4" min="2100" neutral="1500" max="900"/>
<servo name="ELEVATOR" no="3" min="900" neutral="1500" max="92100"/>
<servo name="RUDDER" no="4" min="900" neutral="1500" max="2100"/>
<servo name="THROTTLE" no="5" min="1100" neutral="1100" max="1900"/>
</servos>
+13 -1
View File
@@ -21,6 +21,18 @@
settings_modules="modules/lidar_lite.xml modules/gps.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml"
gui_color="#ffff954c0000"
/>
<aircraft
name="Atomic"
ac_id="9"
airframe="airframes/AGGIEAIR/aggieair_atomic_lia.xml"
radio="radios/AGGIEAIR/aggieair_taranis.xml"
telemetry="telemetry/AGGIEAIR/aggieair_fixedwing.xml"
flight_plan="flight_plans/AGGIEAIR/BasicTuning_Launcher.xml"
settings="settings/fixedwing_basic.xml settings/nps.xml"
settings_modules="modules/battery_monitor.xml modules/lidar_sf11.xml modules/nav_skid_landing.xml modules/nav_survey_poly_osam.xml modules/gps.xml modules/nav_basic_fw.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml"
gui_color="#ffff42870000"
release=""
/>
<aircraft
name="BluJay_Goose"
ac_id="7"
@@ -41,7 +53,7 @@
flight_plan="flight_plans/AGGIEAIR/BasicTuning_Launcher.xml"
settings="settings/fixedwing_basic.xml settings/nps.xml"
settings_modules="modules/battery_monitor.xml modules/lidar_sf11.xml modules/nav_skid_landing.xml modules/nav_survey_poly_osam.xml modules/gps.xml modules/nav_basic_fw.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml"
gui_color="#00009e93ffff"
gui_color="#ffffffffffff"
/>
<aircraft
name="ECU"
@@ -11,8 +11,8 @@ AggieAir RP3 Minion
<module name="radio_control" type="sbus">
<configure name="SBUS_PORT" value="UART5"/>
</module>
<configure name="HAS_LUFTBOOT" value="1"/>
<configure name="FLASH_MODE" value="DFU"/>
<configure name="HAS_LUFTBOOT" value="0"/>
<configure name="FLASH_MODE" value="JTAG"/>
</target>
<!-- NOTE: if you want to use extra_dl module for HITL
+17 -17
View File
@@ -21,22 +21,22 @@ Note: a command may be reversed by exchanging min and max values
-->
<!DOCTYPE radio SYSTEM "../radio.dtd">
<radio name="Taranis" data_min="987" data_max="2011" sync_min ="5000" sync_max ="15000" pulse_type="POSITIVE">
<channel ctl="1" function="THROTTLE" min="987" neutral="1500" max="2011" average="0"/>
<channel ctl="2" function="ROLL" min="987" neutral="1500" max="2011" average="0"/>
<channel ctl="3" function="PITCH" min="1811" neutral="1500" max="172" average="0"/>
<channel ctl="4" function="YAW" min="987" neutral="1500" max="2011" average="0"/>
<channel ctl="5" function="SWITCH_A" min="987" neutral="1500" max="2011" average="1"/>
<channel ctl="6" function="FLAP" min="2011" neutral="1500" max="987" average="1"/>
<channel ctl="7" function="SWITCH_C" min="987" neutral="1500" max="2011" average="1"/>
<channel ctl="8" function="MODE" min="2011" neutral="1500" max="987" average="1"/>
<channel ctl="9" function="SWITCH_E" min="987" neutral="1500" max="2011" average="1"/>
<channel ctl="10" function="KILL_SWITCH" min="987" neutral="1500" max="2011" average="1"/>
<channel ctl="11" function="SIM_SRC" min="987" neutral="1500" max="2011" average="1"/>
<channel ctl="12" function="SWITCH_H" min="987" neutral="1500" max="2011" average="1"/>
<channel ctl="13" function="POT_S1" min="987" neutral="1500" max="2011" average="0"/>
<channel ctl="14" function="POT_S2" min="897" neutral="1500" max="2011" average="0"/>
<channel ctl="15" function="LEFT_SLIDER" min="987" neutral="1500" max="2011" average="0"/>
<channel ctl="16" function="RIGHT_SLIDER" min="987" neutral="1500" max="2011" average="0"/>
<radio name="Taranis" data_min="987" data_max="2012" sync_min ="5000" sync_max ="15000" pulse_type="POSITIVE">
<channel ctl="1" function="THROTTLE" min="990" neutral="990" max="2012" average="0"/>
<channel ctl="2" function="ROLL" min="990" neutral="1500" max="2012" average="0"/>
<channel ctl="3" function="PITCH" min="990" neutral="1500" max="2012" average="0"/>
<channel ctl="4" function="YAW" min="990" neutral="1500" max="2012" average="0"/>
<channel ctl="5" function="SWITCH_A" min="990" neutral="1500" max="2012" average="1"/>
<channel ctl="6" function="FLAP" min="990" neutral="1500" max="2012" average="1"/>
<channel ctl="7" function="SWITCH_C" min="990" neutral="1500" max="2012" average="1"/>
<channel ctl="8" function="MODE" min="2012" neutral="1500" max="990" average="1"/>
<channel ctl="9" function="SWITCH_E" min="990" neutral="1500" max="2012" average="1"/>
<channel ctl="10" function="KILL_SWITCH" min="990" neutral="1500" max="2012" average="1"/>
<channel ctl="11" function="SIM_SRC" min="990" neutral="1500" max="2012" average="1"/>
<channel ctl="12" function="SWITCH_H" min="990" neutral="1500" max="2012" average="1"/>
<channel ctl="13" function="POT_S1" min="990" neutral="1500" max="2012" average="0"/>
<channel ctl="14" function="POT_S2" min="990" neutral="1500" max="2012" average="0"/>
<channel ctl="15" function="LEFT_SLIDER" min="990" neutral="1500" max="2012" average="0"/>
<channel ctl="16" function="RIGHT_SLIDER" min="990" neutral="1500" max="2012" average="0"/>
</radio>
@@ -3,11 +3,12 @@
<telemetry>
<process name="Ap">
<mode name="default">
<message name="ACTUATORS" period=".5"/> <!-- For trimming -->
<message name="AUTOPILOT_VERSION" period="11.1"/>
<message name="ALIVE" period="5.1"/>
<message name="GPS_LLA" period="0.25"/>
<message name="NAVIGATION" period="1."/>
<message name="ATTITUDE" period="0.1"/>
<message name="ATTITUDE" period="0.5"/>
<message name="ESTIMATOR" period="0.5"/>
<message name="WP_MOVED" period="0.5"/>
<message name="CIRCLE" period="1.05"/>