cleaning

conf/conf.xml.example

@@ -1,28 +1,6 @@
 <?xml version="1.0"?>
 
 <conf>
-
-  <!-- Simulation only aircrafts -->
-  <aircraft 
-    name="Twin1"
-    ac_id="1"
-    airframe="airframes/twinstar1.xml" 
-    radio="radios/mc3030.xml" 
-    flight_plan="flight_plans/mav05_cw.xml"
-    telemetry="telemetry/default.xml"
-    gui_color="blue"
-  />
-
-  <!-- avr aircrafts -->
-  <aircraft 
-    name="Plaster"
-    ac_id="2"
-    airframe="airframes/plaster1.xml" 
-    radio="radios/cockpitMM.xml" 
-    telemetry="telemetry/default.xml"
-    flight_plan="flight_plans/dummy.xml"
-  />
-
 <!-- arm7 aircrafts -->
 
  <!-- tiny -->
@@ -47,44 +25,6 @@
     gui_color="#ba6293"
   />
 
-
-  <aircraft 
-    name="DEMO"
-    ac_id="144"
-    airframe="airframes/demo.xml" 
-    radio="radios/T9cap.xml" 
-    telemetry="telemetry/default.xml"
-    flight_plan="flight_plans/dummy.xml"
-    settings="settings/demo5_settings.xml"
-  />
-
-  <aircraft 
-    name="MB"
-    ac_id="145"
-    airframe="airframes/motor_bench.xml" 
-    radio="radios/T9cap.xml" 
-    telemetry="telemetry/default.xml"
-    flight_plan="flight_plans/dummy.xml"
-  />
-
- <aircraft
-    name="DCMC"
-    ac_id="146"
-    airframe="airframes/dc_mc.xml"
-    radio="radios/T9cap.xml"
-    telemetry="telemetry/default.xml"
-    flight_plan="flight_plans/dummy.xml"
-  />
-
- <aircraft
-    name="BLMC"
-    ac_id="147"
-    airframe="airframes/bl_mc.xml"
-    radio="radios/T9cap.xml"
-    telemetry="telemetry/default.xml"
-    flight_plan="flight_plans/dummy.xml"
-  />
-
  <aircraft
     name="BOOZ"
     ac_id="148"

conf/control_panel.xml.example

@@ -60,53 +60,25 @@
 
 
   <section name="sessions">
-
-    <session name="1 Simple Simulation">
-      <program name="Server"></program>
-      <program name="Simulator"><arg flag="-a" constant="MJ5"/></program>
-      <program name="GCS">
-        <arg flag="-ref" constant="WGS84 43.4623 1.2730"/>
-        <arg flag="-center" constant="WGS84 43.4623 1.2730"/>
-        <arg flag="-zoom" constant="0.75"/>
-        <arg flag="-speech"/>
-      </program> 
-      <program name="gaia"/>
-    </session>
-
-    <session name="2 Versatile Simulation">
-      <program name="Server"></program>
-      <program name="GCS">
-<!--    <arg flag="-mplayer" constant="rtsp://localhost:7070/webcam"/> -->
-      </program>
-      <program name="Simulator"><arg flag="-a" constant="TJ1"/></program>
-      <program name="Messages"><arg flag="-c" constant="ground:ground"/></program>
-    </session>
-
-    <session name="3 Multi-A/C Simulation">
-      <program name="Simulator"><arg flag="-a" constant="MJ5"/></program>
-      <program name="Simulator"><arg flag="-a" constant="TJ1"/></program>
-      <program name="Server"/>
-      <program name="GCS">
-        <arg flag="-track_size" constant="10"/>
-      </program>
-    </session>
-
-   <session name="4 Flight with XBee/Xtend modem">
+   <session name="Flight with USB-serial modem">
       <program name="Data Link">
-        <arg flag="-d" constant="/dev/paparazzi/xbee"/>
-        <arg flag="-transport" constant="xbee"/>
+        <arg flag="-d" constant="/dev/ttyUSB0"/>
         <arg flag="-uplink" constant=""/>
       </program>
       <program name="Server"/>
       <program name="GCS"/>
     </session>
 
-    <session name="5 Log Replay">
-      <program name="Server"><arg flag="-n"/></program>
+   <session name="Flight with Maxstream@57600">
+      <program name="Data Link">
+        <arg flag="-d" constant="/dev/paparazzi/xbee"/>
+        <arg flag="-transport" constant="xbee"/>
+        <arg flag="-s" constant="57600"/>
+        <arg flag="-uplink" constant=""/>
+      </program>
+      <program name="Server"/>
       <program name="GCS"/>
-      <program name="Log File Player"/>
     </session>
-
   </section>
 
 </control_panel>