[paparazzi-commits] [6395] define can be set for all targets of a firmware

[Gautier Hattenberger]

Revision: 6395
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6395
Author:   gautier
Date:     2010-11-11 10:43:47 +0000 (Thu, 11 Nov 2010)
Log Message:
-----------
define can be set for all targets of a firmware

Modified Paths:
--------------
    paparazzi-software/trunk/conf/airframes/ENAC/fixed-wing/funjet2.xml
    paparazzi-software/trunk/conf/airframes/airframe.dtd
    paparazzi-software/trunk/sw/tools/gen_aircraft.ml

Modified: paparazzi-software/trunk/conf/airframes/ENAC/fixed-wing/funjet2.xml
===================================================================
--- paparazzi-software/trunk/conf/airframes/ENAC/fixed-wing/funjet2.xml 
2010-11-11 10:24:08 UTC (rev 6394)
+++ paparazzi-software/trunk/conf/airframes/ENAC/fixed-wing/funjet2.xml 
2010-11-11 10:43:47 UTC (rev 6395)
@@ -29,18 +29,14 @@
   </modules>
 
   <firmware name="fixedwing">
-    <target name="sim" board="pc">
-      <define name="AGR_CLIMB"/>
-      <define name="ALT_KALMAN"/>
-      <define name="LOITER_TRIM"/>
-      <define name="USE_I2C0"/>
-    </target>
+    <define name="USE_I2C0"/>
+    <define name="AGR_CLIMB"/>
+    <define name="ALT_KALMAN"/>
+    <define name="LOITER_TRIM"/>
+
+    <target name="sim" board="pc"/>
     <target name="ap" board="tiny_2.11">
       <param name="FLASH_MODE" value="IAP"/>
-      <define name="AGR_CLIMB"/>
-      <define name="ALT_KALMAN"/>
-      <define name="LOITER_TRIM"/>
-      <define name="USE_I2C0"/>
     </target>
 
     <subsystem name="radio_control" type="ppm"/>

Modified: paparazzi-software/trunk/conf/airframes/airframe.dtd
===================================================================
--- paparazzi-software/trunk/conf/airframes/airframe.dtd        2010-11-11 
10:24:08 UTC (rev 6394)
+++ paparazzi-software/trunk/conf/airframes/airframe.dtd        2010-11-11 
10:43:47 UTC (rev 6395)
@@ -25,7 +25,7 @@
 <!ELEMENT load (param|flag|define)*>
 <!ELEMENT param EMPTY>
 <!ELEMENT flag EMPTY>
-<!ELEMENT firmware (target|subsystem)*>
+<!ELEMENT firmware (target|subsystem|define)*>
 <!ELEMENT target (param|define)*>
 <!ELEMENT subsystem (param)*>
 

Modified: paparazzi-software/trunk/sw/tools/gen_aircraft.ml
===================================================================
--- paparazzi-software/trunk/sw/tools/gen_aircraft.ml   2010-11-11 10:24:08 UTC 
(rev 6394)
+++ paparazzi-software/trunk/sw/tools/gen_aircraft.ml   2010-11-11 10:43:47 UTC 
(rev 6395)
@@ -298,6 +298,10 @@
          List.iter (parse_subsystems makefile_ac tag) (Xml.children tag );    
(** dump firware subsystems **)
                  fprintf makefile_ac "endif\n\n";
                with _ -> () end;
+  | "define" ->
+      let name = ExtXml.attrib target "name"
+      and value = try "="^(Xml.attrib target "value") with _ -> "" in
+      fprintf makefile_ac "$(TARGET).CFLAGS += -D%s%s\n" name value;
    | _ -> ()