[paparazzi-commits] [4237] back to standard roll code

[Pascal Brisset]

Revision: 4237
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4237
Author:   hecto
Date:     2009-10-07 19:34:55 +0000 (Wed, 07 Oct 2009)
Log Message:
-----------
 back to standard roll code

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/funjet1.xml

Modified: paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/funjet1.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/funjet1.xml 2009-10-06 
23:04:12 UTC (rev 4236)
+++ paparazzi3/trunk/conf/airframes/ENAC/fixed-wing/funjet1.xml 2009-10-07 
19:34:55 UTC (rev 4237)
@@ -261,7 +261,7 @@
 ap.srcs += infrared.c estimator.c
 
 ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM
-ap.srcs += nav.c fw_h_ctl_a.c fw_v_ctl.c
+ap.srcs += nav.c fw_h_ctl.c fw_v_ctl.c
 
 
 ap.CFLAGS += -DGYRO -DADXRS150
@@ -293,7 +293,7 @@
 sim.TARGET = autopilot
 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_a.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
+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
 
 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN