[paparazzi-commits] [5482] <firmware> improved

[Christophe De Wagter]

Revision: 5482
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5482
Author:   dewagter
Date:     2010-08-19 15:03:55 +0000 (Thu, 19 Aug 2010)
Log Message:
-----------
<firmware> improved

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml
    paparazzi3/trunk/conf/autopilot/sitl.makefile
    paparazzi3/trunk/conf/boards/pc.makefile
    paparazzi3/trunk/conf/boards/tiny_2.11.makefile
    paparazzi3/trunk/sw/tools/gen_aircraft.ml

Modified: paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml        
2010-08-19 14:26:20 UTC (rev 5481)
+++ paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml        
2010-08-19 15:03:55 UTC (rev 5482)
@@ -161,9 +161,7 @@
   </section>
 
   <firmware name="fixedwing">
-<!--
     <target name="sim"                         board="pc" />
--->
     <target name="ap"                  board="tiny_2.11">
       <param name="FLASH_MODE"                 value="IAP" />
       <define name="AGR_CLIMB" />
@@ -192,6 +190,7 @@
     </modules>
 
   </firmware>
+
 <!--
   <firmware name="setup">
     <target name="tunnel"              board="tiny_2.11" />

Modified: paparazzi3/trunk/conf/autopilot/sitl.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/sitl.makefile       2010-08-19 14:26:20 UTC 
(rev 5481)
+++ paparazzi3/trunk/conf/autopilot/sitl.makefile       2010-08-19 15:03:55 UTC 
(rev 5482)
@@ -4,3 +4,6 @@
 sim.TARGETDIR = autopilot
 sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK 
-DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO
 sim.srcs += latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c 
infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c sys_time.c main_fbw.c 
main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c 
$(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c 
$(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
+
+
+

Modified: paparazzi3/trunk/conf/boards/pc.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/pc.makefile    2010-08-19 14:26:20 UTC (rev 
5481)
+++ paparazzi3/trunk/conf/boards/pc.makefile    2010-08-19 15:03:55 UTC (rev 
5482)
@@ -14,5 +14,5 @@
 sim.TARGET = autopilot
 sim.TARGETDIR = autopilot
 
+sim.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
 
-

Modified: paparazzi3/trunk/conf/boards/tiny_2.11.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/tiny_2.11.makefile     2010-08-19 14:26:20 UTC 
(rev 5481)
+++ paparazzi3/trunk/conf/boards/tiny_2.11.makefile     2010-08-19 15:03:55 UTC 
(rev 5482)
@@ -31,8 +31,8 @@
 ### default settings for tiny and twog
 GPS_UART_NR    = 0
 GPS_BAUD       = 38400
-MODEM_UART_NR = 1
-MODEM_BAUD = 57600
+MODEM_UART_NR  = 1
+MODEM_BAUD     = 57600
 
 ADC_IR1 = ADC_1
 ADC_IR2 = ADC_2

Modified: paparazzi3/trunk/sw/tools/gen_aircraft.ml
===================================================================
--- paparazzi3/trunk/sw/tools/gen_aircraft.ml   2010-08-19 14:26:20 UTC (rev 
5481)
+++ paparazzi3/trunk/sw/tools/gen_aircraft.ml   2010-08-19 15:03:55 UTC (rev 
5482)
@@ -186,7 +186,15 @@
                 (Xml.attrib c "value")
             end) in
          List.iter print_if_subsystem (Xml.children firmware);
-          fprintf makefile_ac "include 
$(PAPARAZZI_SRC)/conf/boards/%s.makefile\n" (Xml.attrib firmware "board")
+(**      let print_if_subsystem = (fun c ->
+            if ExtXml.tag_is c "define" then begin
+              fprintf makefile_ac "%s.CFLAGS += -D%s\n"
+                (String.uppercase(Xml.attrib tag "name"))
+                (Xml.attrib c "value")
+            end) in
+         List.iter print_if_subsystem (Xml.children firmware);
+**)          fprintf makefile_ac "include 
$(PAPARAZZI_SRC)/conf/boards/%s.makefile\n" (Xml.attrib firmware "board");
+          fprintf makefile_ac "include 
$(PAPARAZZI_SRC)/conf/autopilot/%s.makefile\n" (Xml.attrib tag "name");
         with _ -> () end;
    | _ -> ()
 
@@ -199,7 +207,6 @@
     if ExtXml.tag_is tag "firmware" then begin
       begin try
         fprintf makefile_ac "\n######################\n# makefile firmware 
'%s' \n" (Xml.attrib tag "name");
-        fprintf makefile_ac "include 
$(PAPARAZZI_SRC)/conf/autopilot/%s.makefile\n" (Xml.attrib tag "name");
        List.iter (parse_firmware makefile_ac tag) (Xml.children tag )
       with _ -> () end;
     end)