[paparazzi-commits] [5846] Add <include href=blablah> bits to gen_airframe.ml and airframe.dtd

[Allen Ibara]

Revision: 5846
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5846
Author:   aibara
Date:     2010-09-09 18:52:58 +0000 (Thu, 09 Sep 2010)
Log Message:
-----------
Add <include href=blablah> bits to gen_airframe.ml and airframe.dtd

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/airframe.dtd
    paparazzi3/trunk/sw/tools/gen_airframe.ml

Modified: paparazzi3/trunk/conf/airframes/airframe.dtd
===================================================================
--- paparazzi3/trunk/conf/airframes/airframe.dtd        2010-09-09 18:47:22 UTC 
(rev 5845)
+++ paparazzi3/trunk/conf/airframes/airframe.dtd        2010-09-09 18:52:58 UTC 
(rev 5846)
@@ -1,6 +1,7 @@
 <!-- Paparazzi airframe DTD -->
 
-<!ELEMENT airframe 
(servos|commands|csc_boards|rc_commands|auto_rc_commands|ap_only_commands|command_laws|section|makefile|modules|firmware)*>
+<!ELEMENT airframe 
(include|servos|commands|csc_boards|rc_commands|auto_rc_commands|ap_only_commands|command_laws|section|makefile|modules|firmware)*>
+<!ELEMENT include EMPTY>
 <!ELEMENT servos (servo)*>
 <!ELEMENT commands (axis)*>
 <!ELEMENT csc_boards (board)*>
@@ -28,6 +29,9 @@
 <!ELEMENT target (param|define)*>
 <!ELEMENT subsystem (param)*>
 
+<!ATTLIST include
+href CDATA #REQUIRED>
+
 <!ATTLIST firmware
 name CDATA #REQUIRED>
 

Modified: paparazzi3/trunk/sw/tools/gen_airframe.ml
===================================================================
--- paparazzi3/trunk/sw/tools/gen_airframe.ml   2010-09-09 18:47:22 UTC (rev 
5845)
+++ paparazzi3/trunk/sw/tools/gen_airframe.ml   2010-09-09 18:52:58 UTC (rev 
5846)
@@ -243,7 +243,7 @@
    let failsafe_value = int_of_string (ExtXml.attrib command "failsafe_value") 
in
    { failsafe_value = failsafe_value; foo = 0}
 
-let parse_section = fun s ->
+let rec parse_section = fun s ->
   match Xml.tag s with
     "section" ->
       let prefix = ExtXml.attrib_or_default s "prefix" "" in
@@ -297,6 +297,12 @@
       printf "#define SendCscFromActuators() { \\\n";
       List.iter parse_csc_boards (Xml.children s);
       printf "}\n"
+  | "include" ->
+      let filename = ExtXml.attrib s "href" in
+      let subxml = Xml.parse_file filename in
+      printf "/* XML %s */" filename;
+      nl ();
+      List.iter parse_section (Xml.children subxml)
   | "makefile" ->
       ()
       (** Ignoring this section *)