mirror of
https://github.com/paparazzi/paparazzi.git
synced 2026-06-05 15:30:08 +08:00
renamed BOOZ_START_DELAY to ACTUATORS_START_DELAY and updated airframe files accordingly
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
<target name="ap" board="booz_1.0">
|
||||
<define name="FAILSAFE_GROUND_DETECT"/>
|
||||
<define name="USE_GPS_ACC4R"/>
|
||||
<define name="BOOZ_START_DELAY" value="3"/>
|
||||
<define name="ACTUATORS_START_DELAY" value="3"/>
|
||||
</target>
|
||||
<target name="sim" board="pc">
|
||||
<subsystem name="fdm" type="nps"/>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<target name="ap" board="booz_1.0">
|
||||
<define name="FAILSAFE_GROUND_DETECT"/>
|
||||
<define name="USE_GPS_ACC4R"/>
|
||||
<define name="BOOZ_START_DELAY" value="3"/>
|
||||
<define name="ACTUATORS_START_DELAY" value="3"/>
|
||||
</target>
|
||||
<target name="sim" board="pc">
|
||||
<subsystem name="fdm" type="nps"/>
|
||||
|
||||
@@ -231,8 +231,8 @@ include $(CFG_BOOZ)/subsystems/booz2_ahrs_cmpl.makefile
|
||||
#include $(CFG_BOOZ)/subsystems/booz2_ins_hff.makefile
|
||||
#ap.CFLAGS += -DR_POS=0.1
|
||||
|
||||
ap.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DBOOZ_START_DELAY=3
|
||||
sim.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DBOOZ_START_DELAY=3
|
||||
ap.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DACTUATORS_START_DELAY=3
|
||||
sim.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DACTUATORS_START_DELAY=3
|
||||
|
||||
ap.CFLAGS += -DUSE_MODULES
|
||||
|
||||
|
||||
@@ -147,7 +147,7 @@ main_stm32.srcs += firmwares/rotorcraft/actuators/actuators_asctec.c
|
||||
#\
|
||||
# $(SRC_BOOZ_ARCH)/actuators/actuators_asctec_arch.c
|
||||
main_stm32.CFLAGS += -DACTUATORS_ASCTEC_DEVICE=i2c1
|
||||
# -DBOOZ_START_DELAY=3 -DUSE_TIM2_IRQ
|
||||
# -DACTUATORS_START_DELAY=3 -DUSE_TIM2_IRQ
|
||||
main_stm32.CFLAGS += -DUSE_I2C1
|
||||
main_stm32.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
|
||||
|
||||
|
||||
@@ -170,7 +170,7 @@
|
||||
|
||||
<firmware name="rotorcraft">
|
||||
<target name="ap" board="lisa_l_1.0">
|
||||
<!-- <define name="BOOZ_START_DELAY" value="1"/> -->
|
||||
<!-- <define name="ACTUATORS_START_DELAY" value="1"/> -->
|
||||
<subsystem name="radio_control" type="spektrum"/>
|
||||
<subsystem name="actuators" type="mkk"/>
|
||||
</target>
|
||||
|
||||
@@ -274,7 +274,7 @@ second attempt
|
||||
<define name="RADIO_KILL_SWITCH" value="4"/>
|
||||
<define name="MODEM_BAUD" value = "B57600"/>
|
||||
<define name="GPS_LAG" value = "0.8"/>
|
||||
<define name="BOOZ_START_DELAY" value = "3"/>
|
||||
<define name="ACTUATORS_START_DELAY" value = "3"/>
|
||||
<!-- <define name="KILL_MOTORS"/> -->
|
||||
<define name="FAILSAFE_GROUND_DETECT"/>
|
||||
<define name="USE_GPS_ACC4R" />
|
||||
@@ -347,7 +347,7 @@ include $(CFG_BOOZ)/subsystems/ins_hff.makefile
|
||||
ap.CFLAGS += -DGPS_LAG=0.8 -DUSE_GPS_ACC4R
|
||||
ap.CFLAGS += -DGPS_USE_LATLONG
|
||||
|
||||
ap.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DBOOZ_START_DELAY=3
|
||||
ap.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DACTUATORS_START_DELAY=3
|
||||
|
||||
</makefile>
|
||||
-->
|
||||
|
||||
@@ -232,7 +232,7 @@
|
||||
<configure name="FLASH_MODE" value="IAP"/> <!-- default for the board but putting it here as example-->
|
||||
<define name="RADIO_KILL_SWITCH" value="RADIO_CONTROL_SWITCH1"/>
|
||||
<define name="MODEM_BAUD" value = "B57600"/>
|
||||
<define name="BOOZ_START_DELAY" value = "3"/>
|
||||
<define name="ACTUATORS_START_DELAY" value = "3"/>
|
||||
<define name="GPS_LAG" value = "0.8"/>
|
||||
<!-- <define name="KILL_MOTORS"/> -->
|
||||
<define name="FAILSAFE_GROUND_DETECT"/>
|
||||
@@ -296,7 +296,7 @@ ap.CFLAGS += -DGPS_LAG=0.8
|
||||
#-DUSE_GPS_ACC4R
|
||||
ap.CFLAGS += -DGPS_USE_LATLONG
|
||||
|
||||
ap.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DBOOZ_START_DELAY=3
|
||||
ap.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DACTUATORS_START_DELAY=3
|
||||
|
||||
</makefile>
|
||||
-->
|
||||
|
||||
@@ -250,7 +250,7 @@ ap.CFLAGS += -DGPS_LAG=0.8
|
||||
#-DUSE_GPS_ACC4R
|
||||
ap.CFLAGS += -DGPS_USE_LATLONG
|
||||
|
||||
ap.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DBOOZ_START_DELAY=3
|
||||
ap.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DACTUATORS_START_DELAY=3
|
||||
|
||||
|
||||
</makefile>
|
||||
|
||||
@@ -306,7 +306,7 @@ include $(CFG_BOOZ)/subsystems/ins_hff.makefile
|
||||
ap.CFLAGS += -DGPS_LAG=0.8 -DUSE_GPS_ACC4R
|
||||
ap.CFLAGS += -DGPS_USE_LATLONG
|
||||
|
||||
ap.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DBOOZ_START_DELAY=3
|
||||
ap.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DACTUATORS_START_DELAY=3
|
||||
|
||||
|
||||
</makefile>
|
||||
|
||||
@@ -176,7 +176,7 @@
|
||||
|
||||
<firmware name="rotorcraft">
|
||||
<target name="ap" board="lisa_m_1.0">
|
||||
<!-- <define name="BOOZ_START_DELAY" value="1"/> -->
|
||||
<!-- <define name="ACTUATORS_START_DELAY" value="1"/> -->
|
||||
<subsystem name="radio_control" type="spektrum"/>
|
||||
<subsystem name="actuators" type="pwm_supervision"/>
|
||||
<subsystem name="telemetry" type="transparent"/>
|
||||
|
||||
@@ -184,7 +184,7 @@
|
||||
|
||||
<firmware name="rotorcraft">
|
||||
<target name="ap" board="lisa_l_1.1">
|
||||
<!-- <define name="BOOZ_START_DELAY" value="1"/> -->
|
||||
<!-- <define name="ACTUATORS_START_DELAY" value="1"/> -->
|
||||
<subsystem name="radio_control" type="spektrum"/>
|
||||
<subsystem name="actuators" type="asctec_v2"/>
|
||||
<subsystem name="telemetry" type="transparent"/>
|
||||
|
||||
@@ -186,7 +186,7 @@
|
||||
|
||||
<firmware name="rotorcraft">
|
||||
<target name="ap" board="lisa_l_1.1">
|
||||
<!-- <define name="BOOZ_START_DELAY" value="1"/> -->
|
||||
<!-- <define name="ACTUATORS_START_DELAY" value="1"/> -->
|
||||
<subsystem name="radio_control" type="spektrum"/>
|
||||
<subsystem name="actuators" type="asctec_v2"/>
|
||||
<subsystem name="telemetry" type="transparent"/>
|
||||
|
||||
@@ -206,7 +206,7 @@
|
||||
|
||||
<firmware name="rotorcraft">
|
||||
<target name="ap" board="lisa_m_1.0">
|
||||
<!-- <define name="BOOZ_START_DELAY" value="1"/> -->
|
||||
<!-- <define name="ACTUATORS_START_DELAY" value="1"/> -->
|
||||
<subsystem name="radio_control" type="spektrum"/>
|
||||
<subsystem name="actuators" type="pwm_supervision"/>
|
||||
<subsystem name="telemetry" type="transparent"/>
|
||||
|
||||
@@ -181,7 +181,7 @@
|
||||
|
||||
<firmware name="rotorcraft">
|
||||
<target name="ap" board="lisa_l_1.1">
|
||||
<!-- <define name="BOOZ_START_DELAY" value="1"/> -->
|
||||
<!-- <define name="ACTUATORS_START_DELAY" value="1"/> -->
|
||||
<subsystem name="radio_control" type="spektrum"/>
|
||||
<subsystem name="actuators" type="pwm_supervision"/>
|
||||
<subsystem name="telemetry" type="transparent"/>
|
||||
|
||||
@@ -184,7 +184,7 @@
|
||||
|
||||
<firmware name="rotorcraft">
|
||||
<target name="ap" board="lisa_l_1.1">
|
||||
<!-- <define name="BOOZ_START_DELAY" value="1"/> -->
|
||||
<!-- <define name="ACTUATORS_START_DELAY" value="1"/> -->
|
||||
<subsystem name="radio_control" type="spektrum"/>
|
||||
<subsystem name="actuators" type="pwm_supervision"/>
|
||||
<subsystem name="telemetry" type="transparent"/>
|
||||
|
||||
@@ -187,7 +187,7 @@
|
||||
|
||||
<firmware name="rotorcraft">
|
||||
<target name="ap" board="lisa_l_1.0">
|
||||
<!-- <define name="BOOZ_START_DELAY" value="1"/> -->
|
||||
<!-- <define name="ACTUATORS_START_DELAY" value="1"/> -->
|
||||
<subsystem name="radio_control" type="ppm"/>
|
||||
<subsystem name="actuators" type="mkk"/>
|
||||
</target>
|
||||
|
||||
@@ -248,7 +248,7 @@ include $(CFG_BOOZ)/subsystems/ins_hff.makefile
|
||||
ap.CFLAGS += -DGPS_LAG=0.8 -DUSE_GPS_ACC4R
|
||||
ap.CFLAGS += -DGPS_USE_LATLONG
|
||||
|
||||
ap.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DBOOZ_START_DELAY=3
|
||||
ap.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DACTUATORS_START_DELAY=3
|
||||
|
||||
|
||||
</makefile>
|
||||
|
||||
@@ -248,7 +248,7 @@ include $(CFG_BOOZ)/subsystems/ins_hff.makefile
|
||||
ap.CFLAGS += -DGPS_LAG=0.8 -DUSE_GPS_ACC4R
|
||||
ap.CFLAGS += -DGPS_USE_LATLONG
|
||||
|
||||
ap.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DBOOZ_START_DELAY=3
|
||||
ap.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DACTUATORS_START_DELAY=3
|
||||
|
||||
|
||||
</makefile>
|
||||
|
||||
@@ -249,7 +249,7 @@ include $(CFG_BOOZ)/subsystems/ins_hff.makefile
|
||||
ap.CFLAGS += -DGPS_LAG=0.8 -DUSE_GPS_ACC4R
|
||||
ap.CFLAGS += -DGPS_USE_LATLONG
|
||||
|
||||
ap.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DBOOZ_START_DELAY=3
|
||||
ap.CFLAGS += -DUSE_ADAPT_HOVER -DUSE_INS_NAV_INIT -DACTUATORS_START_DELAY=3
|
||||
|
||||
|
||||
</makefile>
|
||||
|
||||
Reference in New Issue
Block a user