[paparazzi-commits] [5454] target params

[Christophe De Wagter]

Revision: 5454
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5454
Author:   dewagter
Date:     2010-08-18 13:05:55 +0000 (Wed, 18 Aug 2010)
Log Message:
-----------
target params

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

Modified: paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml        
2010-08-18 13:00:50 UTC (rev 5453)
+++ paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml        
2010-08-18 13:05:55 UTC (rev 5454)
@@ -161,6 +161,7 @@
   </section>
 
   <target name="fixedwing" board="tiny_2.11">
+    <param name="FLASH_MODE" value="IAP"/>
     <subsystem name="autopilot"/>
     <subsystem name="testing"/>
     <subsystem name="radio_control" type="ppm"/>

Modified: paparazzi3/trunk/conf/airframes/airframe.dtd
===================================================================
--- paparazzi3/trunk/conf/airframes/airframe.dtd        2010-08-18 13:00:50 UTC 
(rev 5453)
+++ paparazzi3/trunk/conf/airframes/airframe.dtd        2010-08-18 13:05:55 UTC 
(rev 5454)
@@ -23,7 +23,7 @@
 <!ELEMENT modules (load)*>
 <!ELEMENT load EMPTY>
 <!ELEMENT param EMPTY>
-<!ELEMENT target (subsystem)*>
+<!ELEMENT target (subsystem|param)*>
 <!ELEMENT subsystem (define|param)*>
 
 <!ATTLIST target

Modified: paparazzi3/trunk/sw/tools/gen_aircraft.ml
===================================================================
--- paparazzi3/trunk/sw/tools/gen_aircraft.ml   2010-08-18 13:00:50 UTC (rev 
5453)
+++ paparazzi3/trunk/sw/tools/gen_aircraft.ml   2010-08-18 13:05:55 UTC (rev 
5454)
@@ -162,6 +162,11 @@
         fprintf makefile_ac "include 
$(PAPARAZZI_SRC)/conf/autopilot/%s.makefile\n" (Xml.attrib tag "name");
         fprintf makefile_ac "\n# Subsystems:'\n";
        let print_if_subsystem = (fun c ->
+          if ExtXml.tag_is c "param" then begin
+            fprintf makefile_ac "%s = %s\n"
+            (String.uppercase(Xml.attrib c "name"))
+            (Xml.attrib c "value")
+          end;
           if ExtXml.tag_is c "subsystem" then begin
             let has_subtype = ref false in
             begin try

Modified: paparazzi3/trunk/sw/tools/gen_airframe.ml
===================================================================
--- paparazzi3/trunk/sw/tools/gen_airframe.ml   2010-08-18 13:00:50 UTC (rev 
5453)
+++ paparazzi3/trunk/sw/tools/gen_airframe.ml   2010-08-18 13:05:55 UTC (rev 
5454)
@@ -229,7 +229,9 @@
 
 let parse_subsystems = fun subsystem ->
   match Xml.tag subsystem with
-    "subsystem" ->
+    "param" ->
+      printf "// subsystem parameter: %s\n"  (ExtXml.attrib subsystem "name") 
+   | "subsystem" ->
       printf "// -%s:\n"  (ExtXml.attrib subsystem "name");
       List.iter parse_subsystem_defines (Xml.children subsystem)
    | _ -> xml_error "subsystem"