From bfb41a52959f589270106aa133f3f3b4da574ad8 Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Thu, 18 Nov 2010 22:27:11 +0100 Subject: [PATCH] change INFRARED flag to use USE_INFRARED in airframes and makefiles --- conf/airframes/ENAC/fixed-wing/drops.xml | 4 ++-- conf/airframes/ENAC/fixed-wing/firestorm.xml | 4 ++-- conf/airframes/ENAC/fixed-wing/funjet1.xml | 4 ++-- conf/airframes/ENAC/fixed-wing/minimag1.xml | 2 +- conf/airframes/ENAC/fixed-wing/slayer2.xml | 4 ++-- conf/airframes/ENAC/fixed-wing/soarzi.xml | 2 +- conf/airframes/ENAC/fixed-wing/solarstorm.xml | 4 ++-- conf/airframes/ENAC/fixed-wing/spocII.xml | 4 ++-- conf/airframes/ENAC/fixed-wing/twinjet2.xml | 4 ++-- conf/airframes/PPZUAV/fixed-wing/kalscott_easystar.xml | 2 +- conf/airframes/Paul/minimag1.xml | 2 +- conf/airframes/Poine/easy_glider1.xml | 2 +- conf/airframes/TUDelft/Trip50A.xml | 2 +- conf/airframes/TUDelft/Trip50B.xml | 2 +- conf/airframes/TUDelft/holiday50.xml | 2 +- conf/airframes/demo_module.xml | 2 +- conf/airframes/hitl_usb.xml | 4 ++-- conf/airframes/microjet_raw_makefile.xml | 2 +- conf/airframes/mm/extra/press_t.xml | 2 +- conf/airframes/mm/fixed-wing/drops.xml | 4 ++-- conf/airframes/mm/fixed-wing/funjeteth1.xml | 2 +- conf/airframes/mm/fixed-wing/funjeteth2.xml | 2 +- conf/airframes/mm/fixed-wing/funjetfmi1.xml | 2 +- conf/airframes/mm/fixed-wing/funjetfmi2.xml | 2 +- conf/airframes/mm/fixed-wing/funjetfmi3.xml | 2 +- conf/airframes/mm/fixed-wing/funjetgfi1.xml | 2 +- conf/airframes/mm/fixed-wing/funjetgfi3.xml | 2 +- conf/airframes/mm/fixed-wing/funjetgfi4.xml | 2 +- conf/airframes/mm/fixed-wing/funjetgfi5.xml | 2 +- conf/airframes/mm/fixed-wing/funjetgfi6.xml | 2 +- conf/airframes/mm/fixed-wing/funjetgfi7.xml | 2 +- conf/airframes/mm/fixed-wing/funjetgfi8.xml | 2 +- conf/airframes/mm/fixed-wing/funjetgfi9.xml | 2 +- conf/airframes/mm/fixed-wing/funjetmm2.xml | 2 +- conf/airframes/mm/fixed-wing/merlin.xml | 4 ++-- conf/airframes/mm/fixed-wing/miniwing.xml | 2 +- conf/airframes/mm/fixed-wing/slowfast.xml | 2 +- conf/airframes/mm/fixed-wing/slowfast2.xml | 2 +- conf/airframes/mm/fixed-wing/twinstarmm.xml | 4 ++-- conf/airframes/mm/hangar/black_one.xml | 2 +- conf/airframes/mm/hangar/glass_one1.xml | 2 +- conf/airframes/mm/hangar/glass_one2.xml | 2 +- conf/airframes/mm/hangar/glass_one3.xml | 2 +- conf/airframes/mm/hangar/lila.xml | 4 ++-- conf/airframes/mm/hangar/mac06a.xml | 2 +- conf/airframes/mm/hangar/red_one.xml | 2 +- conf/airframes/obsolete/easystar2.xml | 2 +- conf/airframes/obsolete/kalscott_easystar.xml | 2 +- conf/airframes/obsolete/malolo_sim.xml | 2 +- conf/airframes/obsolete/microjet5.xml | 2 +- conf/airframes/obsolete/microjet5_tp_auto.xml | 2 +- conf/airframes/obsolete/microjet6.xml | 2 +- conf/airframes/obsolete/microjetI.xml | 2 +- conf/airframes/obsolete/microjetII.xml | 2 +- conf/airframes/obsolete/microjetIII.xml | 2 +- conf/airframes/obsolete/minimag_fs.xml | 2 +- conf/airframes/obsolete/slayer1.xml | 2 +- conf/airframes/obsolete/slayer3.xml | 2 +- conf/airframes/obsolete/slayerJH.xml | 2 +- conf/airframes/obsolete/slicer1.xml | 2 +- conf/airframes/obsolete/slicer2.xml | 2 +- conf/airframes/obsolete/spirit.xml | 2 +- conf/airframes/obsolete/spirit_proto.xml | 2 +- conf/airframes/obsolete/storm1.xml | 2 +- conf/airframes/obsolete/tiny2.xml | 2 +- conf/airframes/obsolete/twinjet1.xml | 2 +- conf/airframes/obsolete/twinstar6.xml | 2 +- conf/airframes/obsolete/tyto1.xml | 2 +- conf/airframes/obsolete/xxx1.xml | 2 +- conf/airframes/tiny_hitl.xml | 2 +- conf/autopilot/sitl.makefile | 2 +- conf/autopilot/sitl_jsbsim.makefile | 2 +- conf/autopilot/sitl_link_pprz.makefile | 2 +- conf/autopilot/sitl_link_xbee.makefile | 2 +- .../autopilot/subsystems/fixedwing/attitude_infrared.makefile | 2 +- conf/autopilot/twin_mcu.makefile | 2 +- 76 files changed, 88 insertions(+), 88 deletions(-) diff --git a/conf/airframes/ENAC/fixed-wing/drops.xml b/conf/airframes/ENAC/fixed-wing/drops.xml index ee2d642f6c..2fdede5787 100644 --- a/conf/airframes/ENAC/fixed-wing/drops.xml +++ b/conf/airframes/ENAC/fixed-wing/drops.xml @@ -252,7 +252,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM @@ -268,7 +268,7 @@ ap.srcs += snav.c # Config for SITL simulation # include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile sim.ARCHDIR = $(ARCHI) -sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO +sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DUSE_INFRARED -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.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN diff --git a/conf/airframes/ENAC/fixed-wing/firestorm.xml b/conf/airframes/ENAC/fixed-wing/firestorm.xml index 2ffaed1292..5514d9894c 100644 --- a/conf/airframes/ENAC/fixed-wing/firestorm.xml +++ b/conf/airframes/ENAC/fixed-wing/firestorm.xml @@ -239,7 +239,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400 -DGPS_ ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM @@ -261,7 +261,7 @@ ap.CFLAGS += -DUSE_MODULES # Config for SITL simulation #include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile sim.ARCHDIR = $(ARCHI) -sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO +sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DUSE_INFRARED -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 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN diff --git a/conf/airframes/ENAC/fixed-wing/funjet1.xml b/conf/airframes/ENAC/fixed-wing/funjet1.xml index 7f464a7866..790c7ef219 100644 --- a/conf/airframes/ENAC/fixed-wing/funjet1.xml +++ b/conf/airframes/ENAC/fixed-wing/funjet1.xml @@ -261,7 +261,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM @@ -298,7 +298,7 @@ ap.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 # Config for SITL simulation #include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile sim.ARCHDIR = $(ARCHI) -sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO +sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DUSE_INFRARED -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 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN diff --git a/conf/airframes/ENAC/fixed-wing/minimag1.xml b/conf/airframes/ENAC/fixed-wing/minimag1.xml index 8054cc80d7..2a5ae3b41d 100644 --- a/conf/airframes/ENAC/fixed-wing/minimag1.xml +++ b/conf/airframes/ENAC/fixed-wing/minimag1.xml @@ -203,7 +203,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/ENAC/fixed-wing/slayer2.xml b/conf/airframes/ENAC/fixed-wing/slayer2.xml index efa6aa0c3d..75d9cb4a56 100644 --- a/conf/airframes/ENAC/fixed-wing/slayer2.xml +++ b/conf/airframes/ENAC/fixed-wing/slayer2.xml @@ -234,7 +234,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM @@ -271,7 +271,7 @@ ap.CFLAGS += -D BARO_MS5534A_W1=0xAC20 -D BARO_MS5534A_W2=0x87D9 -D BARO_MS5534A # Config for SITL simulation #include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile sim.ARCHDIR = $(ARCHI) -sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO +sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DUSE_INFRARED -DNAV -DLED -DWIND_INFO sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c infrared.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 -DUSE_BARO_MS5534A diff --git a/conf/airframes/ENAC/fixed-wing/soarzi.xml b/conf/airframes/ENAC/fixed-wing/soarzi.xml index 6298b647f7..147a8550bf 100644 --- a/conf/airframes/ENAC/fixed-wing/soarzi.xml +++ b/conf/airframes/ENAC/fixed-wing/soarzi.xml @@ -209,7 +209,7 @@ ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/ENAC/fixed-wing/solarstorm.xml b/conf/airframes/ENAC/fixed-wing/solarstorm.xml index 643e1f63fe..f51591dc8b 100644 --- a/conf/airframes/ENAC/fixed-wing/solarstorm.xml +++ b/conf/airframes/ENAC/fixed-wing/solarstorm.xml @@ -232,7 +232,7 @@ ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM @@ -253,7 +253,7 @@ ap.CFLAGS += -DUSE_MODULES # Config for SITL simulation #include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile sim.ARCHDIR = $(ARCHI) -sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO +sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DUSE_INFRARED -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.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN diff --git a/conf/airframes/ENAC/fixed-wing/spocII.xml b/conf/airframes/ENAC/fixed-wing/spocII.xml index 9bcfcce7f7..6d7665e940 100644 --- a/conf/airframes/ENAC/fixed-wing/spocII.xml +++ b/conf/airframes/ENAC/fixed-wing/spocII.xml @@ -237,7 +237,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM @@ -253,7 +253,7 @@ ap.CFLAGS += -DUSE_ADC_3 -DADC_CHANNEL_CURRENT=ADC_3 # Config for SITL simulation #include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile sim.ARCHDIR = $(ARCHI) -sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO +sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DUSE_INFRARED -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 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN diff --git a/conf/airframes/ENAC/fixed-wing/twinjet2.xml b/conf/airframes/ENAC/fixed-wing/twinjet2.xml index 8360ee69b9..f9e4ffc1a4 100644 --- a/conf/airframes/ENAC/fixed-wing/twinjet2.xml +++ b/conf/airframes/ENAC/fixed-wing/twinjet2.xml @@ -263,7 +263,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ ap.srcs += gps_ubx.c gps.c latlong.c ########## IR sensors -ap.CFLAGS += -DINFRARED -DALT_KALMAN +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN ap.srcs += infrared.c estimator.c ########## Gyro @@ -303,7 +303,7 @@ ap.CFLAGS += -DUSE_MODULES #include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile sim.ARCHDIR = $(ARCHI) -sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO +sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DUSE_INFRARED -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_n.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 -DPITCH_TRIM -DALT_KALMAN diff --git a/conf/airframes/PPZUAV/fixed-wing/kalscott_easystar.xml b/conf/airframes/PPZUAV/fixed-wing/kalscott_easystar.xml index c20d596a19..29a371d40f 100644 --- a/conf/airframes/PPZUAV/fixed-wing/kalscott_easystar.xml +++ b/conf/airframes/PPZUAV/fixed-wing/kalscott_easystar.xml @@ -184,7 +184,7 @@ ap.srcs += $(SRC_ARCH)/adc_hw.c ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN ap.srcs += infrared.c estimator.c # Control loops diff --git a/conf/airframes/Paul/minimag1.xml b/conf/airframes/Paul/minimag1.xml index 9f871c74a0..0e0b9b2c88 100644 --- a/conf/airframes/Paul/minimag1.xml +++ b/conf/airframes/Paul/minimag1.xml @@ -199,7 +199,7 @@ ap.srcs += $(SRC_ARCH)/adc_hw.c ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM -DWIND_INFO diff --git a/conf/airframes/Poine/easy_glider1.xml b/conf/airframes/Poine/easy_glider1.xml index cacf15c754..f69b5a6873 100644 --- a/conf/airframes/Poine/easy_glider1.xml +++ b/conf/airframes/Poine/easy_glider1.xml @@ -190,7 +190,7 @@ ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DWIND_INFO diff --git a/conf/airframes/TUDelft/Trip50A.xml b/conf/airframes/TUDelft/Trip50A.xml index b8203b747a..08d36d1fae 100644 --- a/conf/airframes/TUDelft/Trip50A.xml +++ b/conf/airframes/TUDelft/Trip50A.xml @@ -280,7 +280,7 @@ ap.srcs += $(SRC_ARCH)/adc_hw.c ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET -DSTRONG_WIND +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET -DSTRONG_WIND ap.srcs += infrared.c estimator.c gyro.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/TUDelft/Trip50B.xml b/conf/airframes/TUDelft/Trip50B.xml index d0194acc90..3cf392ae40 100644 --- a/conf/airframes/TUDelft/Trip50B.xml +++ b/conf/airframes/TUDelft/Trip50B.xml @@ -285,7 +285,7 @@ ap.srcs += $(SRC_ARCH)/adc_hw.c ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET -DSTRONG_WIND +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET -DSTRONG_WIND ap.srcs += infrared.c estimator.c gyro.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/TUDelft/holiday50.xml b/conf/airframes/TUDelft/holiday50.xml index 3edc74946e..8ec2847a94 100644 --- a/conf/airframes/TUDelft/holiday50.xml +++ b/conf/airframes/TUDelft/holiday50.xml @@ -279,7 +279,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400 #ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN diff --git a/conf/airframes/demo_module.xml b/conf/airframes/demo_module.xml index 9eb12183df..764de1e0a5 100644 --- a/conf/airframes/demo_module.xml +++ b/conf/airframes/demo_module.xml @@ -192,7 +192,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ ap.srcs += gps_ubx.c gps.c latlong.c ########## IR sensors -ap.CFLAGS += -DINFRARED -DALT_KALMAN +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN ap.srcs += infrared.c estimator.c ########## Nav diff --git a/conf/airframes/hitl_usb.xml b/conf/airframes/hitl_usb.xml index 08bc2a242b..ccfea0584e 100644 --- a/conf/airframes/hitl_usb.xml +++ b/conf/airframes/hitl_usb.xml @@ -140,7 +140,7 @@ ap.CFLAGS += -DGPS -DUBX ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DWIND_INFO @@ -154,7 +154,7 @@ ap.CFLAGS += -DGPS_USE_LATLONG # simulating LEA 5H # Config for SITL simulation sim.ARCHDIR = $(ARCH) -sim.CFLAGS += -DSITL -DAP -DFBW -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED +sim.CFLAGS += -DSITL -DAP -DFBW -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DUSE_INFRARED -DNAV -DLED sim.srcs = latlong.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 sim.srcs += nav_survey_rectangle.c nav_line.c traffic_info.c diff --git a/conf/airframes/microjet_raw_makefile.xml b/conf/airframes/microjet_raw_makefile.xml index f7f0c0fd2e..3ac5356afe 100644 --- a/conf/airframes/microjet_raw_makefile.xml +++ b/conf/airframes/microjet_raw_makefile.xml @@ -197,7 +197,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400 ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400 ap.srcs += gps_ubx.c gps.c latlong.c - ap.CFLAGS += -DINFRARED + ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DWIND_INFO ap.srcs += nav.c fw_h_ctl.c fw_v_ctl.c diff --git a/conf/airframes/mm/extra/press_t.xml b/conf/airframes/mm/extra/press_t.xml index 13ab9f25eb..e2697f251f 100755 --- a/conf/airframes/mm/extra/press_t.xml +++ b/conf/airframes/mm/extra/press_t.xml @@ -256,7 +256,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/fixed-wing/drops.xml b/conf/airframes/mm/fixed-wing/drops.xml index 6c72f9d4e0..1309db1306 100644 --- a/conf/airframes/mm/fixed-wing/drops.xml +++ b/conf/airframes/mm/fixed-wing/drops.xml @@ -274,7 +274,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM @@ -293,7 +293,7 @@ sim.ARCHDIR = $(ARCHI) sim.ARCH = sitl 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.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DUSE_INFRARED -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.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN diff --git a/conf/airframes/mm/fixed-wing/funjeteth1.xml b/conf/airframes/mm/fixed-wing/funjeteth1.xml index 118e228abe..a46d745a92 100644 --- a/conf/airframes/mm/fixed-wing/funjeteth1.xml +++ b/conf/airframes/mm/fixed-wing/funjeteth1.xml @@ -233,7 +233,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/fixed-wing/funjeteth2.xml b/conf/airframes/mm/fixed-wing/funjeteth2.xml index e97aa831b0..218122ead5 100644 --- a/conf/airframes/mm/fixed-wing/funjeteth2.xml +++ b/conf/airframes/mm/fixed-wing/funjeteth2.xml @@ -234,7 +234,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/fixed-wing/funjetfmi1.xml b/conf/airframes/mm/fixed-wing/funjetfmi1.xml index 1827598db7..ece279d275 100644 --- a/conf/airframes/mm/fixed-wing/funjetfmi1.xml +++ b/conf/airframes/mm/fixed-wing/funjetfmi1.xml @@ -236,7 +236,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/fixed-wing/funjetfmi2.xml b/conf/airframes/mm/fixed-wing/funjetfmi2.xml index c366722814..1fdd869eb9 100644 --- a/conf/airframes/mm/fixed-wing/funjetfmi2.xml +++ b/conf/airframes/mm/fixed-wing/funjetfmi2.xml @@ -235,7 +235,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/fixed-wing/funjetfmi3.xml b/conf/airframes/mm/fixed-wing/funjetfmi3.xml index dfc68c5333..b29d947dab 100644 --- a/conf/airframes/mm/fixed-wing/funjetfmi3.xml +++ b/conf/airframes/mm/fixed-wing/funjetfmi3.xml @@ -235,7 +235,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/fixed-wing/funjetgfi1.xml b/conf/airframes/mm/fixed-wing/funjetgfi1.xml index 7e953393eb..d351c6737a 100644 --- a/conf/airframes/mm/fixed-wing/funjetgfi1.xml +++ b/conf/airframes/mm/fixed-wing/funjetgfi1.xml @@ -213,7 +213,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/fixed-wing/funjetgfi3.xml b/conf/airframes/mm/fixed-wing/funjetgfi3.xml index f3beff1ac5..104c11a0ed 100644 --- a/conf/airframes/mm/fixed-wing/funjetgfi3.xml +++ b/conf/airframes/mm/fixed-wing/funjetgfi3.xml @@ -224,7 +224,7 @@ ap.CFLAGS += -DGPS -DGPS_LED=2 -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B ap.srcs += gps_ubx.c gps.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED # -DALT_KALMAN ap.srcs += infrared.c estimator.c diff --git a/conf/airframes/mm/fixed-wing/funjetgfi4.xml b/conf/airframes/mm/fixed-wing/funjetgfi4.xml index 852981c359..ed97dafa0a 100644 --- a/conf/airframes/mm/fixed-wing/funjetgfi4.xml +++ b/conf/airframes/mm/fixed-wing/funjetgfi4.xml @@ -214,7 +214,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/fixed-wing/funjetgfi5.xml b/conf/airframes/mm/fixed-wing/funjetgfi5.xml index 4a32f306fc..774741deff 100644 --- a/conf/airframes/mm/fixed-wing/funjetgfi5.xml +++ b/conf/airframes/mm/fixed-wing/funjetgfi5.xml @@ -215,7 +215,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/fixed-wing/funjetgfi6.xml b/conf/airframes/mm/fixed-wing/funjetgfi6.xml index 949af4eb4a..670970cfd1 100644 --- a/conf/airframes/mm/fixed-wing/funjetgfi6.xml +++ b/conf/airframes/mm/fixed-wing/funjetgfi6.xml @@ -215,7 +215,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/fixed-wing/funjetgfi7.xml b/conf/airframes/mm/fixed-wing/funjetgfi7.xml index f340021da8..5f35a705bc 100644 --- a/conf/airframes/mm/fixed-wing/funjetgfi7.xml +++ b/conf/airframes/mm/fixed-wing/funjetgfi7.xml @@ -215,7 +215,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/fixed-wing/funjetgfi8.xml b/conf/airframes/mm/fixed-wing/funjetgfi8.xml index 038601ddd6..ec947f5540 100644 --- a/conf/airframes/mm/fixed-wing/funjetgfi8.xml +++ b/conf/airframes/mm/fixed-wing/funjetgfi8.xml @@ -215,7 +215,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/fixed-wing/funjetgfi9.xml b/conf/airframes/mm/fixed-wing/funjetgfi9.xml index 19ff4525c9..68d1ca025d 100644 --- a/conf/airframes/mm/fixed-wing/funjetgfi9.xml +++ b/conf/airframes/mm/fixed-wing/funjetgfi9.xml @@ -215,7 +215,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/fixed-wing/funjetmm2.xml b/conf/airframes/mm/fixed-wing/funjetmm2.xml index 835eaaaef4..05e3e68914 100644 --- a/conf/airframes/mm/fixed-wing/funjetmm2.xml +++ b/conf/airframes/mm/fixed-wing/funjetmm2.xml @@ -242,7 +242,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/fixed-wing/merlin.xml b/conf/airframes/mm/fixed-wing/merlin.xml index 9a9c578386..400d9cef46 100644 --- a/conf/airframes/mm/fixed-wing/merlin.xml +++ b/conf/airframes/mm/fixed-wing/merlin.xml @@ -210,7 +210,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 # -DGPS_USE_LATLONG ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM @@ -224,7 +224,7 @@ ap.srcs += snav.c # Config for SITL simulation # include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile sim.ARCHDIR = $(ARCH) -sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO +sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DUSE_INFRARED -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 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN diff --git a/conf/airframes/mm/fixed-wing/miniwing.xml b/conf/airframes/mm/fixed-wing/miniwing.xml index ce71ac7576..197f1d06d1 100644 --- a/conf/airframes/mm/fixed-wing/miniwing.xml +++ b/conf/airframes/mm/fixed-wing/miniwing.xml @@ -204,7 +204,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/fixed-wing/slowfast.xml b/conf/airframes/mm/fixed-wing/slowfast.xml index 764f7af860..14d6fccde0 100644 --- a/conf/airframes/mm/fixed-wing/slowfast.xml +++ b/conf/airframes/mm/fixed-wing/slowfast.xml @@ -256,7 +256,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/fixed-wing/slowfast2.xml b/conf/airframes/mm/fixed-wing/slowfast2.xml index ff61ea0c45..5e43576f08 100644 --- a/conf/airframes/mm/fixed-wing/slowfast2.xml +++ b/conf/airframes/mm/fixed-wing/slowfast2.xml @@ -270,7 +270,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/fixed-wing/twinstarmm.xml b/conf/airframes/mm/fixed-wing/twinstarmm.xml index 8141189ffb..ede9e8222a 100644 --- a/conf/airframes/mm/fixed-wing/twinstarmm.xml +++ b/conf/airframes/mm/fixed-wing/twinstarmm.xml @@ -231,7 +231,7 @@ ap.srcs += $(SRC_ARCH)/adc_hw.c ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM @@ -247,7 +247,7 @@ ap.srcs += snav.c # Config for SITL simulation # include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile sim.ARCHDIR = $(ARCHI) -sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO +sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DUSE_INFRARED -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.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN diff --git a/conf/airframes/mm/hangar/black_one.xml b/conf/airframes/mm/hangar/black_one.xml index b2a329b8f0..4e9baeb2d8 100644 --- a/conf/airframes/mm/hangar/black_one.xml +++ b/conf/airframes/mm/hangar/black_one.xml @@ -243,7 +243,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200 -DGPS_ ap.srcs += gps_ubx.c gps.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DIR_360 +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DIR_360 ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DH_CTL_RATE_LOOP -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/hangar/glass_one1.xml b/conf/airframes/mm/hangar/glass_one1.xml index 94e2163843..19e5e17a40 100644 --- a/conf/airframes/mm/hangar/glass_one1.xml +++ b/conf/airframes/mm/hangar/glass_one1.xml @@ -234,7 +234,7 @@ ap.CFLAGS += -DGPS_BAUD=38400 ap.srcs += gps_ubx.c gps.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c # -DALT_KALMAN diff --git a/conf/airframes/mm/hangar/glass_one2.xml b/conf/airframes/mm/hangar/glass_one2.xml index 23e636a6fe..115bfdc359 100644 --- a/conf/airframes/mm/hangar/glass_one2.xml +++ b/conf/airframes/mm/hangar/glass_one2.xml @@ -208,7 +208,7 @@ ap.CFLAGS += -DGPS_BAUD=38400 ap.srcs += gps_ubx.c gps.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c # -DALT_KALMAN diff --git a/conf/airframes/mm/hangar/glass_one3.xml b/conf/airframes/mm/hangar/glass_one3.xml index 19cd019532..bf54c67b3d 100644 --- a/conf/airframes/mm/hangar/glass_one3.xml +++ b/conf/airframes/mm/hangar/glass_one3.xml @@ -235,7 +235,7 @@ ap.CFLAGS += -DGPS_BAUD=38400 ap.srcs += gps_ubx.c gps.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c # -DALT_KALMAN diff --git a/conf/airframes/mm/hangar/lila.xml b/conf/airframes/mm/hangar/lila.xml index 42926a25e9..45079b8772 100644 --- a/conf/airframes/mm/hangar/lila.xml +++ b/conf/airframes/mm/hangar/lila.xml @@ -234,7 +234,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_ # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM @@ -247,7 +247,7 @@ ap.srcs += snav.c # Config for SITL simulation sim.ARCHDIR = $(ARCHI) -sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO +sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DUSE_INFRARED -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.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN diff --git a/conf/airframes/mm/hangar/mac06a.xml b/conf/airframes/mm/hangar/mac06a.xml index e18fec54dd..fccf9d384c 100644 --- a/conf/airframes/mm/hangar/mac06a.xml +++ b/conf/airframes/mm/hangar/mac06a.xml @@ -228,7 +228,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200 ap.srcs += gps_ubx.c gps.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DIR_360 +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DIR_360 ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DH_CTL_RATE_LOOP -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/mm/hangar/red_one.xml b/conf/airframes/mm/hangar/red_one.xml index 3e3542f543..50623ece4e 100644 --- a/conf/airframes/mm/hangar/red_one.xml +++ b/conf/airframes/mm/hangar/red_one.xml @@ -255,7 +255,7 @@ ap.CFLAGS += -DGPS_BAUD=38400 ap.srcs += gps_ubx.c gps.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c # -DALT_KALMAN diff --git a/conf/airframes/obsolete/easystar2.xml b/conf/airframes/obsolete/easystar2.xml index eb4332ab87..00ddcb9b04 100644 --- a/conf/airframes/obsolete/easystar2.xml +++ b/conf/airframes/obsolete/easystar2.xml @@ -206,7 +206,7 @@ ap.srcs += $(SRC_ARCH)/adc_hw.c ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN ap.srcs += infrared.c estimator.c # Control loops diff --git a/conf/airframes/obsolete/kalscott_easystar.xml b/conf/airframes/obsolete/kalscott_easystar.xml index a528d3a20c..3595d7b8b2 100644 --- a/conf/airframes/obsolete/kalscott_easystar.xml +++ b/conf/airframes/obsolete/kalscott_easystar.xml @@ -186,7 +186,7 @@ ap.srcs += $(SRC_ARCH)/adc_hw.c ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN ap.srcs += infrared.c estimator.c # Control loops diff --git a/conf/airframes/obsolete/malolo_sim.xml b/conf/airframes/obsolete/malolo_sim.xml index 3398a09c8c..972a70e07f 100644 --- a/conf/airframes/obsolete/malolo_sim.xml +++ b/conf/airframes/obsolete/malolo_sim.xml @@ -230,7 +230,7 @@ sim.LDFLAGS += `pkg-config glib-2.0 --libs` -lm -lpcre -lglibivy -L/home/cocoleo sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV +sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DUSE_INFRARED -DNAV sim.srcs = $(SRC_ARCH)/jsbsim_hw.c $(SRC_ARCH)/jsbsim_gps.c $(SRC_ARCH)/jsbsim_ir.c $(SRC_ARCH)/ivy_transport.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 diff --git a/conf/airframes/obsolete/microjet5.xml b/conf/airframes/obsolete/microjet5.xml index e7d2167aa2..efc1393c6e 100644 --- a/conf/airframes/obsolete/microjet5.xml +++ b/conf/airframes/obsolete/microjet5.xml @@ -198,7 +198,7 @@ ap.srcs += $(SRC_ARCH)/adc_hw.c ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/obsolete/microjet5_tp_auto.xml b/conf/airframes/obsolete/microjet5_tp_auto.xml index 0e876087fb..9883794cee 100644 --- a/conf/airframes/obsolete/microjet5_tp_auto.xml +++ b/conf/airframes/obsolete/microjet5_tp_auto.xml @@ -209,7 +209,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200 ap.srcs += gps_ubx.c gps.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV diff --git a/conf/airframes/obsolete/microjet6.xml b/conf/airframes/obsolete/microjet6.xml index 4611a96748..da005ecec4 100644 --- a/conf/airframes/obsolete/microjet6.xml +++ b/conf/airframes/obsolete/microjet6.xml @@ -231,7 +231,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DWIND_INFO +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DH_CTL_RATE_LOOP -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/obsolete/microjetI.xml b/conf/airframes/obsolete/microjetI.xml index af6e82931b..1055ee8bf0 100644 --- a/conf/airframes/obsolete/microjetI.xml +++ b/conf/airframes/obsolete/microjetI.xml @@ -218,7 +218,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN diff --git a/conf/airframes/obsolete/microjetII.xml b/conf/airframes/obsolete/microjetII.xml index 78863488e0..f818d79c64 100644 --- a/conf/airframes/obsolete/microjetII.xml +++ b/conf/airframes/obsolete/microjetII.xml @@ -217,7 +217,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN diff --git a/conf/airframes/obsolete/microjetIII.xml b/conf/airframes/obsolete/microjetIII.xml index 6abce9569b..a46a50bd4f 100644 --- a/conf/airframes/obsolete/microjetIII.xml +++ b/conf/airframes/obsolete/microjetIII.xml @@ -207,7 +207,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DWIND_INFO diff --git a/conf/airframes/obsolete/minimag_fs.xml b/conf/airframes/obsolete/minimag_fs.xml index af6e79790b..d883a21dcc 100644 --- a/conf/airframes/obsolete/minimag_fs.xml +++ b/conf/airframes/obsolete/minimag_fs.xml @@ -208,7 +208,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN diff --git a/conf/airframes/obsolete/slayer1.xml b/conf/airframes/obsolete/slayer1.xml index 0bc85ef25a..c52021b899 100644 --- a/conf/airframes/obsolete/slayer1.xml +++ b/conf/airframes/obsolete/slayer1.xml @@ -220,7 +220,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200 ap.srcs += gps_ubx.c gps.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DH_CTL_RATE_LOOP -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/obsolete/slayer3.xml b/conf/airframes/obsolete/slayer3.xml index 97b3a7090a..d9ef913983 100644 --- a/conf/airframes/obsolete/slayer3.xml +++ b/conf/airframes/obsolete/slayer3.xml @@ -222,7 +222,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200 ap.srcs += gps_ubx.c gps.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DIR_360 +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DIR_360 ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DH_CTL_RATE_LOOP -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/obsolete/slayerJH.xml b/conf/airframes/obsolete/slayerJH.xml index 9d212d1752..19f9c83d45 100644 --- a/conf/airframes/obsolete/slayerJH.xml +++ b/conf/airframes/obsolete/slayerJH.xml @@ -205,7 +205,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B57600 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/obsolete/slicer1.xml b/conf/airframes/obsolete/slicer1.xml index e191489c74..3cc102efc6 100644 --- a/conf/airframes/obsolete/slicer1.xml +++ b/conf/airframes/obsolete/slicer1.xml @@ -216,7 +216,7 @@ ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DWIND_INFO diff --git a/conf/airframes/obsolete/slicer2.xml b/conf/airframes/obsolete/slicer2.xml index bdf835c724..68088a2868 100644 --- a/conf/airframes/obsolete/slicer2.xml +++ b/conf/airframes/obsolete/slicer2.xml @@ -198,7 +198,7 @@ ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DWIND_INFO diff --git a/conf/airframes/obsolete/spirit.xml b/conf/airframes/obsolete/spirit.xml index 7895604b5f..231e4102aa 100644 --- a/conf/airframes/obsolete/spirit.xml +++ b/conf/airframes/obsolete/spirit.xml @@ -212,7 +212,7 @@ ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c ap.CFLAGS += -DGYRO -DADXRS150 -DPID_RATE_LOOP diff --git a/conf/airframes/obsolete/spirit_proto.xml b/conf/airframes/obsolete/spirit_proto.xml index cc28f09604..dcdb91f480 100644 --- a/conf/airframes/obsolete/spirit_proto.xml +++ b/conf/airframes/obsolete/spirit_proto.xml @@ -200,7 +200,7 @@ ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DWIND_INFO diff --git a/conf/airframes/obsolete/storm1.xml b/conf/airframes/obsolete/storm1.xml index ba0df05a65..b4e2e3ceeb 100644 --- a/conf/airframes/obsolete/storm1.xml +++ b/conf/airframes/obsolete/storm1.xml @@ -264,7 +264,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DIR_360 +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DIR_360 ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/obsolete/tiny2.xml b/conf/airframes/obsolete/tiny2.xml index 2afaff58bd..b8c06ad91d 100644 --- a/conf/airframes/obsolete/tiny2.xml +++ b/conf/airframes/obsolete/tiny2.xml @@ -227,7 +227,7 @@ ap.CFLAGS += -DGPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DH_CTL_RATE_LOOP -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/obsolete/twinjet1.xml b/conf/airframes/obsolete/twinjet1.xml index 20e828db3f..fd2e90fd3c 100644 --- a/conf/airframes/obsolete/twinjet1.xml +++ b/conf/airframes/obsolete/twinjet1.xml @@ -215,7 +215,7 @@ ap.CFLAGS += -DUSE_AD1 -DUSE_AD1_2 -DUSE_AD1_3 ap.srcs += $(SRC_ARCH)/adc_hw.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c ap.CFLAGS += -DGYRO -DADXRS150 diff --git a/conf/airframes/obsolete/twinstar6.xml b/conf/airframes/obsolete/twinstar6.xml index fd1aae9dc9..4e85159bda 100644 --- a/conf/airframes/obsolete/twinstar6.xml +++ b/conf/airframes/obsolete/twinstar6.xml @@ -217,7 +217,7 @@ ap.srcs += gps_ubx.c gps.c latlong.c ap.CFLAGS += -DADC -DUSE_AD1 -DUSE_AD1_5 -DUSE_AD1_6 -DUSE_AD1_7 ap.srcs += $(SRC_ARCH)/adc_hw.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/obsolete/tyto1.xml b/conf/airframes/obsolete/tyto1.xml index 5f54570750..ea0bf7935e 100644 --- a/conf/airframes/obsolete/tyto1.xml +++ b/conf/airframes/obsolete/tyto1.xml @@ -233,7 +233,7 @@ ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400 # -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/obsolete/xxx1.xml b/conf/airframes/obsolete/xxx1.xml index 80075e1d6e..fe9fe7c260 100644 --- a/conf/airframes/obsolete/xxx1.xml +++ b/conf/airframes/obsolete/xxx1.xml @@ -237,7 +237,7 @@ ap.srcs += $(SRC_ARCH)/adc_hw.c ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400 -DGPS_LED=2 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED -DALT_KALMAN -DIR_360 +ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DIR_360 ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DH_CTL_RATE_LOOP -DAGR_CLIMB -DLOITER_TRIM diff --git a/conf/airframes/tiny_hitl.xml b/conf/airframes/tiny_hitl.xml index c2fd383b88..201fa94f87 100644 --- a/conf/airframes/tiny_hitl.xml +++ b/conf/airframes/tiny_hitl.xml @@ -192,7 +192,7 @@ ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400 ap.srcs += gps_ubx.c gps.c latlong.c -ap.CFLAGS += -DINFRARED +ap.CFLAGS += -DUSE_INFRARED ap.srcs += infrared.c estimator.c ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DWIND_INFO diff --git a/conf/autopilot/sitl.makefile b/conf/autopilot/sitl.makefile index 47aeccc03b..59f6c3728d 100644 --- a/conf/autopilot/sitl.makefile +++ b/conf/autopilot/sitl.makefile @@ -1,5 +1,5 @@ sim.ARCHDIR = $(ARCH) -sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO +sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DUSE_INFRARED -DNAV -DLED -DWIND_INFO sim.srcs += latlong.c\ radio_control.c\ downlink.c\ diff --git a/conf/autopilot/sitl_jsbsim.makefile b/conf/autopilot/sitl_jsbsim.makefile index 5795fc647b..392cf7e8c6 100644 --- a/conf/autopilot/sitl_jsbsim.makefile +++ b/conf/autopilot/sitl_jsbsim.makefile @@ -24,7 +24,7 @@ else jsbsim.LDFLAGS += -L$(JSBSIM_LIB) -lJSBSim endif -jsbsim.CFLAGS += -DSITL -DAP -DFBW -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED -DWIND_INFO -Ifirmwares/fixedwing +jsbsim.CFLAGS += -DSITL -DAP -DFBW -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DUSE_INFRARED -DNAV -DLED -DWIND_INFO -Ifirmwares/fixedwing jsbsim.srcs = $(SRC_ARCH)/jsbsim_hw.c $(SRC_ARCH)/jsbsim_gps.c $(SRC_ARCH)/jsbsim_ir.c $(SRC_ARCH)/jsbsim_transport.c $(SRC_ARCH)/ivy_transport.c jsbsim.srcs += latlong.c downlink.c commands.c gps.c inter_mcu.c infrared.c \ $(SRC_FIXEDWING)/stabilization/stabilization_attitude.c \ diff --git a/conf/autopilot/sitl_link_pprz.makefile b/conf/autopilot/sitl_link_pprz.makefile index 03b5d91b09..1d4f06b5bc 100644 --- a/conf/autopilot/sitl_link_pprz.makefile +++ b/conf/autopilot/sitl_link_pprz.makefile @@ -1,3 +1,3 @@ sim.ARCHDIR = $(ARCH) -sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DINFRARED -DRADIO_CONTROL_SETTINGS -DSIM_UART -DDOWNLINK_AP_DEVICE=SimUart -DDOWNLINK_FBW_DEVICE=SimUart -DDATALINK=PPRZ +sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DUSE_INFRARED -DRADIO_CONTROL_SETTINGS -DSIM_UART -DDOWNLINK_AP_DEVICE=SimUart -DDOWNLINK_FBW_DEVICE=SimUart -DDATALINK=PPRZ sim.srcs = radio_control.c downlink.c pprz_transport.c commands.c gps.c inter_mcu.c infrared.c $(SRC_FIRMWARE)/stabilization/stabilization_attitude.c $(SRC_FIRMWARE)/guidance/guidance_v.c nav.c estimator.c cam.c sys_time.c $(SRC_FIRMWARE)/main_fbw.c $(SRC_FIRMWARE)/main_ap.c rc_settings.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/sim_uart.c datalink.c diff --git a/conf/autopilot/sitl_link_xbee.makefile b/conf/autopilot/sitl_link_xbee.makefile index aa55ba1224..73fcac0657 100644 --- a/conf/autopilot/sitl_link_xbee.makefile +++ b/conf/autopilot/sitl_link_xbee.makefile @@ -1,3 +1,3 @@ sim.ARCHDIR = $(ARCH) -sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=XBeeTransport -DINFRARED -DRADIO_CONTROL_SETTINGS -DSIM_UART -DSIM_XBEE -DXBEE_UART=SimUart +sim.CFLAGS += -DSITL -DAP -DFBW -DRADIO_CONTROL -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=XBeeTransport -DUSE_INFRARED -DRADIO_CONTROL_SETTINGS -DSIM_UART -DSIM_XBEE -DXBEE_UART=SimUart sim.srcs = radio_control.c downlink.c xbee.c commands.c gps.c inter_mcu.c infrared.c $(SRC_FIXEDWING)/stabilization/stabilization_attitude.c $(SRC_FIXEDWING)/guidance/guidance_v.c nav.c estimator.c cam.c sys_time.c $(SRC_FIRMWARE)/main_fbw.c $(SRC_FIRMWARE)/main_ap.c rc_settings.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/sim_uart.c diff --git a/conf/autopilot/subsystems/fixedwing/attitude_infrared.makefile b/conf/autopilot/subsystems/fixedwing/attitude_infrared.makefile index e1b366642a..cf762bf1ff 100644 --- a/conf/autopilot/subsystems/fixedwing/attitude_infrared.makefile +++ b/conf/autopilot/subsystems/fixedwing/attitude_infrared.makefile @@ -31,7 +31,7 @@ endif ap.CFLAGS += -DADC_CHANNEL_IR_NB_SAMPLES=$(ADC_IR_NB_SAMPLES) -$(TARGET).CFLAGS += -DINFRARED +$(TARGET).CFLAGS += -DUSE_INFRARED $(TARGET).srcs += $(SRC_FIXEDWING)/infrared.c sim.srcs += $(SRC_ARCH)/sim_ir.c diff --git a/conf/autopilot/twin_mcu.makefile b/conf/autopilot/twin_mcu.makefile index 3fb0f7d7d7..e96724e994 100644 --- a/conf/autopilot/twin_mcu.makefile +++ b/conf/autopilot/twin_mcu.makefile @@ -1,5 +1,5 @@ ap.srcs += $(SRC_FIRMWARE)/main_ap.c sys_time.c $(SRC_FIRMWARE)/main.c inter_mcu.c link_mcu.c gps_ubx.c gps.c infrared.c fw_h_ctl.c fw_v_ctl.c nav.c estimator.c cam.c spi.c rc_settings.c latlong.c nav_survey_rectangle.c -ap.CFLAGS += -DMCU_SPI_LINK -DGPS -DUBX -DINFRARED -DRADIO_CONTROL -DINTER_MCU -DSPI_MASTER -DUSE_SPI -DNAV -DRADIO_CONTROL_SETTINGS +ap.CFLAGS += -DMCU_SPI_LINK -DGPS -DUBX -DUSE_INFRARED -DRADIO_CONTROL -DINTER_MCU -DSPI_MASTER -DUSE_SPI -DNAV -DRADIO_CONTROL_SETTINGS fbw.srcs += sys_time.c $(SRC_FIRMWARE)/main_fbw.c $(SRC_FIRMWARE)/main.c commands.c radio_control.c pprz_transport.c downlink.c inter_mcu.c spi.c link_mcu.c fbw.CFLAGS += -DRADIO_CONTROL -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DINTER_MCU -DMCU_SPI_LINK -DUART0_BAUD=B38400 -DSPI_SLAVE -DUSE_SPI