[tests] add a compilation test node to modules (#2653)

When adding a test node to a makefile section, with required compilation
flags, include and other options, all the files (not arch dependent
files) can be compiled with a TAP compatible program, included in the
standard tests of the CI servers.
Not all module's XML files are converted, but a large part of the most
important parts are already covered. More will be added later. The
number of tested airframes (full compilation of all targets) have been
reduced to speed the CI compile time but still covers the relevant
architecture and boards.
The main benefit is that the overall coverage is already better than
before as previous test aircraft were compiling more or less the same
part of the airborne code, while this new mechanism is more efficient to
test modules not included in any config.
This commit is contained in:
Gautier Hattenberger
2021-02-08 17:24:19 +01:00
committed by GitHub
parent c522927a69
commit 494e3f3ad9
205 changed files with 2687 additions and 430 deletions
+3
View File
@@ -52,6 +52,9 @@ paparazzi.sublime-workspace
# Vagrant VM files
/.vagrant
# Rust
Cargo.lock
/var
/dox
+1 -1
View File
@@ -9,7 +9,7 @@ before_install:
- sudo add-apt-repository ppa:team-gcc-arm-embedded/ppa -y
- sudo apt-get update -q
install:
- sudo apt-get install -y --allow-unauthenticated paparazzi-dev paparazzi-jsbsim gcc-arm-embedded gcc-arm-linux-gnueabi g++-arm-linux-gnueabi libipc-run-perl rustc cargo libgazebo9-dev libgps-dev
- sudo apt-get install -y --allow-unauthenticated paparazzi-dev paparazzi-jsbsim gcc-arm-embedded gcc-arm-linux-gnueabi g++-arm-linux-gnueabi libipc-run-perl rustc cargo libgazebo9-dev libgps-dev python3-lxml
script:
- arm-none-eabi-gcc --version
- if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then if [ "${TRAVIS_EVENT_TYPE}" == "cron" ]; then make test_all_confs; else make test; fi; fi
+5 -1
View File
@@ -302,7 +302,7 @@ ab_clean:
#
# Tests
#
test: test_math test_examples
test: test_math test_examples test_modules
# subset of airframes for coverity test to pass the limited build time on travis
test_coverity: all
@@ -324,6 +324,10 @@ test_tudelft: all
test_examples: all
CONF_XML=conf/conf_tests.xml prove tests/aircrafts/
# test compilation of modules
test_modules: all
prove -v tests/modules/test_modules.py
test_all_confs: all opencv_bebop
$(Q)$(eval $CONFS:=$(shell ./find_confs.py))
@echo "************\nFound $(words $($CONFS)) config files: $($CONFS)"
-330
View File
@@ -1,26 +1,4 @@
<conf>
<aircraft
name="DelftaCopter"
ac_id="48"
airframe="airframes/tudelft/outback.xml"
radio="radios/dummy.xml"
telemetry="telemetry/tudelft/outback.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/heli_throttle_curve.xml modules/gps_ubx_ucenter.xml modules/logger_sd_spi_direct.xml modules/temp_adc.xml modules/air_data.xml modules/geo_mag.xml modules/opa_controller.xml modules/guidance_indi.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_rate.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="#ffffdffac31f"
/>
<aircraft
name="Bixler_Mission"
ac_id="46"
airframe="airframes/examples/bixler_lisa_m_2.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing_imu.xml"
flight_plan="flight_plans/mission_fw.xml"
settings="settings/fixedwing_basic.xml settings/nps.xml"
settings_modules="modules/nav_basic_fw.xml modules/gps.xml modules/ahrs_float_dcm.xml modules/imu_common.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml"
gui_color="#8fe1fffff553"
/>
<aircraft
name="DualBoard_AP_FBW"
ac_id="3"
@@ -32,127 +10,6 @@
settings_modules="modules/ahrs_float_dcm.xml modules/imu_common.xml modules/nav_basic_fw.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml modules/gps_ubx_ucenter.xml modules/gps.xml modules/air_data.xml modules/nav_catapult.xml modules/digital_cam.xml modules/light.xml"
gui_color="blue"
/>
<aircraft
name="EasyStar_ETS"
ac_id="4"
airframe="airframes/examples/easystar_ets.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing.xml"
flight_plan="flight_plans/basic.xml"
settings="settings/fixedwing_basic.xml"
settings_modules="modules/gps_ubx_ucenter.xml modules/geo_mag.xml modules/air_data.xml modules/ahrs_int_cmpl_quat.xml modules/nav_basic_fw.xml modules/gps.xml modules/imu_common.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml"
gui_color="red"
/>
<aircraft
name="Hexa_LisaL"
ac_id="5"
airframe="airframes/examples/h_hex.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/dummy.xml"
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/ahrs_int_cmpl_euler.xml modules/stabilization_int_euler.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="white"
/>
<!--aircraft
name="Iris_chibios"
ac_id="45"
airframe="airframes/AGGIEAIR/aggieair_iris_indi.xml"
radio="radios/AGGIEAIR/aggieair_FrSky3dr.xml"
telemetry="telemetry/AGGIEAIR/aggieair_iris.xml"
flight_plan="flight_plans/AGGIEAIR/rotorcraft_opticlow_test.xml"
settings="settings/rotorcraft_basic.xml [settings/test_actuators_pwm.xml]"
settings_modules="modules/air_data.xml modules/lidar_sf11.xml modules/lidar_lite.xml modules/px4flow_i2c.xml modules/ins_extended.xml modules/ahrs_float_mlkf.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/imu_common.xml"
gui_color="#337e387bffff"
/-->
<aircraft
name="JP"
ac_id="6"
airframe="airframes/ENAC/fixed-wing/jp.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing_imu.xml"
flight_plan="flight_plans/basic.xml"
settings="settings/fixedwing_basic.xml"
settings_modules="modules/gps_ubx_ucenter.xml modules/gps.xml modules/nav_basic_fw.xml modules/guidance_full_pid_fw.xml modules/stabilization_adaptive_fw.xml modules/airspeed_adc.xml modules/imu_common.xml modules/ahrs_float_dcm.xml"
gui_color="#ffff7d7d0000"
/>
<aircraft
name="LadyLisaBluetooth"
ac_id="8"
airframe="airframes/examples/ladybird_lisa_s_bluegiga.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/ahrs_int_cmpl_quat.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml modules/gps_ubx_ucenter.xml"
gui_color="white"
/>
<aircraft
name="LisaLv11_Booz2v12_RC"
ac_id="12"
airframe="airframes/testhardware/LisaL_v1.1_b2_v1.2_rc.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/dummy.xml"
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/ahrs_int_cmpl_quat.xml modules/stabilization_int_euler.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="white"
/>
<aircraft
name="Logo600"
ac_id="49"
airframe="airframes/tudelft/logo600.xml"
radio="radios/dummy.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/dummy.xml"
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/air_data.xml modules/geo_mag.xml modules/heli_throttle_curve.xml modules/guidance_indi.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps_ubx_ucenter.xml modules/gps.xml modules/imu_common.xml"
gui_color="#ffffdffac31f"
/>
<aircraft
name="MentorEnergy"
ac_id="13"
airframe="airframes/examples/MentorEnergy.xml"
radio="radios/R6107SP_7ch.xml"
telemetry="telemetry/default_fixedwing_imu_9k6.xml"
flight_plan="flight_plans/versatile_airspeed.xml"
settings="settings/fixedwing_basic.xml settings/estimation/ac_char.xml"
settings_modules="modules/digital_cam.xml modules/light.xml modules/gps_ubx_ucenter.xml modules/geo_mag.xml modules/air_data.xml modules/gps.xml modules/nav_basic_fw.xml modules/guidance_energy.xml modules/stabilization_attitude_fw.xml modules/ahrs_int_cmpl_quat.xml modules/imu_common.xml"
gui_color="#ffffffffffff"
/>
<aircraft
name="Microjet"
ac_id="14"
airframe="airframes/examples/microjet.xml"
radio="radios/cockpitMM.xml"
telemetry="telemetry/default_fixedwing.xml"
flight_plan="flight_plans/basic.xml"
settings="settings/fixedwing_basic.xml"
settings_modules="modules/nav_survey_poly_osam.xml modules/nav_smooth.xml modules/nav_basic_fw.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml modules/infrared_adc.xml modules/gps.xml modules/imu_common.xml modules/tune_airspeed.xml"
gui_color="#6293ba"
/>
<aircraft
name="Microjet_LisaM"
ac_id="15"
airframe="airframes/examples/microjet_lisa_m.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing_imu.xml"
flight_plan="flight_plans/nav_modules.xml"
settings="settings/fixedwing_basic.xml settings/control/ctl_dash_loiter_trim.xml settings/nps.xml"
settings_modules="modules/nav_survey_poly_osam.xml modules/nav_smooth.xml modules/air_data.xml modules/nav_basic_fw.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml modules/ahrs_int_cmpl_quat.xml modules/gps.xml modules/imu_common.xml"
gui_color="blue"
/>
<aircraft
name="Microjet_xsens_imu"
ac_id="17"
airframe="airframes/examples/microjet_imu_xsens.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing_imu.xml"
flight_plan="flight_plans/basic.xml"
settings="settings/fixedwing_basic.xml"
settings_modules="modules/nav_basic_fw.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml modules/imu_common.xml"
gui_color="blue"
/>
<aircraft
name="Microjet_xsens_ins"
ac_id="18"
@@ -164,17 +21,6 @@
settings_modules="modules/nav_basic_fw.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml modules/gps.xml"
gui_color="blue"
/>
<aircraft
name="Minion_Lia"
ac_id="42"
airframe="airframes/AGGIEAIR/aggieair_minion_rp3_lia.xml"
radio="radios/AGGIEAIR/aggieair_taranis.xml"
telemetry="telemetry/AGGIEAIR/aggieair_fixedwing.xml"
flight_plan="flight_plans/AGGIEAIR/BasicTuning_Launcher.xml"
settings="settings/fixedwing_basic.xml settings/nps.xml"
settings_modules="modules/battery_monitor.xml modules/lidar_sf11.xml modules/nav_skid_landing.xml modules/nav_survey_poly_osam.xml modules/gps.xml modules/nav_basic_fw.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml"
gui_color="#00009e93ffff"
/>
<aircraft
name="Quad_Elle0"
ac_id="19"
@@ -186,105 +32,6 @@
settings_modules="modules/air_data.xml modules/geo_mag.xml modules/gps_ubx_ucenter.xml modules/ahrs_float_mlkf.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="white"
/>
<aircraft
name="Quad_HBMini"
ac_id="20"
airframe="airframes/examples/quadrotor_hbmini.xml"
radio="radios/dx6iCHNI.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/gps_ubx_ucenter.xml modules/ahrs_float_cmpl_rmat.xml modules/stabilization_int_euler.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="white"
/>
<aircraft
name="Quad_LisaMX"
ac_id="21"
airframe="airframes/examples/quadrotor_lisa_mx.xml"
radio="radios/dummy.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml settings/nps.xml"
settings_modules="modules/air_data.xml modules/geo_mag.xml modules/gps_ubx_ucenter.xml modules/ahrs_float_mlkf.xml modules/stabilization_rate.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="blue"
/>
<aircraft
name="Quad_LisaM_2"
ac_id="22"
airframe="airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml"
radio="radios/dummy.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml settings/nps.xml"
settings_modules="modules/air_data.xml modules/geo_mag.xml modules/gps_ubx_ucenter.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="white"
/>
<aircraft
name="Quad_Navstik"
ac_id="24"
airframe="airframes/examples/quadrotor_navstik.xml"
radio="radios/dummy.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml settings/nps.xml"
settings_modules="modules/gps_ubx_ucenter.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="#710080"
/>
<aircraft
name="Quad_Revolution"
ac_id="43"
airframe="airframes/examples/quadrotor_revo.xml"
radio="radios/dummy.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml settings/nps.xml"
settings_modules="modules/air_data.xml modules/geo_mag.xml modules/gps_ubx_ucenter.xml modules/ahrs_float_mlkf.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="blue"
/>
<aircraft
name="Twinstar_energyadaptive"
ac_id="26"
airframe="airframes/examples/Twinstar_energyadaptive.xml"
radio="radios/Corona_24_DIY.xml"
telemetry="telemetry/default_fixedwing_imu.xml"
flight_plan="flight_plans/basic.xml"
settings="settings/fixedwing_basic.xml"
settings_modules="modules/digital_cam.xml modules/air_data.xml modules/nav_basic_fw.xml modules/guidance_energy.xml modules/stabilization_adaptive_fw.xml modules/ahrs_int_cmpl_quat.xml modules/imu_common.xml modules/gps.xml"
gui_color="blue"
/>
<aircraft
name="Twog_IMU"
ac_id="27"
airframe="airframes/examples/twog_analogimu.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing_imu.xml"
flight_plan="flight_plans/versatile.xml"
settings="settings/fixedwing_basic.xml"
settings_modules="modules/nav_basic_fw.xml modules/gps.xml modules/ahrs_float_dcm.xml modules/imu_common.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml"
gui_color="blue"
/>
<aircraft
name="Umarim_Lite"
ac_id="28"
airframe="airframes/examples/umarim_lite_v2.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing_imu.xml"
flight_plan="flight_plans/basic.xml"
settings="settings/fixedwing_basic.xml"
settings_modules="modules/gps.xml modules/nav_basic_fw.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml modules/ahrs_float_dcm.xml modules/imu_common.xml"
gui_color="blue"
/>
<aircraft
name="Yapa2_XSens"
ac_id="29"
airframe="airframes/tudelft/yapa_xsens.xml"
radio="radios/R6107SP_7ch.xml"
telemetry="telemetry/default_fixedwing_imu_9k6.xml"
flight_plan="flight_plans/versatile.xml"
settings="settings/fixedwing_basic.xml settings/estimation/ins_neutrals.xml settings/control/tune_agr_climb.xml"
settings_modules="modules/digital_cam.xml modules/light.xml modules/gps.xml modules/nav_basic_fw.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml"
gui_color="blue"
/>
<aircraft
name="apogee_chibios"
ac_id="30"
@@ -307,17 +54,6 @@
settings_modules="modules/bebop_cam.xml modules/cv_opticflow.xml modules/gps_ubx_ucenter.xml modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="blue"
/>
<aircraft
name="bebop"
ac_id="33"
airframe="airframes/examples/bebop.xml"
radio="radios/dummy.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml settings/nps.xml"
settings_modules="modules/video_rtp_stream.xml modules/air_data.xml modules/geo_mag.xml modules/ins_extended.xml modules/ahrs_float_mlkf.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="red"
/>
<aircraft
name="krooz_quad"
ac_id="34"
@@ -329,17 +65,6 @@
settings_modules="modules/geo_mag.xml modules/gps_ubx_ucenter.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_int_euler.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="blue"
/>
<aircraft
name="bebop2"
ac_id="35"
airframe="airframes/examples/bebop2_indi.xml"
radio="radios/dummy.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml settings/control/rotorcraft_speed.xml"
settings_modules="modules/gps_ubx_ucenter.xml modules/air_data.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="red"
/>
<aircraft
name="quad_mavlink"
ac_id="36"
@@ -351,61 +76,6 @@
settings_modules="modules/air_data.xml modules/geo_mag.xml modules/gps_ubx_ucenter.xml modules/ahrs_int_cmpl_quat.xml modules/ahrs_float_mlkf.xml modules/stabilization_int_quat.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml"
gui_color="blue"
/>
<aircraft
name="quadshot"
ac_id="37"
airframe="airframes/examples/quadshot_asp21_spektrum.xml"
radio="radios/dummy.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_basic.xml"
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/ahrs_int_cmpl_quat.xml modules/guidance_hybrid.xml modules/stabilization_indi_simple.xml modules/nav_basic_rotorcraft.xml modules/guidance_rotorcraft.xml modules/gps.xml modules/imu_common.xml modules/gps_ubx_ucenter.xml"
gui_color="blue"
/>
<aircraft
name="setup_lisam2"
ac_id="38"
airframe="airframes/examples/setup_lisam2.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/dummy.xml"
flight_plan="flight_plans/dummy.xml"
settings="settings/setup_actuators.xml"
settings_modules=""
gui_color="blue"
/>
<aircraft
name="test_settings"
ac_id="39"
airframe="airframes/test_settings.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/dummy.xml"
flight_plan="flight_plans/dummy.xml"
settings="settings/test_settings.xml"
settings_modules=""
gui_color="blue"
/>
<aircraft
name="yapa_chimu_spi"
ac_id="40"
airframe="airframes/examples/yapaChimuSpi.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing_imu.xml"
flight_plan="flight_plans/versatile.xml"
settings="settings/fixedwing_basic.xml settings/control/ctl_dash_loiter_trim.xml"
settings_modules="modules/nav_basic_fw.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml modules/gps.xml modules/ahrs_int_cmpl_quat.xml"
gui_color="blue"
/>
<aircraft
name="setup_elle0"
ac_id="41"
airframe="airframes/examples/setup_elle0.xml"
radio="radios/cockpitSX.xml"
telemetry="telemetry/dummy.xml"
flight_plan="flight_plans/dummy.xml"
settings="settings/setup_actuators.xml"
settings_modules=""
gui_color="blue"
/>
<aircraft
name="ardrone2_gazebo"
ac_id="44"
+3
View File
@@ -12,6 +12,9 @@
<makefile target="ap">
<define name="ACTUATORS"/>
<file name="actuators.c" dir="$(SRC_BOARD)"/>
<test firmware="rotorcraft">
<configure name="SRC_BOARD" value="boards/ardrone"/>
</test>
</makefile>
</module>
+4
View File
@@ -24,6 +24,10 @@
<define name="$(ACTUATORS_ASCTEC_I2C_DEV_UPPER)_SCLL" value="$(ACTUATORS_ASCTEC_I2C_SCL_TIME)" cond="ifeq ($(ARCH), lpc21)"/>
<define name="$(ACTUATORS_ASCTEC_I2C_DEV_UPPER)_SCLH" value="$(ACTUATORS_ASCTEC_I2C_SCL_TIME)" cond="ifeq ($(ARCH), lpc21)"/>
<file name="actuators_asctec.c" dir="subsystems/actuators"/>
<test>
<define name="USE_I2C1"/>
<define name="ACTUATORS_ASCTEC_I2C_DEV" value="i2c1"/>
</test>
</makefile>
<makefile target="nps">
<define name="USE_I2C0"/>
+8
View File
@@ -24,6 +24,14 @@
<define name="$(ACTUATORS_ASCTEC_V2_I2C_DEV_UPPER)_SCLL" value="$(ACTUATORS_ASCTEC_V2_I2C_SCL_TIME)" cond="ifeq ($(ARCH), lpc21)"/>
<define name="$(ACTUATORS_ASCTEC_V2_I2C_DEV_UPPER)_SCLH" value="$(ACTUATORS_ASCTEC_V2_I2C_SCL_TIME)" cond="ifeq ($(ARCH), lpc21)"/>
<file name="actuators_asctec_v2.c" dir="subsystems/actuators"/>
<test>
<define name="SERVO_FRONT" value="0"/>
<define name="SERVO_BACK" value="1"/>
<define name="SERVO_LEFT" value="2"/>
<define name="SERVO_RIGHT" value="3"/>
<define name="USE_I2C1"/>
<define name="ACTUATORS_ASCTEC_V2_I2C_DEV" value="i2c1"/>
</test>
</makefile>
<makefile target="nps">
<define name="USE_I2C0"/>
+8
View File
@@ -24,6 +24,14 @@
<define name="$(ACTUATORS_ASCTEC_V2_I2C_DEV_UPPER)_SCLL" value="$(ACTUATORS_ASCTEC_V2_I2C_SCL_TIME)" cond="ifeq ($(ARCH), lpc21)"/>
<define name="$(ACTUATORS_ASCTEC_V2_I2C_DEV_UPPER)_SCLH" value="$(ACTUATORS_ASCTEC_V2_I2C_SCL_TIME)" cond="ifeq ($(ARCH), lpc21)"/>
<file name="actuators_asctec_v2_new.c" dir="subsystems/actuators"/>
<test>
<define name="SERVO_FRONT" value="0"/>
<define name="SERVO_BACK" value="1"/>
<define name="SERVO_LEFT" value="2"/>
<define name="SERVO_RIGHT" value="3"/>
<define name="USE_I2C1"/>
<define name="ACTUATORS_ASCTEC_V2_I2C_DEV" value="i2c1"/>
</test>
</makefile>
<makefile target="nps">
<define name="USE_I2C0"/>
+5
View File
@@ -16,6 +16,11 @@
<define name="BEBOP_ACTUATORS_I2C_DEV" value="$(BEBOP_ACTUATORS_I2C_DEV_LOWER)"/>
<define name="USE_$(BEBOP_ACTUATORS_I2C_DEV_UPPER)"/>
<file name="actuators.c" dir="$(SRC_BOARD)"/>
<test firmware="rotorcraft">
<configure name="SRC_BOARD" value="boards/bebop"/>
<define name="BEBOP_ACTUATORS_I2C_DEV" value="i2c1"/>
<define name="USE_I2C1"/>
</test>
</makefile>
</module>
+5
View File
@@ -14,6 +14,11 @@
<define name="USE_I2C1"/>
<file name="actuators.c" dir="$(SRC_BOARD)"/>
<file_arch name="pwm_sysfs.c" dir="mcu_periph"/>
<test firmware="rotorcraft">
<define name="USE_I2C1"/>
<include name="arch/linux"/>
<configure name="SRC_BOARD" value="boards/disco"/>
</test>
</makefile>
</module>
+4
View File
@@ -19,6 +19,10 @@
<define name="USE_$(ACTUATORS_MD25_DEV_UPPER)"/>
<define name="$(ACTUATORS_MD25_DEV_UPPER)_CLOCK_SPEED" value="100000"/>
<file name="actuators_md25.c"/>
<test>
<define name="USE_I2C2"/>
<define name="ACTUATORS_MD25_DEV" value="i2c2"/>
</test>
</makefile>
</module>
+12
View File
@@ -30,11 +30,23 @@
<define name="$(ACTUATORS_MKK_I2C_DEV_UPPER)_SCLL" value="$(ACTUATORS_MKK_I2C_SCL_TIME)" cond="ifeq ($(ARCH), lpc21)"/>
<define name="$(ACTUATORS_MKK_I2C_DEV_UPPER)_SCLH" value="$(ACTUATORS_MKK_I2C_SCL_TIME)" cond="ifeq ($(ARCH), lpc21)"/>
<file name="actuators_mkk.c" dir="subsystems/actuators"/>
<test>
<define name="ACTUATORS_MKK_NB" value="4"/>
<define name="ACTUATORS_MKK_ADDR" value="{ 0x52, 0x54, 0x56, 0x58 }"/>
<define name="USE_I2C0"/>
<define name="ACTUATORS_MKK_I2C_DEV" value="i2c0"/>
</test>
</makefile>
<makefile target="nps">
<define name="USE_I2C0"/>
<define name="ACTUATORS_MKK_I2C_DEV" value="i2c0"/>
<file name="actuators_mkk.c" dir="subsystems/actuators"/>
<test>
<define name="ACTUATORS_MKK_NB" value="4"/>
<define name="ACTUATORS_MKK_ADDR" value="{ 0x52, 0x54, 0x56, 0x58 }"/>
<define name="USE_I2C0"/>
<define name="ACTUATORS_MKK_I2C_DEV" value="i2c0"/>
</test>
</makefile>
</module>
+12
View File
@@ -30,11 +30,23 @@
<define name="$(ACTUATORS_MKK_V2_I2C_DEV_UPPER)_SCLL" value="$(ACTUATORS_MKK_V2_I2C_SCL_TIME)" cond="ifeq ($(ARCH), lpc21)"/>
<define name="$(ACTUATORS_MKK_V2_I2C_DEV_UPPER)_SCLH" value="$(ACTUATORS_MKK_V2_I2C_SCL_TIME)" cond="ifeq ($(ARCH), lpc21)"/>
<file name="actuators_mkk_v2.c" dir="subsystems/actuators"/>
<test>
<define name="ACTUATORS_MKK_V2_NB" value="4"/>
<define name="ACTUATORS_MKK_V2_ADDR" value="{ 0x52, 0x54, 0x56, 0x58 }"/>
<define name="USE_I2C0"/>
<define name="ACTUATORS_MKK_V2_I2C_DEV" value="i2c0"/>
</test>
</makefile>
<makefile target="nps">
<define name="USE_I2C0"/>
<define name="ACTUATORS_MKK_V2_I2C_DEV" value="i2c0"/>
<file name="actuators_mkk_v2.c" dir="subsystems/actuators"/>
<test>
<define name="ACTUATORS_MKK_V2_NB" value="4"/>
<define name="ACTUATORS_MKK_V2_ADDR" value="{ 0x52, 0x54, 0x56, 0x58 }"/>
<define name="USE_I2C0"/>
<define name="ACTUATORS_MKK_V2_I2C_DEV" value="i2c0"/>
</test>
</makefile>
</module>
+4
View File
@@ -18,6 +18,10 @@
<define name="$(ACTUATORS_OSTRICH_PORT_UPPER)_BAUD" value="$(ACTUATORS_OSTRICH_BAUD)"/>
<file name="actuators_ostrich.c"/>
<test>
<define name="USE_UART6"/>
<define name="ACTUATORS_OSTRICH_DEV" value="uart6"/>
</test>
</makefile>
</module>
+5
View File
@@ -20,6 +20,11 @@
<define name="$(ACTUATORS_SBUS_DEV_UPPER)_BAUD" value="100000"/>
<define name="USE_$(ACTUATORS_SBUS_DEV_UPPER)_RX" value="FALSE"/>
<file name="actuators_sbus.c" dir="subsystems/actuators"/>
<test>
<define name="USE_UART1"/>
<define name="PERIODIC_FREQUENCY" value="500"/>
<define name="ACTUATORS_SBUS_DEV" value="uart1"/>
</test>
</makefile>
</module>
+10
View File
@@ -24,11 +24,21 @@
<define name="$(ACTUATORS_SKIRON_I2C_DEV_UPPER)_SCLL" value="$(ACTUATORS_SKIRON_I2C_SCL_TIME)" cond="ifeq ($(ARCH), lpc21)"/>
<define name="$(ACTUATORS_SKIRON_I2C_DEV_UPPER)_SCLH" value="$(ACTUATORS_SKIRON_I2C_SCL_TIME)" cond="ifeq ($(ARCH), lpc21)"/>
<file name="actuators_skiron.c" dir="subsystems/actuators"/>
<test>
<define name="SERVOS_SKIRON_NB" value="4"/>
<define name="USE_I2C0"/>
<define name="ACTUATORS_SKIRON_I2C_DEV" value="i2c0"/>
</test>
</makefile>
<makefile target="nps">
<define name="USE_I2C0"/>
<define name="ACTUATORS_SKIRON_I2C_DEV" value="i2c0"/>
<file name="actuators_skiron.c" dir="subsystems/actuators"/>
<test>
<define name="SERVOS_SKIRON_NB" value="4"/>
<define name="USE_I2C0"/>
<define name="ACTUATORS_SKIRON_I2C_DEV" value="i2c0"/>
</test>
</makefile>
</module>
+5
View File
@@ -28,6 +28,11 @@
<define name="$(ACTUATORS_SPEKTRUM_DEV2_UPPER)_BAUD" value="115200" cond="ifdef ACTUATORS_SPEKTRUM_DEV2"/>
<define name="USE_$(ACTUATORS_SPEKTRUM_DEV2_UPPER)_RC" value="FALSE" cond="ifdef ACTUATORS_SPEKTRUM_DEV2"/>
<file name="actuators_spektrum.c" dir="subsystems/actuators"/>
<test>
<define name="PERIODIC_FREQUENCY" value="500"/>
<define name="USE_UART4"/>
<define name="ACTUATORS_SPEKTRUM_DEV" value="uart4"/>
</test>
</makefile>
</module>
+1
View File
@@ -13,6 +13,7 @@
<makefile>
<define name="USE_ADC"/>
<file_arch name="adc_arch.c" dir="mcu_periph"/>
<test/>
</makefile>
</module>
+1
View File
@@ -20,6 +20,7 @@
<init fun="agl_dist_init()"/>
<makefile>
<file name="agl_dist.c"/>
<test/>
</makefile>
</module>
+5
View File
@@ -58,6 +58,11 @@
<file name="ahrs_aligner.c" dir="subsystems/ahrs"/>
<file name="ahrs_float_cmpl.c" dir="subsystems/ahrs"/>
<file name="ahrs_float_cmpl_wrapper.c" dir="subsystems/ahrs"/>
<test>
<define name="PRIMARY_AHRS" value="ahrs_fc"/>
<define name="AHRS_TYPE_H" value="subsystems/ahrs/ahrs_float_cmpl_wrapper.h" type="string"/>
<define name="AHRS_PROPAGATE_QUAT"/>
</test>
<raw>
ifdef SECONDARY_AHRS
ifneq (,$(findstring $(SECONDARY_AHRS), fcq float_cmpl_quat))
+5
View File
@@ -54,6 +54,11 @@
<file name="ahrs_aligner.c" dir="subsystems/ahrs"/>
<file name="ahrs_float_cmpl.c" dir="subsystems/ahrs"/>
<file name="ahrs_float_cmpl_wrapper.c" dir="subsystems/ahrs"/>
<test>
<define name="PRIMARY_AHRS" value="ahrs_fc"/>
<define name="AHRS_TYPE_H" value="subsystems/ahrs/ahrs_float_cmpl_wrapper.h" type="string"/>
<define name="AHRS_PROPAGATE_RMAT"/>
</test>
<raw>
ifdef SECONDARY_AHRS
ifneq (,$(findstring $(SECONDARY_AHRS), fcr float_cmpl_rmat))
+4
View File
@@ -48,6 +48,10 @@
<file name="ahrs_aligner.c" dir="subsystems/ahrs"/>
<file name="ahrs_float_dcm.c" dir="subsystems/ahrs"/>
<file name="ahrs_float_dcm_wrapper.c" dir="subsystems/ahrs"/>
<test firmware="fixedwing">
<define name="PRIMARY_AHRS" value="ahrs_dcm"/>
<define name="AHRS_TYPE_H" value="subsystems/ahrs/ahrs_float_dcm_wrapper.h" type="string"/>
</test>
<raw>
ifdef SECONDARY_AHRS
ifneq (,$(findstring $(SECONDARY_AHRS), dcm float_dcm))
+4
View File
@@ -44,6 +44,10 @@
<file name="ahrs_aligner.c" dir="subsystems/ahrs"/>
<file name="ahrs_float_invariant.c" dir="subsystems/ahrs"/>
<file name="ahrs_float_invariant_wrapper.c" dir="subsystems/ahrs"/>
<test>
<define name="PRIMARY_AHRS" value="ahrs_float_invariant"/>
<define name="AHRS_TYPE_H" value="subsystems/ahrs/ahrs_float_invariant_wrapper.h" type="string"/>
</test>
<raw>
ifdef SECONDARY_AHRS
ifneq (,$(findstring $(SECONDARY_AHRS), invariant float_invariant))
+4
View File
@@ -42,6 +42,10 @@
<file name="ahrs_aligner.c" dir="subsystems/ahrs"/>
<file name="ahrs_float_mlkf.c" dir="subsystems/ahrs"/>
<file name="ahrs_float_mlkf_wrapper.c" dir="subsystems/ahrs"/>
<test>
<define name="PRIMARY_AHRS" value="ahrs_mlkf"/>
<define name="AHRS_TYPE_H" value="subsystems/ahrs/ahrs_float_mlkf_wrapper.h" type="string"/>
</test>
<raw>
ifdef SECONDARY_AHRS
ifneq (,$(findstring $(SECONDARY_AHRS), mlkf float_mlkf))
+6
View File
@@ -25,5 +25,11 @@
<file name="ahrs.c" dir="subsystems"/>
<file name="imu.c" dir="subsystems"/>
<file name="ahrs_gx3.c" dir="subsystems/ahrs"/>
<test>
<define name="GX3_PORT" value="uart3"/>
<define name="USE_UART3"/>
<define name="PRIMARY_AHRS" value="ahrs_gx3"/>
<define name="AHRS_TYPE_H" value="subsystems/ahrs/ahrs_gx3.h" type="string"/>
</test>
</makefile>
</module>
+3
View File
@@ -18,5 +18,8 @@
<periodic fun="ahrs_infrared_periodic()" freq="60"/>
<makefile>
<file name="ahrs_infrared.c"/>
<test>
<define name="IR_HORIZ_SENSOR_ALIGNED"/>
</test>
</makefile>
</module>
+4
View File
@@ -44,6 +44,10 @@
<file name="ahrs_aligner.c" dir="subsystems/ahrs"/>
<file name="ahrs_int_cmpl_euler.c" dir="subsystems/ahrs"/>
<file name="ahrs_int_cmpl_euler_wrapper.c" dir="subsystems/ahrs"/>
<test>
<define name="PRIMARY_AHRS" value="ahrs_ice"/>
<define name="AHRS_TYPE_H" value="subsystems/ahrs/ahrs_int_cmpl_euler_wrapper.h" type="string"/>
</test>
<raw>
ifdef SECONDARY_AHRS
ifneq (,$(findstring $(SECONDARY_AHRS), ice int_cmpl_euler))
+11
View File
@@ -69,6 +69,17 @@
<file name="ahrs_aligner.c" dir="subsystems/ahrs"/>
<file name="ahrs_int_cmpl_quat.c" dir="subsystems/ahrs"/>
<file name="ahrs_int_cmpl_quat_wrapper.c" dir="subsystems/ahrs"/>
<test>
<define name="PRIMARY_AHRS" value="ahrs_icq"/>
<define name="AHRS_TYPE_H" value="subsystems/ahrs/ahrs_int_cmpl_quat_wrapper.h" type="string"/>
<define name="USE_MAGNETOMETER"/>
</test>
<test>
<define name="PRIMARY_AHRS" value="ahrs_icq"/>
<define name="AHRS_TYPE_H" value="subsystems/ahrs/ahrs_int_cmpl_quat_wrapper.h" type="string"/>
<define name="AHRS_USE_GPS_HEADING"/>
<define name="USE_GPS"/>
</test>
<raw>
ifdef SECONDARY_AHRS
ifneq (,$(findstring $(SECONDARY_AHRS), icq int_cmpl_quat))
+4
View File
@@ -49,6 +49,10 @@ else
$(TARGET).CFLAGS += -DAHRS_TYPE_H=\"modules/ahrs/ahrs_madgwick_wrapper.h\"
endif
</raw>
<test>
<define name="PRIMARY_AHRS" value="ahrs_madgwick"/>
<define name="AHRS_TYPE_H" value="modules/ahrs/ahrs_madgwick_wrapper.h" type="string"/>
</test>
</makefile>
</module>
+4
View File
@@ -16,5 +16,9 @@
<define name="AHRS_TYPE_H" value="subsystems/ahrs/ahrs_sim.h" type="string"/>
<file name="ahrs.c" dir="subsystems"/>
<file name="ahrs_sim.c" dir="subsystems/ahrs"/>
<test>
<define name="PRIMARY_AHRS" value="ahrs_sim"/>
<define name="AHRS_TYPE_H" value="subsystems/ahrs/ahrs_sim.h" type="string"/>
</test>
</makefile>
</module>
+6
View File
@@ -43,5 +43,11 @@ else
$(TARGET).CFLAGS += -DAHRS_TYPE_H=\"subsystems/ahrs/ahrs_vectornav_wrapper.h\"
endif
</raw>
<test>
<define name="PRIMARY_AHRS" value="ahrs_vectornav"/>
<define name="AHRS_TYPE_H" value="subsystems/ahrs/ahrs_vectornav_wrapper.h" type="string"/>
<define name="VN_PORT" value="uart0"/>
<define name="USE_UART0"/>
</test>
</makefile>
</module>
+5
View File
@@ -27,6 +27,11 @@
<makefile target="ap|sim">
<file name="airspeed_adc.c"/>
<test arch="test">
<define name="AIRSPEED_ADC_QUADRATIC_SCALE" value="1"/>
<define name="AIRSPEED_ADC_BIAS" value="0"/>
<define name="ADC_CHANNEL_AIRSPEED" value="0"/>
</test>
</makefile>
<makefile target="ap">
<define name="ADC_CHANNEL_AIRSPEED" value="$(ADC_AIRSPEED)"/>
+4
View File
@@ -16,6 +16,10 @@
<define name="USE_BARO_DIFF"/>
<define name="USE_ADS1114_2"/>
<define name="ADS1114_2_PGA" value="0x1"/> <!-- PGA gain = 1 (+/- 4.096V) -->
<test arch="test">
<define name="USE_ADS1114_1"/>
<define name="BARO_DIFF_ADS" value="ads1114_1"/>
</test>
</makefile>
</module>
+6
View File
@@ -38,6 +38,12 @@
<define name="USE_$(AIRSPEED_AMSYS_I2C_DEV_UPPER)"/>
<define name="AIRSPEED_AMSYS_I2C_DEV" value="$(AIRSPEED_AMSYS_I2C_DEV_LOWER)"/>
<file name="airspeed_amsys.c"/>
<test>
<define name="USE_I2C0"/>
<define name="DOWNLINK_TRANSPORT" value="pprz_tp"/>
<define name="DOWNLINK_DEVICE" value="uart0"/>
<define name="USE_UART0"/>
</test>
</makefile>
</module>
+4
View File
@@ -40,6 +40,10 @@
<define name="USE_$(AIRSPEED_ETS_I2C_DEV_UPPER)"/>
<define name="AIRSPEED_ETS_I2C_DEV" value="$(AIRSPEED_ETS_I2C_DEV_LOWER)"/>
<file name="airspeed_ets.c"/>
<test>
<define name="USE_I2C0"/>
<define name="USE_AIRSPEED_ETS"/>
</test>
</makefile>
</module>
+7
View File
@@ -43,5 +43,12 @@
<makefile target="ap">
<file name="airspeed_ms45xx_i2c.c"/>
<test>
<define name="MS45XX_I2C_PERIODIC_PERIOD" value="0.001"/>
<define name="USE_I2C2"/>
<define name="DOWNLINK_TRANSPORT" value="pprz_tp"/>
<define name="DOWNLINK_DEVICE" value="uart0"/>
<define name="USE_UART0"/>
</test>
</makefile>
</module>
+6
View File
@@ -27,6 +27,12 @@
<define name="USE_$(OTF_UART_UPPER)"/>
<define name="MET_LINK" value="$(OTF_UART_LOWER)"/>
<define name="$(OTF_UART_UPPER)_BAUD" value="B115200"/>
<test>
<define name="MET_LINK" value="uart0"/>
<define name="DOWNLINK_TRANSPORT" value="pprz_tp"/>
<define name="DOWNLINK_DEVICE" value="uart0"/>
<define name="USE_UART0"/>
</test>
</makefile>
</module>
+8
View File
@@ -40,5 +40,13 @@
<define name="USE_$(SDP3X_I2C_DEV_UPPER)"/>
<define name="SDP3X_I2C_DEV" value="$(SDP3X_I2C_DEV_LOWER)"/>
<file name="airspeed_sdp3x.c"/>
<test>
<define name="SDP3X_PERIODIC_PERIOD" value="0.001"/>
<define name="SDP3X_I2C_DEV" value="i2c2"/>
<define name="USE_I2C2"/>
<define name="DOWNLINK_TRANSPORT" value="pprz_tp"/>
<define name="DOWNLINK_DEVICE" value="uart0"/>
<define name="USE_UART0"/>
</test>
</makefile>
</module>
+6
View File
@@ -26,6 +26,12 @@
<define name="USE_$(UADC_UART_UPPER)"/>
<define name="uADC_DEV" value="$(UADC_UART_LOWER)"/>
<define name="$(UADC_UART_UPPER)_BAUD" value="B115200"/>
<test>
<define name="uADC_DEV" value="uart0"/>
<define name="DOWNLINK_TRANSPORT" value="pprz_tp"/>
<define name="DOWNLINK_DEVICE" value="uart0"/>
<define name="USE_UART0"/>
</test>
</makefile>
</module>
+7
View File
@@ -18,6 +18,13 @@
<define name="BMP_I2C_DEV" value="$(BMP_I2C_DEV_LOWER)"/>
<file name="baro_bmp.c"/>
<file name="bmp085.c" dir="peripherals"/>
<test firmware="fixedwing">
<define name="USE_I2C1"/>
<define name="BMP_I2C_DEV" value="i2c1"/>
<define name="DOWNLINK_TRANSPORT" value="pprz_tp"/>
<define name="DOWNLINK_DEVICE" value="uart0"/>
<define name="USE_UART0"/>
</test>
</makefile>
</module>
+4
View File
@@ -22,6 +22,10 @@
<define name="BMP3_I2C_DEV" value="$(BMP3_I2C_DEV_LOWER)"/>
<file name="baro_bmp3.c"/>
<file name="bmp3_i2c.c" dir="peripherals"/>
<test arch="test">
<define name="USE_I2C1"/>
<define name="BMP3_I2C_DEV" value="i2c1"/>
</test>
</makefile>
</module>
+6
View File
@@ -18,6 +18,12 @@
<define name="USE_$(BARO_HCA_I2C_DEV_UPPER)"/>
<define name="BARO_HCA_I2C_DEV" value="$(BARO_HCA_I2C_DEV_LOWER)"/>
<file name="baro_hca.c"/>
<test>
<define name="USE_I2C0"/>
<define name="DOWNLINK_TRANSPORT" value="pprz_tp"/>
<define name="DOWNLINK_DEVICE" value="uart0"/>
<define name="USE_UART0"/>
</test>
</makefile>
</module>
+5 -2
View File
@@ -60,8 +60,8 @@
<file name="mt9f002.h"/>
</header>
<init fun="mt9v117_init(&mt9v117)"/>
<init fun="mt9f002_init(&mt9f002)"/>
<init fun="mt9v117_init(PTR(mt9v117))"/>
<init fun="mt9f002_init(PTR(mt9f002))"/>
<makefile target="ap">
<file name="mt9v117.c"/>
<file name="mt9f002.c"/>
@@ -69,6 +69,9 @@
<define name="I2C_BUF_LEN" value="56"/>
<define name="USE_I2C0"/>
<test>
<define name="USE_I2C0"/>
</test>
</makefile>
<makefile target="nps">
<file name="mt9v117_nps.c"/>
+6
View File
@@ -15,6 +15,12 @@
<event fun="charge_sens_event()"/>
<makefile target="ap">
<file name="charge_sens.c"/>
<test>
<define name="USE_I2C0"/>
<define name="DOWNLINK_TRANSPORT" value="pprz_tp"/>
<define name="DOWNLINK_DEVICE" value="uart0"/>
<define name="USE_UART0"/>
</test>
</makefile>
</module>
+2 -2
View File
@@ -19,8 +19,8 @@
<event fun="dfu_command_event()"/>
<makefile target="!fbw|sim|nps|hitl">
<configure name="SERIAL_TTY" default="/dev/ttyACM0"/>
<configure name="DFU_PRE_UPLOAD_CMD" default="@(printf '\043\012' > $(SERIAL_TTY) && sleep 1 && printf 'bl\012' > $(SERIAL_TTY) && sleep 1) || echo 'Warning: DFU command failed!'"/>
<configure name="DFU_UTIL_PRE_UPLOAD_CMD" default="@(printf '\043\012' > $(SERIAL_TTY) && sleep 1 && printf 'bl\012' > $(SERIAL_TTY) && sleep 1) || echo 'Warning: DFU command failed!'"/>
<configure name="DFU_PRE_UPLOAD_CMD" default="@(printf '\043\012' $(REDIRECT) $(SERIAL_TTY) $(AND) sleep 1 $(AND) printf 'bl\012' $(REDIRECT) $(SERIAL_TTY) $(AND) sleep 1) $(OR) echo 'Warning: DFU command failed!'"/>
<configure name="DFU_UTIL_PRE_UPLOAD_CMD" default="@(printf '\043\012' $(REDIRECT) $(SERIAL_TTY) $(AND) sleep 1 $(AND) printf 'bl\012' $(REDIRECT) $(SERIAL_TTY) $(AND) sleep 1) $(OR) echo 'Warning: DFU command failed!'"/>
<define name="USE_USB_SERIAL"/>
<file name="dfu_command.c"/>
<file_arch name="usb_ser_hw.c" dir="."/>
+1 -1
View File
@@ -22,7 +22,7 @@
<configure name="JSBSIM_INC" value="$(JSBSIM_ROOT)/include/JSBSim"/>
<configure name="JSBSIM_LIB" value="$(JSBSIM_ROOT)/lib"/>
<configure name="JSBSIM_USE_SGPATH" value="TRUE"/>
<configure name="FIND_JSBSIM_VIA_PKG_CONFIG" default="$(shell pkg-config JSBSim --exists && echo 'yes')"/>
<configure name="FIND_JSBSIM_VIA_PKG_CONFIG" default="$(shell pkg-config JSBSim --exists ${AND} echo 'yes')"/>
<raw>
ifeq ($(FIND_JSBSIM_VIA_PKG_CONFIG), yes)
nps.CFLAGS += $(shell pkg-config JSBSim --cflags)
+3
View File
@@ -34,6 +34,9 @@
<file name="gps.c" dir="subsystems"/>
<define name="USE_GPS"/>
<define name="GPS_LED" value="$(GPS_LED)" cond="ifneq ($(GPS_LED),none)"/>
<test>
<define name="PRIMARY_GPS" value="GPS_DATALINK"/>
</test>
</makefile>
</module>
+3
View File
@@ -35,6 +35,9 @@
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_datalink.h\"
endif
</raw>
<test firmware="rotorcraft">
<define name="PRIMARY_GPS" value="GPS_DATALINK"/>
</test>
</makefile>
<makefile target="fbw">
<define name="USE_GPS"/>
+7
View File
@@ -46,6 +46,13 @@
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_nmea.h\"
endif
</raw>
<test>
<define name="PRIMARY_GPS" value="GPS_NMEA"/>
<define name="FURUNO_GPS_PORT" value="uart2"/>
<define name="FURUNO_GPS_BAUD" value="115200"/>
<define name="USE_UART2"/>
<define name="NMEA_GPS_LINK" value="uart2"/>
</test>
</makefile>
<makefile target="fbw">
<define name="USE_GPS"/>
+7
View File
@@ -42,6 +42,13 @@
$(TARGET).CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_mtk.h\"
endif
</raw>
<test>
<define name="PRIMARY_GPS" value="GPS_MTK"/>
<define name="MTK_GPS_PORT" value="uart2"/>
<define name="MTK_GPS_BAUD" value="115200"/>
<define name="USE_UART2"/>
<define name="MTK_GPS_LINK" value="uart2"/>
</test>
</makefile>
<makefile target="fbw">
<define name="USE_GPS"/>

Some files were not shown because too many files have changed in this diff Show More