Skip to content

Commit

Permalink
[conf][tests] make a new tests_conf.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
flixr committed Oct 13, 2012
1 parent 34b565f commit bb8ef47
Show file tree
Hide file tree
Showing 4 changed files with 193 additions and 46 deletions.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -251,7 +251,7 @@ ab_clean:

replace_current_conf_xml:
test conf/conf.xml && mv conf/conf.xml conf/conf.xml.backup.$(BUILD_DATETIME)
cp conf/conf.xml.example conf/conf.xml
cp conf/tests_conf.xml conf/conf.xml

restore_conf_xml:
test conf/conf.xml.backup.$(BUILD_DATETIME) && mv conf/conf.xml.backup.$(BUILD_DATETIME) conf/conf.xml
Expand Down
52 changes: 10 additions & 42 deletions conf/conf.xml.example
Expand Up @@ -34,7 +34,16 @@
settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/control/stabilization_rate.xml"
gui_color="white"
/>

<aircraft
name="Bixler"
ac_id="24"
airframe="airframes/examples/bixler_lisa_m_2.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing.xml"
flight_plan="flight_plans/versatile.xml"
settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/ins_neutrals.xml"
gui_color="blue"
/>
<!-- tiny/umarim -->
<aircraft
name="Microjet"
Expand Down Expand Up @@ -96,45 +105,4 @@
settings=" settings/test_fixedwing_actuators.xml"
gui_color="blue"
/>
<!-- Hardware test Lisa/L -->
<aircraft
name="LisaLv11_Booz2v12_RC"
ac_id="9"
airframe="airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/dummy.xml"
settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml"
gui_color="white"
/>
<aircraft
name="LisaLv11_Booz2v12_FW"
ac_id="10"
airframe="airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing.xml"
flight_plan="flight_plans/dummy.xml"
settings="settings/fixedwing_basic.xml"
gui_color="blue"
/>
<aircraft
name="LisaLv11_Aspirinv15_RC"
ac_id="11"
airframe="airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/dummy.xml"
settings=" settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/control/stabilization_rate.xml"
gui_color="white"
/>
<aircraft
name="LisaLv11_Aspirinv15_FW"
ac_id="12"
airframe="airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_fw.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing.xml"
flight_plan="flight_plans/dummy.xml"
settings="settings/fixedwing_basic.xml"
gui_color="blue"
/>
</conf>
179 changes: 179 additions & 0 deletions conf/tests_conf.xml
@@ -0,0 +1,179 @@
<?xml version="1.0"?>
<conf>

<!-- booz2 -->
<aircraft
name="BOOZ2"
ac_id="150"
airframe="airframes/examples/booz2.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/dummy.xml"
settings="settings/rotorcraft_basic.xml"
gui_color="white"
/>

<!-- LISA -->
<aircraft
name="Hexa_LisaL"
ac_id="153"
airframe="airframes/examples/h_hex.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/dummy.xml"
settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml"
gui_color="white"
/>
<aircraft
name="Quad_LisaM_2"
ac_id="162"
airframe="airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/control/stabilization_rate.xml"
gui_color="white"
/>
<aircraft
name="Bixler"
ac_id="24"
airframe="airframes/examples/bixler_lisa_m_2.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing.xml"
flight_plan="flight_plans/versatile.xml"
settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/ins_neutrals.xml"
gui_color="blue"
/>
<aircraft
name="Microjet_LisaM"
ac_id="4"
airframe="airframes/examples/microjet_lisa_m.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing_imu.xml"
flight_plan="flight_plans/basic.xml"
settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/ins_neutrals.xml settings/control/ctl_dash_loiter_trim.xml"
gui_color="blue"
/>
<aircraft
name="Microjet_xsens_imu"
ac_id="45"
airframe="airframes/examples/microjet_imu_xsens.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing_imu.xml"
flight_plan="flight_plans/basic.xml"
settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/ins_neutrals.xml"
gui_color="blue"
/>
<aircraft
name="Microjet_xsens_ins"
ac_id="44"
airframe="airframes/examples/microjet_lisa_m_xsens.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing_imu.xml"
flight_plan="flight_plans/versatile.xml"
settings=" settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/ins_neutrals.xml settings/control/ctl_dash_loiter_trim.xml"
gui_color="blue"
/>
<!-- tiny/umarim -->
<aircraft
name="Microjet"
ac_id="5"
airframe="airframes/examples/microjet.xml"
radio="radios/cockpitMM.xml"
telemetry="telemetry/default_fixedwing.xml"
flight_plan="flight_plans/basic.xml"
settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/infrared.xml"
gui_color="#6293ba"
/>
<aircraft
name="Twog_IMU"
ac_id="7"
airframe="airframes/examples/twog_analogimu.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing_imu.xml"
flight_plan="flight_plans/versatile.xml"
settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/ins_neutrals.xml"
gui_color="blue"
/>
<aircraft
name="Umarim_Lite"
ac_id="20"
airframe="airframes/examples/umarim_lite_v2.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing_imu.xml"
flight_plan="flight_plans/basic.xml"
settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/ins_neutrals.xml"
gui_color="blue"
/>
<aircraft
name="Twinjet"
ac_id="6"
airframe="airframes/examples/twinjet.xml"
radio="radios/cockpitMM.xml"
telemetry="telemetry/default_fixedwing.xml"
flight_plan="flight_plans/versatile.xml"
settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml settings/estimation/infrared.xml"
gui_color="#ba6293"
/>
<aircraft
name="EasyStar_ETS"
ac_id="8"
airframe="airframes/examples/easystar_ets.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing.xml"
flight_plan="flight_plans/basic.xml"
settings="settings/fixedwing_basic.xml settings/estimation/infrared.xml"
gui_color="red"
/>
<aircraft
name="setup_lisam2"
ac_id="16"
airframe="airframes/examples/setup_lisam2.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/dummy.xml"
flight_plan="flight_plans/dummy.xml"
settings=" settings/test_fixedwing_actuators.xml"
gui_color="blue"
/>
<!-- Hardware test Lisa/L -->
<aircraft
name="LisaLv11_Booz2v12_RC"
ac_id="9"
airframe="airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/dummy.xml"
settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml"
gui_color="white"
/>
<aircraft
name="LisaLv11_Booz2v12_FW"
ac_id="10"
airframe="airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing.xml"
flight_plan="flight_plans/dummy.xml"
settings="settings/fixedwing_basic.xml"
gui_color="blue"
/>
<aircraft
name="LisaLv11_Aspirinv15_RC"
ac_id="11"
airframe="airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/dummy.xml"
settings=" settings/rotorcraft_basic.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_att_int.xml settings/control/stabilization_rate.xml"
gui_color="white"
/>
<aircraft
name="LisaLv11_Aspirinv15_FW"
ac_id="12"
airframe="airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_fw.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing.xml"
flight_plan="flight_plans/dummy.xml"
settings="settings/fixedwing_basic.xml"
gui_color="blue"
/>
</conf>
Expand Up @@ -7,12 +7,12 @@ use Program;
use Data::Dumper;
use Config;

$|++;
my $examples = XMLin("$ENV{'PAPARAZZI_SRC'}/conf/conf.xml.example");
$|++;
my $examples = XMLin("$ENV{'PAPARAZZI_SRC'}/conf/tests_conf.xml");

use Data::Dumper;

ok(1, "Parsed the example file");
ok(1, "Parsed the tests_conf file");
foreach my $example (sort keys%{$examples->{'aircraft'}})
{
#next unless $example =~ m#easystar#i;
Expand Down

0 comments on commit bb8ef47

Please sign in to comment.