Unified CDW airframe naming and moved related configs

conf/CDW/cdw_conf.xml

@@ -2,7 +2,7 @@
   <aircraft
    name="Asctec"
    ac_id="150"
-   airframe="airframes/CDW/asctec_cdw.xml"
+   airframe="airframes/CDW/cdw_asctec.xml"
    radio="radios/R6107SP_7ch.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
@@ -13,7 +13,7 @@
   <aircraft
    name="Bebop"
    ac_id="151"
-   airframe="airframes/CDW/bebop.xml"
+   airframe="airframes/CDW/cdw_bebop.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/TUDELFT/tudelft_rotorcraft_survey_delft.xml"
@@ -24,7 +24,7 @@
   <aircraft
    name="MavTec"
    ac_id="2"
-   airframe="airframes/CDW/mavtec_cdw.xml"
+   airframe="airframes/CDW/cdw_mavtec.xml"
    radio="radios/R6107SP_7ch.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/TUDELFT/tudelft_rotorcraft_survey_imav2015_competition.xml"
@@ -35,7 +35,7 @@
   <aircraft
    name="TriCopter"
    ac_id="1"
-   airframe="airframes/CDW/tricopter_cdw.xml"
+   airframe="airframes/CDW/cdw_tricopter.xml"
    radio="radios/R6107SP_7ch.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"

conf/CDW/cdw_twoseas_conf.xml

@@ -1,9 +1,9 @@
 <conf>
   <aircraft
-   name="TwoSeas"
+   name="TwoSeasTwenty"
    ac_id="2"
-   airframe="airframes/CDW/TwoSeas.xml"
+   airframe="airframes/CDW/cdw_twoseastwenty.xml"
-   radio="radios/T8FG_SBUS.xml"
+   radio="radios/CDW/cdw_t8fg_sbus.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"

conf/TUDELFT/tudelft_conf.xml

@@ -68,7 +68,7 @@
   <aircraft
    name="Bebop5_Chris"
    ac_id="151"
-   airframe="airframes/CDW/bebop.xml"
+   airframe="airframes/CDW/cdw_bebop.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/TUDELFT/tudelft_rotorcraft_survey_imav2015_competition.xml"
@@ -123,7 +123,7 @@
   <aircraft
    name="MAVTec3_Chris"
    ac_id="33"
-   airframe="airframes/CDW/mavtec_cdw.xml"
+   airframe="airframes/CDW/cdw_mavtec.xml"
    radio="radios/R6107SP_7ch.xml"
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/TUDELFT/tudelft_rotorcraft_survey_imav2015_competition.xml"
@@ -178,7 +178,7 @@
   <aircraft
    name="SkyWalker"
    ac_id="2"
-   airframe="airframes/CDW/yapa_xsens.xml"
+   airframe="airframes/CDW/cdw_yapa_xsens.xml"
    radio="radios/R6107SP_7ch.xml"
    telemetry="telemetry/default_fixedwing_imu_9k6.xml"
    flight_plan="flight_plans/versatile.xml"

conf/airframes/CDW/cdw_asctec.xml

@@ -2,7 +2,7 @@
 
 <!-- this is an Asctec frame equipped with  Lisa/L v0.9 and Asctec V2 controllers -->
 
-<airframe name="asctec_cdw">
+<airframe name="cdw_asctec">
   <!-- ************************* FIRMWARE ************************* -->
 
   <firmware name="rotorcraft">

conf/airframes/CDW/cdw_mavtec.xml

@@ -1,8 +1,8 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
-<!-- this is an Asctec frame equipped with  Lisa/L v0.9 and Asctec V2 controllers -->
+<!-- this is an MavTec frame -->
 
-<airframe name="asctec_cdw">
+<airframe name="cdw_mavtec">
   <!-- ************************* FIRMWARE ************************* -->
 
   <firmware name="rotorcraft">

conf/airframes/CDW/cdw_tricopter.xml

@@ -22,7 +22,7 @@ LiPo/LiIo-Zellen: 3
 
 -->
 
-<airframe name="TriCopter_CDW">
+<airframe name="CDW_TriCopter">
   <!-- ************************* FIRMWARE ************************* -->
 
   <firmware name="rotorcraft">

conf/conf_tests.xml

@@ -24,7 +24,7 @@
   <aircraft
    name="Classix_XSens"
    ac_id="33"
-   airframe="airframes/CDW/classix.xml"
+   airframe="airframes/CDW/cdw_classix.xml"
    radio="radios/cockpitSX.xml"
    telemetry="telemetry/default_fixedwing_imu_9k6.xml"
    flight_plan="flight_plans/versatile.xml"
@@ -321,7 +321,7 @@
   <aircraft
    name="Yapa2_XSens"
    ac_id="32"
-   airframe="airframes/CDW/yapa_xsens.xml"
+   airframe="airframes/CDW/cdw_yapa_xsens.xml"
    radio="radios/R6107SP_7ch.xml"
    telemetry="telemetry/default_fixedwing_imu_9k6.xml"
    flight_plan="flight_plans/versatile.xml"

conf/radios/CDW/cdw_t8fg_sbus.xml

@@ -43,7 +43,7 @@
 -- Note: a command may be reversed by exchanging min and max values
 -->
 
-<!DOCTYPE radio SYSTEM "radio.dtd">
+<!DOCTYPE radio SYSTEM "../radio.dtd">
 <radio name="Futaba T10CG with SBUS" data_min="900" data_max="2100" sync_min ="5000" sync_max ="15000" pulse_type="POSITIVE">
  <channel ctl="A" function="ROLL"     min="1107" neutral="1520" max="1932" average="0"/>
  <channel ctl="B" function="PITCH"    min="1107" neutral="1520" max="1932" average="0"/>

sw/tools/airframe_editor/xml_airframe.py

@@ -188,7 +188,7 @@ if __name__ == '__main__':
             if len(sys.argv) > 3:
                 outputfile = airframe_file
     else:
-        airframe_file = "../../../conf/airframes/CDW/yapa_xsens.xml"
+        airframe_file = "../../../conf/airframes/CDW/cdw_yapa_xsens.xml"
 
     print(airframe_file)
     [e, airframe, hdr] = load(airframe_file)