[paparazzi-commits] [5536] more configuration

[antoine drouin]

Revision: 5536
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5536
Author:   poine
Date:     2010-08-21 20:44:34 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
more configuration

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/Poine/booz2_a1.xml
    paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml
    paparazzi3/trunk/conf/airframes/Poine/booz2_a8.xml

Modified: paparazzi3/trunk/conf/airframes/Poine/booz2_a1.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/Poine/booz2_a1.xml  2010-08-21 20:44:07 UTC 
(rev 5535)
+++ paparazzi3/trunk/conf/airframes/Poine/booz2_a1.xml  2010-08-21 20:44:34 UTC 
(rev 5536)
@@ -206,22 +206,20 @@
 
 
 
+<!--
   <makefile target="opening">
-
-
 # prevents motors from ever starting
 #ap.CFLAGS += -DKILL_MOTORS
-ap.CFLAGS += -DMODEM_BAUD=B57600
-ap.CFLAGS += -DUSE_ADAPT_HOVER
-
-
+#ap.CFLAGS += -DUSE_ADAPT_HOVER
   </makefile>
+-->
 
-
-  <firmware name="baloo">
-    <target name="ap" board="booz">
-      <param  name="FLASH_MODE" value="IAP"/>   <!-- that is the default for 
the board but I'm putting it here as example--> 
+  <firmware name="rotorcraft">
+    <target name="ap" board="booz_1.0">
+      <param  name="FLASH_MODE" value="IAP"/>   <!-- default for the board but 
putting it here as example--> 
     </target>
+    <target name="sim" board="pc">
+    </target> 
     <subsystem name="radio_control" type="ppm"/>
     <subsystem name="actuators"     type="mkk"/>
     <subsystem name="imu"           type="b2v1"/>
@@ -229,16 +227,20 @@
     <subsystem name="ahrs"          type="cmpl"/>
   </firmware>
 
+  <firmware name="booz_test_progs">
+    <target name="test_telemetry" board="booz_1.0">
+      <param name="MODEM_PORT" value="UART1"/>
+    </target>
+  </firmware>
 
+<!--
   <makefile target="closure" location="after">
-
-CFG_BOOZ=$(PAPARAZZI_SRC)/conf/autopilot/
+#CFG_BOOZ=$(PAPARAZZI_SRC)/conf/autopilot/
 # FIXME: make fms a module
-include $(CFG_BOOZ)/subsystems/booz2_fms_test_signal.makefile
-
-include $(CFG_BOOZ)/booz2_test_progs.makefile
-include $(CFG_BOOZ)/booz2_simulator_nps.makefile
-
+#include $(CFG_BOOZ)/subsystems/booz2_fms_test_signal.makefile
+#include $(CFG_BOOZ)/booz2_test_progs.makefile
+#include $(CFG_BOOZ)/booz2_simulator_nps.makefile
   </makefile>
+-->
 
 </airframe>

Modified: paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml  2010-08-21 20:44:07 UTC 
(rev 5535)
+++ paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml  2010-08-21 20:44:34 UTC 
(rev 5536)
@@ -175,37 +175,26 @@
     <subsystem name="ahrs"          type="cmpl"/>
   </firmware>
 
-  <firmware name="rotorcraft">
-    <target name="test_led"      board="lisa_l_1.0" />
-    <target name="test_float"    board="lisa_l_1.0" />
-    <target name="test_periodic" board="lisa_l_1.0" />
+  <firmware name="lisa_l_test_progs">
+    <target name="test_telemetry" board="lisa_l_1.0"/>
+    <target name="test_baro"      board="lisa_l_1.0"/>
+    <target name="test_spektrum"  board="lisa_l_1.0"/>
   </firmware>
 
 
+  <firmware name="lisa_passthrough">
+      <target name="overo_test_passthrough" board="lisa_l_1.0"  >
+      <param name="HOST"          value="A7"/>
+      <param name="USER"          value=""/>
+      <param name="TARGET_DIR"    value="~"/>
+      <param name="PERIODIC_FREQ" value="512"/>
+    </target>
+ </firmware>
+
  <makefile>
 
-
-
-USER =
-#HOST = 10.31.4.22
-#HOST = overo
-HOST = beth
-TARGET_DIR = ~
-
-SRC_FMS=fms
-
-
-
-ap.CFLAGS += -DMODEM_BAUD=B57600
-
 include $(PAPARAZZI_SRC)/conf/autopilot/lisa_test_progs.makefile
 
-#
-# 
-#
-
-include $(PAPARAZZI_SRC)/conf/autopilot/lisa_passthrough.makefile
-
  </makefile>
 
 </airframe>

Modified: paparazzi3/trunk/conf/airframes/Poine/booz2_a8.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/Poine/booz2_a8.xml  2010-08-21 20:44:07 UTC 
(rev 5535)
+++ paparazzi3/trunk/conf/airframes/Poine/booz2_a8.xml  2010-08-21 20:44:34 UTC 
(rev 5536)
@@ -196,10 +196,11 @@
       <param name="RADIO_CONTROL_SPEKTRUM_MODEL" 
              
value="\\\"booz/radio_control/booz_radio_control_spektrum_dx7se.h\\\""/>
     </subsystem>
+    <subsystem name="imu" type="b2_v1.1"/>
 
 
     <target name="overo_test_passthrough" board="lisa_l_1.0"  >
-      <param name="HOST"          value="auto1"/>
+      <param name="HOST"          value="A7"/>
       <param name="USER"          value=""/>
       <param name="TARGET_DIR"    value="~"/>
       <param name="PERIODIC_FREQ" value="512"/>
@@ -207,5 +208,12 @@
 
   </firmware>
 
+  <firmware name="lisa_l_test_progs">
+    <target name="test_telemetry" board="lisa_l_1.0">
+      <param name="MODEM_PORT" value="UART2"/>
+    </target>
+    <target name="test_baro"      board="lisa_l_1.0">
+    </target>
+  </firmware>
 
 </airframe>