[paparazzi-commits] [5422] en route for the reorg...

[antoine drouin]

Revision: 5422
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5422
Author:   poine
Date:     2010-08-17 19:06:55 +0000 (Tue, 17 Aug 2010)
Log Message:
-----------
en route for the reorg...

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/microjet_example.xml
    paparazzi3/trunk/sw/tools/gen_aircraft.ml

Added Paths:
-----------
    paparazzi3/trunk/conf/autopilot/fixed_wings.makefile
    paparazzi3/trunk/conf/boards/
    paparazzi3/trunk/conf/boards/tiny_2.11.makefile

Modified: paparazzi3/trunk/conf/airframes/microjet_example.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/microjet_example.xml        2010-08-17 
18:24:15 UTC (rev 5421)
+++ paparazzi3/trunk/conf/airframes/microjet_example.xml        2010-08-17 
19:06:55 UTC (rev 5422)
@@ -1,4 +1,4 @@
-<!DOCTYPE airframe SYSTEM "airframe.dtd">
+<!-- <!DOCTYPE airframe SYSTEM "airframe.dtd"> -->
 
 <!-- Microjet Multiplex (http://www.multiplex-rc.de/)
      Tiny 1.1 board (http://paparazzi.enac.fr/wiki/Tiny)
@@ -158,6 +158,17 @@
     <define name="DEVICE_ADDRESS" value="...."/>
   </section>
 
+  
+  <target name="fixed_wings" board="tiny_2.11">
+   <subsystem name="radio_control" type="ppm"/>
+  </target>
+  
+<!--
+ include $(PAPARAZZI_SRC)/conf/autopilot/fixed_wing.makefile
+ include $(PAPARAZZI_SRC)/conf/boards/tiny_2.11.makefile
+ include $(CFG_FIXED_WINGS)/radio_control_ppm.makefile
+-->
+
   <makefile>
 BOARD_CFG = \"tiny_1_1.h\"
 

Added: paparazzi3/trunk/conf/autopilot/fixed_wings.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/fixed_wings.makefile                        
        (rev 0)
+++ paparazzi3/trunk/conf/autopilot/fixed_wings.makefile        2010-08-17 
19:06:55 UTC (rev 5422)
@@ -0,0 +1,4 @@
+#
+# fixed_wings.makefile
+#
+#

Added: paparazzi3/trunk/conf/boards/tiny_2.11.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/tiny_2.11.makefile                             
(rev 0)
+++ paparazzi3/trunk/conf/boards/tiny_2.11.makefile     2010-08-17 19:06:55 UTC 
(rev 5422)
@@ -0,0 +1,3 @@
+#
+# tiny_2.11.makefile
+#
\ No newline at end of file

Modified: paparazzi3/trunk/sw/tools/gen_aircraft.ml
===================================================================
--- paparazzi3/trunk/sw/tools/gen_aircraft.ml   2010-08-17 18:24:15 UTC (rev 
5421)
+++ paparazzi3/trunk/sw/tools/gen_aircraft.ml   2010-08-17 19:06:55 UTC (rev 
5422)
@@ -94,6 +94,23 @@
     end)
     (Xml.children xml);
 
+  (** Search and dump target sections *)
+  List.iter (fun x ->
+    if ExtXml.tag_is x "target" then begin
+      begin try
+        fprintf f "\n# makefile target '%s' board '%s'\n\n" (Xml.attrib x 
"name") (Xml.attrib x "board");
+        fprintf f "include $(PAPARAZZI_SRC)/conf/autopilot/%s.makefile\n" 
(Xml.attrib x "name");
+        fprintf f "include $(PAPARAZZI_SRC)/conf/boards/%s.makefile\n" 
(Xml.attrib x "board");
+      with _ -> () end;
+      (**     
+        match Xml.children x with
+         [Xml.PCData s] -> fprintf f "%s\n" s
+        | _ -> failwith (sprintf "Warning: wrong makefile section in '%s': 
%s\n" airframe_file (Xml.to_string_fmt x)) 
+       **)
+      
+    end)
+    (Xml.children xml);
+
   (** Look for modules *)
   let files = ref [] in
   List.iter (fun x ->