[paparazzi-commits] [5426] parser now parses "subsystems"

[antoine drouin]

Revision: 5426
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5426
Author:   poine
Date:     2010-08-17 20:06:47 +0000 (Tue, 17 Aug 2010)
Log Message:
-----------
parser now parses "subsystems"

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

Added Paths:
-----------
    paparazzi3/trunk/conf/autopilot/subsystems/fixed_wings/
    
paparazzi3/trunk/conf/autopilot/subsystems/fixed_wings/radio_control_ppm.makefile

Modified: paparazzi3/trunk/conf/airframes/microjet_example.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/microjet_example.xml        2010-08-17 
20:01:15 UTC (rev 5425)
+++ paparazzi3/trunk/conf/airframes/microjet_example.xml        2010-08-17 
20:06:47 UTC (rev 5426)
@@ -163,11 +163,6 @@
    <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\"
@@ -183,7 +178,6 @@
 include $(CFG_FIXEDWING)/subsystems/fixedwing_navigation.makefile
 
 # IO Options
-include $(CFG_FIXEDWING)/subsystems/fixedwing_radio_control_ppm.makefile
 include $(CFG_FIXEDWING)/subsystems/fixedwing_actuators_4015.makefile
 
 # Sensors

Added: 
paparazzi3/trunk/conf/autopilot/subsystems/fixed_wings/radio_control_ppm.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/fixed_wings/radio_control_ppm.makefile
                           (rev 0)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/fixed_wings/radio_control_ppm.makefile
   2010-08-17 20:06:47 UTC (rev 5426)
@@ -0,0 +1,2 @@
+ap.CFLAGS += -DRADIO_CONTROL
+ap.srcs += $(SRC_FIXEDWING)/radio_control.c $(SRC_ARCH)/ppm_hw.c

Modified: paparazzi3/trunk/sw/tools/gen_aircraft.ml
===================================================================
--- paparazzi3/trunk/sw/tools/gen_aircraft.ml   2010-08-17 20:01:15 UTC (rev 
5425)
+++ paparazzi3/trunk/sw/tools/gen_aircraft.ml   2010-08-17 20:06:47 UTC (rev 
5426)
@@ -101,13 +101,12 @@
         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");
+       let print_if_subsystem = (fun c ->
+          if ExtXml.tag_is c "subsystem" then begin
+            fprintf f "include $(CFG_%s)/%s_%s.makefile\n" 
(String.uppercase(Xml.attrib x "name")) (Xml.attrib c "name") (Xml.attrib c 
"type");
+          end) in
+       List.iter print_if_subsystem (Xml.children x)
       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);