diff --git a/conf/modules/AOA_adc.xml b/conf/modules/AOA_adc.xml index d4e7b513bc..17c9274d4a 100644 --- a/conf/modules/AOA_adc.xml +++ b/conf/modules/AOA_adc.xml @@ -1,6 +1,6 @@ - + Angle of Attack using internal ADC diff --git a/conf/modules/AOA_pwm.xml b/conf/modules/AOA_pwm.xml index 9974dd0bd9..49dd0cf306 100644 --- a/conf/modules/AOA_pwm.xml +++ b/conf/modules/AOA_pwm.xml @@ -1,6 +1,6 @@ - + Angle of Attack sensor using PWM input diff --git a/conf/modules/actuators.xml b/conf/modules/actuators.xml new file mode 100644 index 0000000000..7c46f60656 --- /dev/null +++ b/conf/modules/actuators.xml @@ -0,0 +1,23 @@ + + + + + + Common actuators interface + + + + +
+ +
+ + + + + + +
+ + + diff --git a/conf/modules/actuators_ardrone2.xml b/conf/modules/actuators_ardrone2.xml index 39826e4818..f82241f8da 100644 --- a/conf/modules/actuators_ardrone2.xml +++ b/conf/modules/actuators_ardrone2.xml @@ -6,12 +6,15 @@ Actuators Driver for ARDrone2
+ + actuators + actuators +
- diff --git a/conf/modules/actuators_asctec_v2.xml b/conf/modules/actuators_asctec_v2.xml index ef2fd7af44..ecabc320b1 100644 --- a/conf/modules/actuators_asctec_v2.xml +++ b/conf/modules/actuators_asctec_v2.xml @@ -11,13 +11,16 @@
+ + i2c,actuators + actuators +
- diff --git a/conf/modules/actuators_bebop.xml b/conf/modules/actuators_bebop.xml index 7638f6a6fa..15574234c1 100644 --- a/conf/modules/actuators_bebop.xml +++ b/conf/modules/actuators_bebop.xml @@ -7,13 +7,16 @@ + + i2c,actuators + actuators +
- diff --git a/conf/modules/actuators_disco.xml b/conf/modules/actuators_disco.xml index 160ee61eac..6481e4feec 100644 --- a/conf/modules/actuators_disco.xml +++ b/conf/modules/actuators_disco.xml @@ -6,11 +6,14 @@ Actuators Driver for Disco plane + + i2c,actuators + actuators +
- diff --git a/conf/modules/actuators_dshot.xml b/conf/modules/actuators_dshot.xml index 3d7b487aed..ae7b50a119 100644 --- a/conf/modules/actuators_dshot.xml +++ b/conf/modules/actuators_dshot.xml @@ -11,11 +11,14 @@ + + actuators,@commands + actuators +
- diff --git a/conf/modules/actuators_dualpwm.xml b/conf/modules/actuators_dualpwm.xml index 2224812070..9f7a1ceb90 100644 --- a/conf/modules/actuators_dualpwm.xml +++ b/conf/modules/actuators_dualpwm.xml @@ -4,14 +4,16 @@ Actuators Driver for dual PWM output - Only with stm32 + + actuators + actuators +
- diff --git a/conf/modules/actuators_dummy.xml b/conf/modules/actuators_dummy.xml index b52ca5037b..407a3fc87f 100644 --- a/conf/modules/actuators_dummy.xml +++ b/conf/modules/actuators_dummy.xml @@ -5,8 +5,13 @@ Dummy actuators driver This module prevents autoloading of actuators by fixedwing firmware + + FIXME: this as no effect anymore + + actuators +
diff --git a/conf/modules/actuators_esc32.xml b/conf/modules/actuators_esc32.xml index b7899f990a..dce1035fb9 100644 --- a/conf/modules/actuators_esc32.xml +++ b/conf/modules/actuators_esc32.xml @@ -11,11 +11,14 @@ - command_laws section to map motor_mixing commands to servos + + actuators + actuators +
- diff --git a/conf/modules/actuators_md25.xml b/conf/modules/actuators_md25.xml index 572a2ded80..c9a44dd51d 100644 --- a/conf/modules/actuators_md25.xml +++ b/conf/modules/actuators_md25.xml @@ -7,6 +7,10 @@ + + i2c,actuators + actuators +
@@ -14,7 +18,6 @@ - diff --git a/conf/modules/actuators_nps.xml b/conf/modules/actuators_nps.xml index aff3544fdb..097b27580b 100644 --- a/conf/modules/actuators_nps.xml +++ b/conf/modules/actuators_nps.xml @@ -6,8 +6,11 @@ Actuators for NPS (dummy pwm) + + actuators + actuators + - diff --git a/conf/modules/actuators_ostrich.xml b/conf/modules/actuators_ostrich.xml index ce19a2293e..124e1be131 100644 --- a/conf/modules/actuators_ostrich.xml +++ b/conf/modules/actuators_ostrich.xml @@ -6,6 +6,10 @@ + + uart,actuators + actuators +
diff --git a/conf/modules/actuators_ppm.xml b/conf/modules/actuators_ppm.xml index 5b1eb9e46d..f5ddb4a392 100644 --- a/conf/modules/actuators_ppm.xml +++ b/conf/modules/actuators_ppm.xml @@ -11,11 +11,14 @@ Can be adjusted in the "servos_ppm_hw.h" file to suit your particular receiver. + + actuators + actuators +
- diff --git a/conf/modules/actuators_pwm.xml b/conf/modules/actuators_pwm.xml index 00dcc61cec..ea77285e35 100644 --- a/conf/modules/actuators_pwm.xml +++ b/conf/modules/actuators_pwm.xml @@ -6,11 +6,14 @@ Actuators Driver using direct PWM output + + actuators + actuators +
- diff --git a/conf/modules/actuators_sbus.xml b/conf/modules/actuators_sbus.xml index ea7ce490b0..90f77d7f6d 100644 --- a/conf/modules/actuators_sbus.xml +++ b/conf/modules/actuators_sbus.xml @@ -9,12 +9,15 @@ + + uart,actuators + actuators +
- diff --git a/conf/modules/actuators_spektrum.xml b/conf/modules/actuators_spektrum.xml index 55a27542c2..a367e6f0fa 100644 --- a/conf/modules/actuators_spektrum.xml +++ b/conf/modules/actuators_spektrum.xml @@ -12,13 +12,16 @@ + + uart,actuators + actuators +
- diff --git a/conf/modules/actuators_swing.xml b/conf/modules/actuators_swing.xml index 93f4c889f5..20e163ef45 100644 --- a/conf/modules/actuators_swing.xml +++ b/conf/modules/actuators_swing.xml @@ -6,11 +6,14 @@ Actuators Driver for Swing + + actuators + actuators +
- diff --git a/conf/modules/actuators_uavcan.xml b/conf/modules/actuators_uavcan.xml index 3b77e92119..4cd736bace 100644 --- a/conf/modules/actuators_uavcan.xml +++ b/conf/modules/actuators_uavcan.xml @@ -8,8 +8,10 @@ - uavcan + uavcan,actuators + actuators +
diff --git a/conf/modules/adc.xml b/conf/modules/adc.xml index abf4aaabd8..c19c796bd8 100644 --- a/conf/modules/adc.xml +++ b/conf/modules/adc.xml @@ -7,6 +7,9 @@ To activate a specific ADC input, define flag USE_ADC_X where X is your ADC input number + + mcu +
diff --git a/conf/modules/ahrs_chimu_spi.xml b/conf/modules/ahrs_chimu_spi.xml index 9c171b2aa0..5ff851731c 100644 --- a/conf/modules/ahrs_chimu_spi.xml +++ b/conf/modules/ahrs_chimu_spi.xml @@ -1,15 +1,19 @@ - + CHimu (SPI) + + spi_slave_hs + ahrs,imu + -
+ diff --git a/conf/modules/ahrs_chimu_uart.xml b/conf/modules/ahrs_chimu_uart.xml index ff8cd591f3..1c2046e747 100644 --- a/conf/modules/ahrs_chimu_uart.xml +++ b/conf/modules/ahrs_chimu_uart.xml @@ -1,14 +1,19 @@ - + CHimu (UART) + + uart + ahrs,imu +
+ diff --git a/conf/modules/ahrs_common.xml b/conf/modules/ahrs_common.xml new file mode 100644 index 0000000000..94377818dd --- /dev/null +++ b/conf/modules/ahrs_common.xml @@ -0,0 +1,34 @@ + + + + + + Generic AHRS interface. + Still requires at least one module providing the actual AHRS implementation. + + + + + @ahrs + +
+ +
+ + + + + + + + + + + + + + + + +
+ diff --git a/conf/modules/ahrs_float_cmpl_quat.xml b/conf/modules/ahrs_float_cmpl_quat.xml index 82ed9a0cb4..c91a680cf2 100644 --- a/conf/modules/ahrs_float_cmpl_quat.xml +++ b/conf/modules/ahrs_float_cmpl_quat.xml @@ -1,6 +1,6 @@ - + AHRS using complementary filter in floating point. @@ -35,10 +35,11 @@ + + ahrs_common,@imu,@gps|@mag + ahrs + -
- -
@@ -46,16 +47,8 @@ - - - - - - - - diff --git a/conf/modules/ahrs_float_cmpl_rmat.xml b/conf/modules/ahrs_float_cmpl_rmat.xml index 301b04ef3f..f2d5b54340 100644 --- a/conf/modules/ahrs_float_cmpl_rmat.xml +++ b/conf/modules/ahrs_float_cmpl_rmat.xml @@ -1,6 +1,6 @@ - + AHRS using complementary filter in floating point. @@ -31,10 +31,11 @@ + + ahrs_common,@imu,@gps|@mag + ahrs + -
- -
@@ -42,16 +43,8 @@ - - - - - - - - diff --git a/conf/modules/ahrs_float_dcm.xml b/conf/modules/ahrs_float_dcm.xml index 419da82a1d..58eb6d8500 100644 --- a/conf/modules/ahrs_float_dcm.xml +++ b/conf/modules/ahrs_float_dcm.xml @@ -1,6 +1,6 @@ - + AHRS using DCM filter. @@ -15,7 +15,6 @@ But since people already know it under that name, we kept it. - @@ -31,21 +30,15 @@ + + ahrs_common,@imu,@gps + ahrs + -
- -
- - - - - - - diff --git a/conf/modules/ahrs_float_invariant.xml b/conf/modules/ahrs_float_invariant.xml index 2360fc59ac..c1a5ef42e1 100644 --- a/conf/modules/ahrs_float_invariant.xml +++ b/conf/modules/ahrs_float_invariant.xml @@ -1,6 +1,6 @@ - + AHRS using invariant filter. @@ -28,20 +28,13 @@ -
- -
- + + ahrs_common,@imu,@mag + ahrs + - - - - - - - diff --git a/conf/modules/ahrs_float_mlkf.xml b/conf/modules/ahrs_float_mlkf.xml index 68233b9bc4..e429823a5b 100644 --- a/conf/modules/ahrs_float_mlkf.xml +++ b/conf/modules/ahrs_float_mlkf.xml @@ -1,6 +1,6 @@ - + AHRS using MLKF filter. @@ -25,21 +25,14 @@ + + ahrs_common,@imu,@mag + ahrs + -
- -
- - - - - - - - diff --git a/conf/modules/ahrs_gx3.xml b/conf/modules/ahrs_gx3.xml index e9dfe72bf8..2edc98a5bc 100644 --- a/conf/modules/ahrs_gx3.xml +++ b/conf/modules/ahrs_gx3.xml @@ -1,6 +1,6 @@ - + AHRS driver for GX3. @@ -8,11 +8,15 @@ + + uart + ahrs,imu,mag +
- + diff --git a/conf/modules/ahrs_int_cmpl_quat.xml b/conf/modules/ahrs_int_cmpl_quat.xml index 445a4ccd47..a8c3953f82 100644 --- a/conf/modules/ahrs_int_cmpl_quat.xml +++ b/conf/modules/ahrs_int_cmpl_quat.xml @@ -1,6 +1,6 @@ - + AHRS using complementary filter in fixed point. @@ -47,10 +47,11 @@ + + ahrs_common,@imu,@mag|@gps + ahrs + -
- -
@@ -59,14 +60,7 @@ - - - - - - - diff --git a/conf/modules/ahrs_madgwick.xml b/conf/modules/ahrs_madgwick.xml index 6bcac206e9..f96b08ca4f 100644 --- a/conf/modules/ahrs_madgwick.xml +++ b/conf/modules/ahrs_madgwick.xml @@ -1,6 +1,6 @@ - + AHRS using IMU (accel, gyro) only with Madwick implementation. @@ -17,20 +17,17 @@ + + ahrs_common,@imu + ahrs +
- - - - - - - diff --git a/conf/modules/ahrs_sim.xml b/conf/modules/ahrs_sim.xml index a7f160b5e0..f9e12bdf59 100644 --- a/conf/modules/ahrs_sim.xml +++ b/conf/modules/ahrs_sim.xml @@ -1,20 +1,22 @@ - + Simple simulation of the AHRS result. Only for the simple fixedwing sim. + + ahrs_common + ahrs +
- + - - diff --git a/conf/modules/ahrs_vectornav.xml b/conf/modules/ahrs_vectornav.xml index e189948205..6412ef5674 100644 --- a/conf/modules/ahrs_vectornav.xml +++ b/conf/modules/ahrs_vectornav.xml @@ -1,6 +1,6 @@ - + Vectornav VN200 over uart used as AHRS. @@ -8,10 +8,15 @@ + + uart + ahrs,imu +
+ diff --git a/conf/modules/air_data.xml b/conf/modules/air_data.xml index f2e4f8b4b3..67adf2dd90 100644 --- a/conf/modules/air_data.xml +++ b/conf/modules/air_data.xml @@ -1,6 +1,6 @@ - + AirData interface. @@ -36,7 +36,7 @@
- +
diff --git a/conf/modules/airspeed_adc.xml b/conf/modules/airspeed_adc.xml index 2d06efa947..66577e3459 100644 --- a/conf/modules/airspeed_adc.xml +++ b/conf/modules/airspeed_adc.xml @@ -1,6 +1,6 @@ - + Airspeed sensor (ADC). Using the internal ADC. @@ -19,6 +19,10 @@ + + adc + airspeed +
diff --git a/conf/modules/airspeed_ads1114.xml b/conf/modules/airspeed_ads1114.xml index 7decfa81ca..ac9303d95a 100644 --- a/conf/modules/airspeed_ads1114.xml +++ b/conf/modules/airspeed_ads1114.xml @@ -1,12 +1,16 @@ - + ADS1114 airspeed sensor. Module to extend the baro_board module with an airspeed sensor using ads1114 adc + + i2c + airspeed +
diff --git a/conf/modules/airspeed_amsys.xml b/conf/modules/airspeed_amsys.xml index 45512e27d7..402964e185 100644 --- a/conf/modules/airspeed_amsys.xml +++ b/conf/modules/airspeed_amsys.xml @@ -1,6 +1,6 @@ - + Airspeed AMSYS (I2C) @@ -25,6 +25,10 @@ + + i2c + airspeed +
diff --git a/conf/modules/airspeed_ets.xml b/conf/modules/airspeed_ets.xml index 3c1d676ff8..5643754a89 100644 --- a/conf/modules/airspeed_ets.xml +++ b/conf/modules/airspeed_ets.xml @@ -1,6 +1,6 @@ - + Airspeed ETS (I2C). @@ -27,6 +27,10 @@ + + i2c + airspeed +
diff --git a/conf/modules/airspeed_ms45xx_i2c.xml b/conf/modules/airspeed_ms45xx_i2c.xml index ee743797cc..09b8923414 100644 --- a/conf/modules/airspeed_ms45xx_i2c.xml +++ b/conf/modules/airspeed_ms45xx_i2c.xml @@ -1,6 +1,6 @@ - + MS45XX differential or gauge type of pressure sensor for e.g measuring airspeed. @@ -32,6 +32,10 @@ + + i2c + airspeed +
diff --git a/conf/modules/airspeed_otf.xml b/conf/modules/airspeed_otf.xml index 4c37037b06..b5faf4daa3 100644 --- a/conf/modules/airspeed_otf.xml +++ b/conf/modules/airspeed_otf.xml @@ -1,6 +1,6 @@ - + OTF! airspeed/flow angle sensor @@ -14,6 +14,10 @@ + + uart + airspeed,aoa +
diff --git a/conf/modules/airspeed_sdp3x.xml b/conf/modules/airspeed_sdp3x.xml index 09abf49ab2..64c481c5ef 100644 --- a/conf/modules/airspeed_sdp3x.xml +++ b/conf/modules/airspeed_sdp3x.xml @@ -1,6 +1,6 @@ - + SDP3X differential pressure sensor for e.g measuring airspeed. @@ -26,6 +26,10 @@ + + i2c + airspeed +
diff --git a/conf/modules/airspeed_uADC.xml b/conf/modules/airspeed_uADC.xml index a53ee2d9db..c90801bf07 100644 --- a/conf/modules/airspeed_uADC.xml +++ b/conf/modules/airspeed_uADC.xml @@ -1,6 +1,6 @@ - + Driver for the Aeroprobe uADC air data computer. @@ -13,6 +13,10 @@ + + uart + airspeed,aoa +
diff --git a/conf/modules/autopilot_gnc.xml b/conf/modules/autopilot_gnc.xml new file mode 100644 index 0000000000..56298af4b7 --- /dev/null +++ b/conf/modules/autopilot_gnc.xml @@ -0,0 +1,31 @@ + + + + + + Autopilot Guidance Navigation anc Control + + + + system_core,@guidance,@navigation,@commands + autopilot + +
+ +
+ + + + + + + + + + + + + + +
+ diff --git a/conf/modules/baro_MS5534A.xml b/conf/modules/baro_MS5534A.xml index 9c6b65d4cb..0b6a197185 100644 --- a/conf/modules/baro_MS5534A.xml +++ b/conf/modules/baro_MS5534A.xml @@ -1,6 +1,6 @@ - + MS5534a barometer (SPI) @@ -9,6 +9,7 @@
spi_master + baro diff --git a/conf/modules/baro_amsys.xml b/conf/modules/baro_amsys.xml index e080cf9944..79b7bb2cce 100644 --- a/conf/modules/baro_amsys.xml +++ b/conf/modules/baro_amsys.xml @@ -1,6 +1,6 @@ - + Baro AMSYS (I2C). @@ -21,6 +21,10 @@ + + i2c + baro +
diff --git a/conf/modules/baro_bmp.xml b/conf/modules/baro_bmp.xml index f05b6cc48f..da19927ec4 100644 --- a/conf/modules/baro_bmp.xml +++ b/conf/modules/baro_bmp.xml @@ -1,11 +1,15 @@ - + Bosch BMP085 pressure sensor + + i2c + baro +
diff --git a/conf/modules/baro_bmp280_i2c.xml b/conf/modules/baro_bmp280_i2c.xml index 3c71e5ecea..2d850bd3a8 100644 --- a/conf/modules/baro_bmp280_i2c.xml +++ b/conf/modules/baro_bmp280_i2c.xml @@ -1,6 +1,6 @@ - + Bosch-Sensortech BMP280xx pressure sensor @@ -9,6 +9,10 @@ + + i2c + baro +
diff --git a/conf/modules/baro_bmp3.xml b/conf/modules/baro_bmp3.xml index f41e6f44b7..1b5e95e327 100644 --- a/conf/modules/baro_bmp3.xml +++ b/conf/modules/baro_bmp3.xml @@ -1,6 +1,6 @@ - + Bosch-Sensortech BMP3xx pressure sensor @@ -10,6 +10,10 @@ + + i2c + baro +
diff --git a/conf/modules/baro_board.xml b/conf/modules/baro_board.xml new file mode 100644 index 0000000000..b61ed01659 --- /dev/null +++ b/conf/modules/baro_board.xml @@ -0,0 +1,263 @@ + + + + + + Magic module to load the proper baro for a board (if supported) + + This module should be replaced by a proper loading of the correct module + in each board or airframe file + + + + + baro_board_common + + + +ifeq ($(USE_BARO_BOARD), TRUE) + +# Navstik baro +ifeq ($(BOARD), navstik) + BARO_BOARD_CFLAGS += -DUSE_I2C3 + BARO_BOARD_CFLAGS += -DBARO_BOARD=BARO_BOARD_BMP085 + BARO_BOARD_SRCS += peripherals/bmp085.c + BARO_BOARD_SRCS += $(SRC_BOARD)/baro_board.c + + +# Lisa/M baro +else ifeq ($(BOARD), lisa_m) + ifeq ($(BOARD_VERSION), 1.0) + # on lisa_m_1.0: defaults to i2c baro bmp085 on the board + LISA_M_BARO ?= BARO_BOARD_BMP085 + else ifeq ($(BOARD_VERSION), 2.0) + # on lisa_m_2.0: defaults to MS5611 baro connected via SPI on Aspirin2.2 + LISA_M_BARO ?= BARO_MS5611_SPI + else ifeq ($(BOARD_VERSION), 2.1) + # on lisa_m_2.1: defaults to MS5611 baro connected via SPI on the integrated Aspirin2.2 + LISA_M_BARO ?= BARO_MS5611_SPI + endif + ifeq ($(LISA_M_BARO), BARO_MS5611_SPI) + BARO_BOARD_CFLAGS += -DBARO_BOARD=BARO_MS5611_SPI + include $(CFG_SHARED)/spi_master.makefile + BARO_BOARD_CFLAGS += -DUSE_SPI2 -DUSE_SPI_SLAVE3 + BARO_BOARD_CFLAGS += -DBB_MS5611_SPI_DEV=spi2 + BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE3 + BARO_BOARD_SRCS += peripherals/ms5611.c + BARO_BOARD_SRCS += peripherals/ms5611_spi.c + BARO_BOARD_SRCS += boards/baro_board_ms5611_spi.c + else ifeq ($(LISA_M_BARO), BARO_MS5611_I2C) + BARO_BOARD_CFLAGS += -DBARO_BOARD=BARO_MS5611_I2C + BARO_BOARD_CFLAGS += -DUSE_I2C2 + BARO_BOARD_CFLAGS += -DBB_MS5611_I2C_DEV=i2c2 + BARO_BOARD_SRCS += peripherals/ms5611.c + BARO_BOARD_SRCS += peripherals/ms5611_i2c.c + BARO_BOARD_SRCS += boards/baro_board_ms5611_i2c.c + else ifeq ($(LISA_M_BARO), BARO_BOARD_BMP085) + BARO_BOARD_CFLAGS += -DBARO_BOARD=BARO_BOARD_BMP085 + BARO_BOARD_CFLAGS += -DUSE_I2C2 + BARO_BOARD_SRCS += peripherals/bmp085.c + BARO_BOARD_SRCS += $(SRC_BOARD)/baro_board.c + endif + +else ifeq ($(BOARD), lisa_mx) +# defaults to MS5611 via SPI on Aspirin +LISA_MX_BARO ?= BARO_MS5611_SPI + ifeq ($(LISA_MX_BARO), BARO_MS5611_SPI) + BARO_BOARD_CFLAGS += -DBARO_BOARD=BARO_MS5611_SPI + include $(CFG_SHARED)/spi_master.makefile + BARO_BOARD_CFLAGS += -DUSE_SPI2 -DUSE_SPI_SLAVE3 + BARO_BOARD_CFLAGS += -DBB_MS5611_SPI_DEV=spi2 + BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE3 + BARO_BOARD_SRCS += peripherals/ms5611.c + BARO_BOARD_SRCS += peripherals/ms5611_spi.c + BARO_BOARD_SRCS += boards/baro_board_ms5611_spi.c + else ifeq ($(LISA_MX_BARO), BARO_MS5611_I2C) + BARO_BOARD_CFLAGS += -DBARO_BOARD=BARO_MS5611_I2C + BARO_BOARD_CFLAGS += -DUSE_I2C2 + BARO_BOARD_CFLAGS += -DBB_MS5611_I2C_DEV=i2c2 + BARO_BOARD_SRCS += peripherals/ms5611.c + BARO_BOARD_SRCS += peripherals/ms5611_i2c.c + BARO_BOARD_SRCS += boards/baro_board_ms5611_i2c.c + else ifeq ($(LISA_MX_BARO), BARO_BOARD_BMP085) + BARO_BOARD_CFLAGS += -DBARO_BOARD=BARO_BOARD_BMP085 + BARO_BOARD_CFLAGS += -DUSE_I2C2 + BARO_BOARD_SRCS += peripherals/bmp085.c + BARO_BOARD_SRCS += $(SRC_BOARD)/baro_board.c + endif + + else ifeq ($(BOARD), lisa_mxs) +# defaults to MS5611 via SPI on Aspirin +LISA_MXS_BARO ?= BARO_MS5611_SPI + ifeq ($(LISA_MXS_BARO), BARO_MS5611_SPI) + BARO_BOARD_CFLAGS += -DBARO_BOARD=BARO_MS5611_SPI + include $(CFG_SHARED)/spi_master.makefile + BARO_BOARD_CFLAGS += -DUSE_SPI2 -DUSE_SPI_SLAVE3 + BARO_BOARD_CFLAGS += -DBB_MS5611_SPI_DEV=spi2 + BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE3 + BARO_BOARD_SRCS += peripherals/ms5611.c + BARO_BOARD_SRCS += peripherals/ms5611_spi.c + BARO_BOARD_SRCS += boards/baro_board_ms5611_spi.c + else ifeq ($(LISA_MXS_BARO), BARO_MS5611_I2C) + BARO_BOARD_CFLAGS += -DBARO_BOARD=BARO_MS5611_I2C + BARO_BOARD_CFLAGS += -DUSE_I2C2 + BARO_BOARD_CFLAGS += -DBB_MS5611_I2C_DEV=i2c2 + BARO_BOARD_SRCS += peripherals/ms5611.c + BARO_BOARD_SRCS += peripherals/ms5611_i2c.c + BARO_BOARD_SRCS += boards/baro_board_ms5611_i2c.c + else ifeq ($(LISA_MXS_BARO), BARO_BOARD_BMP085) + BARO_BOARD_CFLAGS += -DBARO_BOARD=BARO_BOARD_BMP085 + BARO_BOARD_CFLAGS += -DUSE_I2C2 + BARO_BOARD_SRCS += peripherals/bmp085.c + BARO_BOARD_SRCS += $(SRC_BOARD)/baro_board.c + endif + +# Lisa/S baro +else ifeq ($(BOARD), lisa_s) +# defaults to SPI baro MS5611 on the board + include $(CFG_SHARED)/spi_master.makefile + BARO_BOARD_CFLAGS += -DUSE_SPI1 -DUSE_SPI_SLAVE1 + BARO_BOARD_CFLAGS += -DBB_MS5611_SPI_DEV=spi1 + BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE1 + BARO_BOARD_SRCS += peripherals/ms5611.c + BARO_BOARD_SRCS += peripherals/ms5611_spi.c + BARO_BOARD_SRCS += boards/baro_board_ms5611_spi.c + +# ELLE0 baro +else ifeq ($(BOARD), elle0) + +# defaults to SPI baro MS5611 on the board + include $(CFG_SHARED)/spi_master.makefile + BARO_BOARD_CFLAGS += -DUSE_SPI1 -DUSE_SPI_SLAVE1 + BARO_BOARD_CFLAGS += -DBB_MS5611_SPI_DEV=spi1 + BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE1 + BARO_BOARD_SRCS += peripherals/ms5611.c + BARO_BOARD_SRCS += peripherals/ms5611_spi.c + BARO_BOARD_SRCS += boards/baro_board_ms5611_spi.c + +# Lia baro (no bmp onboard) +else ifeq ($(BOARD), lia) +# fixme, reuse the baro drivers in lisa_m dir +LIA_BARO ?= BARO_MS5611_SPI + ifeq ($(LIA_BARO), BARO_MS5611_SPI) + BARO_BOARD_CFLAGS += -DBARO_BOARD=BARO_MS5611_SPI + include $(CFG_SHARED)/spi_master.makefile + BARO_BOARD_CFLAGS += -DUSE_SPI2 -DUSE_SPI_SLAVE3 + BARO_BOARD_CFLAGS += -DBB_MS5611_SPI_DEV=spi2 + BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE3 + BARO_BOARD_SRCS += peripherals/ms5611.c + BARO_BOARD_SRCS += peripherals/ms5611_spi.c + BARO_BOARD_SRCS += boards/baro_board_ms5611_spi.c + else ifeq ($(LIA_BARO), BARO_MS5611_I2C) + BARO_BOARD_CFLAGS += -DBARO_BOARD=BARO_MS5611_I2C + BARO_BOARD_CFLAGS += -DUSE_I2C2 + BARO_BOARD_CFLAGS += -DBB_MS5611_I2C_DEV=i2c2 + BARO_BOARD_SRCS += peripherals/ms5611.c + BARO_BOARD_SRCS += peripherals/ms5611_i2c.c + BARO_BOARD_SRCS += boards/baro_board_ms5611_i2c.c + endif + + +# krooz baro +else ifeq ($(BOARD), krooz) + BARO_BOARD_CFLAGS += -DBB_MS5611_I2C_DEV=i2c2 + BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_ADDR=0xEC + BARO_BOARD_SRCS += peripherals/ms5611.c + BARO_BOARD_SRCS += peripherals/ms5611_i2c.c + BARO_BOARD_SRCS += boards/baro_board_ms5611_i2c.c + +# PX4FMU +else ifeq ($(BOARD),$(filter $(BOARD),px4fmu)) + include $(CFG_SHARED)/spi_master.makefile + BARO_BOARD_SRCS += peripherals/ms5611.c + BARO_BOARD_SRCS += peripherals/ms5611_spi.c + BARO_BOARD_SRCS += boards/baro_board_ms5611_spi.c + ifeq ($(BOARD_VERSION), 1.7) + # PX4FMU 1.7 + BARO_BOARD_CFLAGS += -DUSE_SPI1 -DUSE_SPI_SLAVE3 + BARO_BOARD_CFLAGS += -DBB_MS5611_SPI_DEV=spi1 + BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE3 + else ifeq ($(BOARD_VERSION), 2.4) + # PX4FMU 2.4 a.k.a. PIXHAWK + BARO_BOARD_CFLAGS += -DUSE_SPI1 -DUSE_SPI_SLAVE3 + BARO_BOARD_CFLAGS += -DBB_MS5611_SPI_DEV=spi1 + BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE3 + else ifeq ($(BOARD_VERSION), 4.0) + # PX4FMU 4.0 a.k.a. PX4_PIXRACER + BARO_BOARD_CFLAGS += -DUSE_SPI2 -DUSE_SPI_SLAVE3 + BARO_BOARD_CFLAGS += -DBB_MS5611_SPI_DEV=spi2 + BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE3 + else ifeq ($(BOARD_VERSION), 5.0) + # PX4FMU 5.0 + BARO_BOARD_CFLAGS += -DUSE_SPI4 -DUSE_SPI_SLAVE4 + BARO_BOARD_CFLAGS += -DBB_MS5611_SPI_DEV=spi4 + BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE4 + endif +# apogee baro +else ifeq ($(BOARD), apogee) + BARO_BOARD_CFLAGS += -DUSE_I2C1 + BARO_BOARD_SRCS += peripherals/mpl3115.c + BARO_BOARD_SRCS += $(SRC_BOARD)/baro_board.c + +# Umarim +else ifeq ($(BOARD), umarim) + ifeq ($(BOARD_VERSION), 1.0) + BARO_BOARD_CFLAGS += -DUSE_I2C1 -DUSE_ADS1114_1 + BARO_BOARD_CFLAGS += -DADS1114_I2C_DEV=i2c1 + BARO_BOARD_SRCS += peripherals/ads1114.c + BARO_BOARD_SRCS += boards/umarim/baro_board.c + endif + +# Naze32 +else ifeq ($(BOARD), naze32) + BARO_BOARD_CFLAGS += -DBARO_BOARD=BARO_MS5611_I2C + BARO_BOARD_CFLAGS += -DUSE_I2C2 + BARO_BOARD_CFLAGS += -DBB_MS5611_I2C_DEV=i2c2 + BARO_BOARD_SRCS += peripherals/ms5611.c + BARO_BOARD_SRCS += peripherals/ms5611_i2c.c + BARO_BOARD_SRCS += boards/baro_board_ms5611_i2c.c + +# OPA (AP) +else ifeq ($(BOARD), opa_ap) + include $(CFG_SHARED)/spi_master.makefile + BARO_BOARD_CFLAGS += -DUSE_SPI2 -DUSE_SPI_SLAVE2 + BARO_BOARD_CFLAGS += -DBB_MS5611_SPI_DEV=spi2 + BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_IDX=SPI_SLAVE2 + BARO_BOARD_SRCS += peripherals/ms5611.c + BARO_BOARD_SRCS += peripherals/ms5611_spi.c + BARO_BOARD_SRCS += boards/baro_board_ms5611_spi.c + +# OpenPilot Revo +else ifeq ($(BOARD), openpilot_revo) + ifeq ($(BOARD_VERSION), nano) + BARO_BOARD_CFLAGS += -DUSE_I2C3 + BARO_BOARD_CFLAGS += -DBB_MS5611_I2C_DEV=i2c3 + #BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_ADDR=0xEC + else + BARO_BOARD_CFLAGS += -DUSE_I2C1 + BARO_BOARD_CFLAGS += -DBB_MS5611_I2C_DEV=i2c1 + endif + BARO_BOARD_CFLAGS += -DBARO_BOARD=BARO_MS5611_I2C + BARO_BOARD_SRCS += peripherals/ms5611.c + BARO_BOARD_SRCS += peripherals/ms5611_i2c.c + BARO_BOARD_SRCS += boards/baro_board_ms5611_i2c.c + +else ifeq ($(BOARD), chimera) + BARO_BOARD_CFLAGS += -DBARO_BOARD=BARO_MS5611_I2C + BARO_BOARD_CFLAGS += -DUSE_I2C1 + BARO_BOARD_CFLAGS += -DBB_MS5611_I2C_DEV=i2c1 + BARO_BOARD_CFLAGS += -DBB_MS5611_SLAVE_ADDR=MS5611_I2C_SLAVE_ADDR_ALT + BARO_BOARD_SRCS += peripherals/ms5611.c + BARO_BOARD_SRCS += peripherals/ms5611_i2c.c + BARO_BOARD_SRCS += boards/baro_board_ms5611_i2c.c + +endif # check board + +ap.CFLAGS += $(BARO_BOARD_CFLAGS) +ap.srcs += $(BARO_BOARD_SRCS) + +endif # check USE_BARO_BOARD + + + + diff --git a/conf/modules/baro_board_common.xml b/conf/modules/baro_board_common.xml new file mode 100644 index 0000000000..40c4d0bf62 --- /dev/null +++ b/conf/modules/baro_board_common.xml @@ -0,0 +1,29 @@ + + + + + + Baro module calling internal barometer functions for boards supporting them + + + + + baro + +
+ +
+ + + + + + + + + + + + +
+ diff --git a/conf/modules/baro_ets.xml b/conf/modules/baro_ets.xml index 27c2647525..9e0fd29215 100644 --- a/conf/modules/baro_ets.xml +++ b/conf/modules/baro_ets.xml @@ -1,6 +1,6 @@ - + Baro ETS (I2C). @@ -25,6 +25,10 @@ + + i2c + baro +
diff --git a/conf/modules/baro_hca.xml b/conf/modules/baro_hca.xml index 4728733c50..2bb120d6b2 100644 --- a/conf/modules/baro_hca.xml +++ b/conf/modules/baro_hca.xml @@ -1,6 +1,6 @@ - + Baro sensortechnics HCA (I2C) @@ -9,6 +9,10 @@
+ + i2c + baro + diff --git a/conf/modules/baro_mpl3115.xml b/conf/modules/baro_mpl3115.xml index 13225e56c0..605c8c5df7 100644 --- a/conf/modules/baro_mpl3115.xml +++ b/conf/modules/baro_mpl3115.xml @@ -1,6 +1,6 @@ - + Baro MPL3115A2 (I2C) @@ -8,6 +8,10 @@ + + i2c + baro +
diff --git a/conf/modules/baro_ms5611_i2c.xml b/conf/modules/baro_ms5611_i2c.xml index 45a01b83b3..b89c551c0c 100644 --- a/conf/modules/baro_ms5611_i2c.xml +++ b/conf/modules/baro_ms5611_i2c.xml @@ -1,6 +1,6 @@ - + Baro MS5611 (I2C) @@ -9,15 +9,20 @@ + + i2c + baro +
- - + + + diff --git a/conf/modules/baro_ms5611_spi.xml b/conf/modules/baro_ms5611_spi.xml index 651f38f32b..46c3e21b14 100644 --- a/conf/modules/baro_ms5611_spi.xml +++ b/conf/modules/baro_ms5611_spi.xml @@ -1,6 +1,6 @@ - + Baro MS5611 (SPI) @@ -12,6 +12,7 @@ spi_master + baro
diff --git a/conf/modules/baro_scp_i2c.xml b/conf/modules/baro_scp_i2c.xml index 4320efb88a..873137f42e 100644 --- a/conf/modules/baro_scp_i2c.xml +++ b/conf/modules/baro_scp_i2c.xml @@ -1,11 +1,15 @@ - + VTI SCP1000 pressure sensor (I2C) + + i2c + baro +
diff --git a/conf/modules/baro_sim.xml b/conf/modules/baro_sim.xml index 84e359d8de..20c4662b14 100644 --- a/conf/modules/baro_sim.xml +++ b/conf/modules/baro_sim.xml @@ -1,12 +1,15 @@ - + Simulated barometer. Sends the BARO_ABS ABI message with gps.hmsl converted to absolute pressure. + + baro +
diff --git a/conf/modules/battery_monitor.xml b/conf/modules/battery_monitor.xml index 216c0ca833..9e84b9cbee 100644 --- a/conf/modules/battery_monitor.xml +++ b/conf/modules/battery_monitor.xml @@ -34,6 +34,9 @@ + + i2c +
diff --git a/conf/modules/bebop_cam.xml b/conf/modules/bebop_cam.xml index a5fb77ec15..56b56e1d41 100644 --- a/conf/modules/bebop_cam.xml +++ b/conf/modules/bebop_cam.xml @@ -54,7 +54,7 @@ - video_thread + i2c,video_thread
diff --git a/conf/modules/control.xml b/conf/modules/control.xml index 16a3f0ac3a..f32d888c49 100644 --- a/conf/modules/control.xml +++ b/conf/modules/control.xml @@ -1,6 +1,6 @@ - + Basic control for fixed-wing aircraft. diff --git a/conf/modules/control_adaptive.xml b/conf/modules/control_adaptive.xml index a3a8945a82..74a926103c 100644 --- a/conf/modules/control_adaptive.xml +++ b/conf/modules/control_adaptive.xml @@ -1,6 +1,6 @@ - + Adaptive control for fixed-wing aircraft. diff --git a/conf/modules/control_energy.xml b/conf/modules/control_energy.xml index 72cd54096c..6b8e21ddf9 100644 --- a/conf/modules/control_energy.xml +++ b/conf/modules/control_energy.xml @@ -1,6 +1,6 @@ - + Energy control for fixed-wing aircraft. diff --git a/conf/modules/control_energyadaptive.xml b/conf/modules/control_energyadaptive.xml index 801b8130f3..d3caf5dc65 100644 --- a/conf/modules/control_energyadaptive.xml +++ b/conf/modules/control_energyadaptive.xml @@ -1,6 +1,6 @@ - + Energy control for fixed-wing aircraft with adaptive stabilization. diff --git a/conf/modules/control_new.xml b/conf/modules/control_new.xml index 080950e92f..d709025996 100644 --- a/conf/modules/control_new.xml +++ b/conf/modules/control_new.xml @@ -1,6 +1,6 @@ - + Full PID control for fixed-wing aircraft. diff --git a/conf/modules/dac.xml b/conf/modules/dac.xml index a495c8f5dd..69f2d1dd1e 100644 --- a/conf/modules/dac.xml +++ b/conf/modules/dac.xml @@ -7,6 +7,9 @@ To activate a specific DAC input, define flag USE_DACX where X is your DAC input number + + mcu +
diff --git a/conf/modules/datalink_common.xml b/conf/modules/datalink_common.xml new file mode 100644 index 0000000000..ea550ed838 --- /dev/null +++ b/conf/modules/datalink_common.xml @@ -0,0 +1,59 @@ + + + + + + Common datalink interface for telemetry, downlink and uplink + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ diff --git a/conf/modules/electrical.xml b/conf/modules/electrical.xml new file mode 100644 index 0000000000..d1bfa18228 --- /dev/null +++ b/conf/modules/electrical.xml @@ -0,0 +1,32 @@ + + + + + + General electrical interface + + + + adc + electrical + +
+ +
+ + + + + + + + + + + + + + + +
+ diff --git a/conf/modules/fdm_jsbsim.xml b/conf/modules/fdm_jsbsim.xml index a0a3ce1982..20b1258f55 100644 --- a/conf/modules/fdm_jsbsim.xml +++ b/conf/modules/fdm_jsbsim.xml @@ -16,6 +16,9 @@
+ + baro +
@@ -25,18 +28,18 @@ ifeq ($(FIND_JSBSIM_VIA_PKG_CONFIG), yes) - nps.CFLAGS += $(shell pkg-config JSBSim --cflags) - nps.LDFLAGS += $(shell pkg-config JSBSim --libs) + $(TARGET).CFLAGS += $(shell pkg-config JSBSim --cflags) + $(TARGET).LDFLAGS += $(shell pkg-config JSBSim --libs) ifeq ($(shell pkg-config JSBSim --modversion), 1.0) - nps.CFLAGS += -DNPS_JSBSIM_USE_SGPATH=FALSE + $(TARGET).CFLAGS += -DNPS_JSBSIM_USE_SGPATH=FALSE else - nps.CFLAGS += -DNPS_JSBSIM_USE_SGPATH=$(JSBSIM_USE_SGPATH) + $(TARGET).CFLAGS += -DNPS_JSBSIM_USE_SGPATH=$(JSBSIM_USE_SGPATH) endif else FIND_JSBSIM_VIA_PKG_CONFIG = no - nps.CFLAGS += -I$(JSBSIM_INC) - nps.LDFLAGS += -L$(JSBSIM_LIB) -lJSBSim - nps.CFLAGS += -DNPS_JSBSIM_USE_SGPATH=$(JSBSIM_USE_SGPATH) + $(TARGET).CFLAGS += -I$(JSBSIM_INC) + $(TARGET).LDFLAGS += -L$(JSBSIM_LIB) -lJSBSim + $(TARGET).CFLAGS += -DNPS_JSBSIM_USE_SGPATH=$(JSBSIM_USE_SGPATH) endif diff --git a/conf/modules/filter_1euro_imu.xml b/conf/modules/filter_1euro_imu.xml index 5139909615..0aed978428 100644 --- a/conf/modules/filter_1euro_imu.xml +++ b/conf/modules/filter_1euro_imu.xml @@ -40,6 +40,9 @@ + + @imu +
diff --git a/conf/modules/flight_recorder.xml b/conf/modules/flight_recorder.xml index bdf9879134..51670983d2 100644 --- a/conf/modules/flight_recorder.xml +++ b/conf/modules/flight_recorder.xml @@ -1,6 +1,6 @@ - + Record flight data according to your telemetry file. diff --git a/conf/modules/gpio_ext_common.xml b/conf/modules/gpio_ext_common.xml index a06ded1d77..84845f4308 100644 --- a/conf/modules/gpio_ext_common.xml +++ b/conf/modules/gpio_ext_common.xml @@ -10,6 +10,9 @@ redirects calls with port GPIOEXTx to modules. See gpio_ext_pca95xx as an example implementation. + + mcu +
diff --git a/conf/modules/gps.xml b/conf/modules/gps.xml index ad355560ed..9059ee81bf 100644 --- a/conf/modules/gps.xml +++ b/conf/modules/gps.xml @@ -1,6 +1,6 @@ - + Generic GPS functions. diff --git a/conf/modules/gps_datalink.xml b/conf/modules/gps_datalink.xml index 7ff95bee85..f918ac7f41 100644 --- a/conf/modules/gps_datalink.xml +++ b/conf/modules/gps_datalink.xml @@ -1,13 +1,16 @@ - + Remote GPS via datalink. Parses the REMOTE_GPS and REMOTE_GPS_SMALL datalink messages and publishes it onboard via ABI. - + + gps,@datalink + gps +
diff --git a/conf/modules/gps_furuno.xml b/conf/modules/gps_furuno.xml index a8798a9b33..0a91393075 100644 --- a/conf/modules/gps_furuno.xml +++ b/conf/modules/gps_furuno.xml @@ -1,6 +1,6 @@ - + Furuno GPS (UART) @@ -9,7 +9,10 @@ - + + uart,gps + gps +
diff --git a/conf/modules/gps_mediatek_diy.xml b/conf/modules/gps_mediatek_diy.xml index 020bf5436e..f69ea5fad4 100644 --- a/conf/modules/gps_mediatek_diy.xml +++ b/conf/modules/gps_mediatek_diy.xml @@ -1,6 +1,6 @@ - + Mediatek MT3329 GPS (UART) @@ -9,7 +9,10 @@ - + + uart,gps + gps +
diff --git a/conf/modules/gps_nmea.xml b/conf/modules/gps_nmea.xml index 4cf997fd05..32c055df69 100644 --- a/conf/modules/gps_nmea.xml +++ b/conf/modules/gps_nmea.xml @@ -1,6 +1,6 @@ - + NMEA GPS (UART) @@ -9,7 +9,10 @@ - + + uart,gps + gps +
diff --git a/conf/modules/gps_nps.xml b/conf/modules/gps_nps.xml index 5617b17650..90ce0cab03 100644 --- a/conf/modules/gps_nps.xml +++ b/conf/modules/gps_nps.xml @@ -1,6 +1,6 @@ - + Simulated GPS for NPS. @@ -8,7 +8,10 @@ The GPS sensor configuration is done in the header file referenced by NPS_SENSORS_PARAMS. - + + gps + gps +
diff --git a/conf/modules/gps_optitrack.xml b/conf/modules/gps_optitrack.xml index c487066886..5332321314 100644 --- a/conf/modules/gps_optitrack.xml +++ b/conf/modules/gps_optitrack.xml @@ -1,6 +1,6 @@ - + Optitrack used as indoor GPS. @@ -9,8 +9,10 @@ So as a hack optitrack sends the heading in the GPS course field. - - + + gps_datalink + gps + diff --git a/conf/modules/gps_piksi.xml b/conf/modules/gps_piksi.xml index 45ead02506..70769ff0b4 100644 --- a/conf/modules/gps_piksi.xml +++ b/conf/modules/gps_piksi.xml @@ -1,6 +1,6 @@ - + Swift-Nav Piksi RTK GPS. @@ -9,7 +9,10 @@ - + + uart,gps + gps +
diff --git a/conf/modules/gps_sim.xml b/conf/modules/gps_sim.xml index fa9ed1ab9d..92e2ae8c08 100644 --- a/conf/modules/gps_sim.xml +++ b/conf/modules/gps_sim.xml @@ -1,13 +1,16 @@ - + Simulated GPS For simple fixedwing OCaml simulator. Does not model any GPS inaccuracies/noise. - + + gps + gps +
diff --git a/conf/modules/gps_sim_hitl.xml b/conf/modules/gps_sim_hitl.xml index efbe4f5d9b..03139b3ebd 100644 --- a/conf/modules/gps_sim_hitl.xml +++ b/conf/modules/gps_sim_hitl.xml @@ -1,13 +1,16 @@ - + Sim HITL GPS Simulate GPS for HITL (HardwareInTheLoop) from rotorcrafts horizontal/vertical reference system. - + + gps + gps +
diff --git a/conf/modules/gps_sirf.xml b/conf/modules/gps_sirf.xml index 8d71a9d8c7..5d92596fbc 100644 --- a/conf/modules/gps_sirf.xml +++ b/conf/modules/gps_sirf.xml @@ -1,6 +1,6 @@ - + Sirf GPS (UART) @@ -9,7 +9,10 @@ - + + uart,gps + gps +
diff --git a/conf/modules/gps_skytraq.xml b/conf/modules/gps_skytraq.xml index 3aa3d9b56a..5046b5b2e2 100644 --- a/conf/modules/gps_skytraq.xml +++ b/conf/modules/gps_skytraq.xml @@ -1,6 +1,6 @@ - + Skytraq GPS (UART) @@ -9,7 +9,10 @@ - + + uart,gps + gps +
diff --git a/conf/modules/gps_ublox.xml b/conf/modules/gps_ublox.xml index a1a69f4947..44ab97735a 100644 --- a/conf/modules/gps_ublox.xml +++ b/conf/modules/gps_ublox.xml @@ -1,6 +1,6 @@ - + U-blox GPS (UART) @@ -9,7 +9,10 @@ - + + uart,gps + gps +
diff --git a/conf/modules/gps_ubx_i2c.xml b/conf/modules/gps_ubx_i2c.xml index bfd7394a5a..7fc71b45c6 100644 --- a/conf/modules/gps_ubx_i2c.xml +++ b/conf/modules/gps_ubx_i2c.xml @@ -1,6 +1,6 @@ - + U-blox GPS (I2C) @@ -10,9 +10,11 @@ - gps_ublox + i2c,gps_ublox + gps - + +
diff --git a/conf/modules/gps_ubx_ucenter.xml b/conf/modules/gps_ubx_ucenter.xml index 64262fbf1e..7cb9a965e4 100644 --- a/conf/modules/gps_ubx_ucenter.xml +++ b/conf/modules/gps_ubx_ucenter.xml @@ -1,6 +1,6 @@ - + Ublox GPS autoconfiguration. diff --git a/conf/modules/gps_udp.xml b/conf/modules/gps_udp.xml index be095fdd52..337d3894d0 100644 --- a/conf/modules/gps_udp.xml +++ b/conf/modules/gps_udp.xml @@ -1,6 +1,6 @@ - + GPS via UDP. @@ -10,7 +10,10 @@ - + + udp,gps + gps +
diff --git a/conf/modules/guidance_basic_fw.xml b/conf/modules/guidance_basic_fw.xml index c435a1f325..c2772b0f67 100644 --- a/conf/modules/guidance_basic_fw.xml +++ b/conf/modules/guidance_basic_fw.xml @@ -1,6 +1,6 @@ - + Legacy vertical control for fixedwing aircraft based on throttle (default) or pitch @@ -45,6 +45,10 @@ + + @navigation + guidance,attitude_command +
diff --git a/conf/modules/guidance_energy.xml b/conf/modules/guidance_energy.xml index ff0a245976..169894982b 100644 --- a/conf/modules/guidance_energy.xml +++ b/conf/modules/guidance_energy.xml @@ -1,6 +1,6 @@ - + Energy based vertical control for fixedwing aircraft. @@ -58,6 +58,10 @@ + + @navigation + guidance,attitude_command +
diff --git a/conf/modules/guidance_full_pid_fw.xml b/conf/modules/guidance_full_pid_fw.xml index 985c49c0aa..c88d3f3276 100644 --- a/conf/modules/guidance_full_pid_fw.xml +++ b/conf/modules/guidance_full_pid_fw.xml @@ -1,6 +1,6 @@ - + Vertical control for fixedwing aircraft based on PID @@ -73,6 +73,10 @@ + + @navigation + guidance,attitude_command +
diff --git a/conf/modules/guidance_hybrid.xml b/conf/modules/guidance_hybrid.xml index 69d5650788..2e8de009c2 100644 --- a/conf/modules/guidance_hybrid.xml +++ b/conf/modules/guidance_hybrid.xml @@ -1,6 +1,6 @@ - + Guidance controller for hybrid vehicles @@ -18,6 +18,10 @@ + + @navigation + guidance,attitude_command +
diff --git a/conf/modules/guidance_indi.xml b/conf/modules/guidance_indi.xml index c2c5988738..26fc8cef8c 100644 --- a/conf/modules/guidance_indi.xml +++ b/conf/modules/guidance_indi.xml @@ -1,6 +1,6 @@ - + Guidance controller for rotorcraft using INDI @@ -15,6 +15,10 @@ + + @navigation + guidance,attitude_command +
diff --git a/conf/modules/guidance_indi_hybrid.xml b/conf/modules/guidance_indi_hybrid.xml index 106672d852..87211442ef 100644 --- a/conf/modules/guidance_indi_hybrid.xml +++ b/conf/modules/guidance_indi_hybrid.xml @@ -1,6 +1,6 @@ - + Guidance controller for hybrids using INDI @@ -21,6 +21,10 @@ + + @navigation + guidance,attitude_command +
diff --git a/conf/modules/guidance_rotorcraft.xml b/conf/modules/guidance_rotorcraft.xml index fd3f42c44e..b9c03021bb 100644 --- a/conf/modules/guidance_rotorcraft.xml +++ b/conf/modules/guidance_rotorcraft.xml @@ -1,6 +1,6 @@ - + Base guidance code for rotorcraft @@ -50,6 +50,10 @@ + + @navigation + guidance,attitude_command +
diff --git a/conf/modules/guidance_rover.xml b/conf/modules/guidance_rover.xml index 66ebc8cd16..88455e42b1 100644 --- a/conf/modules/guidance_rover.xml +++ b/conf/modules/guidance_rover.xml @@ -1,6 +1,6 @@ - + Base guidance code for rover @@ -18,6 +18,10 @@ + + @navigation + guidance,commands +
diff --git a/conf/modules/guidance_rover_holonomic.xml b/conf/modules/guidance_rover_holonomic.xml index 0a00a56050..4f5496b824 100644 --- a/conf/modules/guidance_rover_holonomic.xml +++ b/conf/modules/guidance_rover_holonomic.xml @@ -1,6 +1,6 @@ - + Holonomic guidance for rover @@ -18,6 +18,10 @@ + + @navigation + guidance,commands +
diff --git a/conf/modules/imu_apogee.xml b/conf/modules/imu_apogee.xml index 10d9e060ab..0d5274b7f8 100644 --- a/conf/modules/imu_apogee.xml +++ b/conf/modules/imu_apogee.xml @@ -1,14 +1,18 @@ - + Driver for IMU on Apogee board. - Accelerometer/Gyroscope: MPU60x0 via I2C1 - + + i2c,imu_common + imu + +
diff --git a/conf/modules/imu_apogee_mpu9150.xml b/conf/modules/imu_apogee_mpu9150.xml index 91d20b41c8..f050277ce9 100644 --- a/conf/modules/imu_apogee_mpu9150.xml +++ b/conf/modules/imu_apogee_mpu9150.xml @@ -1,6 +1,6 @@ - + Driver for IMU on Apogee board. @@ -16,6 +16,10 @@ + + i2c + imu,mag +
diff --git a/conf/modules/imu_ardrone2.xml b/conf/modules/imu_ardrone2.xml index 1b0889af5a..6b3b35c497 100644 --- a/conf/modules/imu_ardrone2.xml +++ b/conf/modules/imu_ardrone2.xml @@ -1,13 +1,17 @@ - + IMU on Parrot ARDrone2. - + + uart,imu_common + imu,mag,sonar + +
diff --git a/conf/modules/imu_aspirin_common.xml b/conf/modules/imu_aspirin_common.xml index 6a4cea90b2..2e22fcda05 100644 --- a/conf/modules/imu_aspirin_common.xml +++ b/conf/modules/imu_aspirin_common.xml @@ -1,6 +1,6 @@ - + Common functionality of Aspirin IMUs. @@ -22,10 +22,11 @@ - spi_master + spi_master,i2c,imu_common + imu,mag - +
diff --git a/conf/modules/imu_aspirin_i2c_common.xml b/conf/modules/imu_aspirin_i2c_common.xml index 4851412595..cff6f697b5 100644 --- a/conf/modules/imu_aspirin_i2c_common.xml +++ b/conf/modules/imu_aspirin_i2c_common.xml @@ -1,6 +1,6 @@ - + Common functionality of Aspirin IMUs using I2C only. @@ -19,8 +19,12 @@ - + + i2c,imu_common + imu,mag + +
diff --git a/conf/modules/imu_aspirin_i2c_v1.0.xml b/conf/modules/imu_aspirin_i2c_v1.0.xml index dbde1b20c4..a2cd6cc634 100644 --- a/conf/modules/imu_aspirin_i2c_v1.0.xml +++ b/conf/modules/imu_aspirin_i2c_v1.0.xml @@ -1,6 +1,6 @@ - + Aspirin v1.0 IMU using I2C only. @@ -19,8 +19,12 @@ - + + imu_aspirin_i2c_common + imu + + diff --git a/conf/modules/imu_aspirin_i2c_v1.5.xml b/conf/modules/imu_aspirin_i2c_v1.5.xml index 5d386d8630..b9cffe7079 100644 --- a/conf/modules/imu_aspirin_i2c_v1.5.xml +++ b/conf/modules/imu_aspirin_i2c_v1.5.xml @@ -1,6 +1,6 @@ - + Aspirin v1.5 IMU. @@ -10,8 +10,12 @@ For configuration see the imu_aspirin_common module - + + imu_aspirin_i2c_common + imu + + diff --git a/conf/modules/imu_aspirin_v1.0.xml b/conf/modules/imu_aspirin_v1.0.xml index 42a739e909..69928486d5 100644 --- a/conf/modules/imu_aspirin_v1.0.xml +++ b/conf/modules/imu_aspirin_v1.0.xml @@ -1,6 +1,6 @@ - + Aspirin v1.0 IMU. @@ -10,7 +10,12 @@ For configuration see the imu_aspirin_common module - + + imu_aspirin_common + imu + + + diff --git a/conf/modules/imu_aspirin_v1.5.xml b/conf/modules/imu_aspirin_v1.5.xml index 41971534eb..24400c5e35 100644 --- a/conf/modules/imu_aspirin_v1.5.xml +++ b/conf/modules/imu_aspirin_v1.5.xml @@ -1,6 +1,6 @@ - + Aspirin v1.5 IMU. diff --git a/conf/modules/imu_aspirin_v2.1.xml b/conf/modules/imu_aspirin_v2.1.xml index d0b2f49958..a25629ff81 100644 --- a/conf/modules/imu_aspirin_v2.1.xml +++ b/conf/modules/imu_aspirin_v2.1.xml @@ -1,6 +1,6 @@ - + Aspirin v2.1 IMU. @@ -9,7 +9,12 @@ For configuration see the imu_aspirin_v2_common module - + + imu_aspirin_v2_common + imu + + + diff --git a/conf/modules/imu_aspirin_v2.2.xml b/conf/modules/imu_aspirin_v2.2.xml index cf647aea00..bdaa89b808 100644 --- a/conf/modules/imu_aspirin_v2.2.xml +++ b/conf/modules/imu_aspirin_v2.2.xml @@ -1,6 +1,6 @@ - + Aspirin v2.2 IMU. @@ -10,8 +10,11 @@ For configuration see the imu_aspirin_v2_common module - - + + imu_aspirin_v2_common + imu + + diff --git a/conf/modules/imu_aspirin_v2_common.xml b/conf/modules/imu_aspirin_v2_common.xml index 3868323d02..02d0c37ebe 100644 --- a/conf/modules/imu_aspirin_v2_common.xml +++ b/conf/modules/imu_aspirin_v2_common.xml @@ -1,6 +1,6 @@ - + Common functionality of Aspirin v2 IMUs. @@ -21,10 +21,11 @@ - spi_master + spi_master,imu_common + imu,mag - +
diff --git a/conf/modules/imu_bebop.xml b/conf/modules/imu_bebop.xml index 1238091d1c..d10e12d475 100644 --- a/conf/modules/imu_bebop.xml +++ b/conf/modules/imu_bebop.xml @@ -1,6 +1,6 @@ - + Driver for IMU on the Parrot Bebop drone. @@ -17,8 +17,12 @@ - + + i2c,imu_common + imu,mag + +
diff --git a/conf/modules/imu_bmi088_i2c.xml b/conf/modules/imu_bmi088_i2c.xml index 0a51435e84..19c885bb9a 100644 --- a/conf/modules/imu_bmi088_i2c.xml +++ b/conf/modules/imu_bmi088_i2c.xml @@ -1,6 +1,6 @@ - + IMU with BMI088 via I2C. @@ -16,8 +16,12 @@ - + + i2c,imu_common + imu + +
diff --git a/conf/modules/imu_chimera.xml b/conf/modules/imu_chimera.xml index 22544d527d..0d24f8324f 100644 --- a/conf/modules/imu_chimera.xml +++ b/conf/modules/imu_chimera.xml @@ -1,6 +1,6 @@ - + MPU9250 IMU via SPI. diff --git a/conf/modules/imu_common.xml b/conf/modules/imu_common.xml index 36293f8202..165aff563b 100644 --- a/conf/modules/imu_common.xml +++ b/conf/modules/imu_common.xml @@ -1,6 +1,6 @@ - + Common part for all IMUs. diff --git a/conf/modules/imu_disco.xml b/conf/modules/imu_disco.xml index e458781029..54c7a1abce 100644 --- a/conf/modules/imu_disco.xml +++ b/conf/modules/imu_disco.xml @@ -1,6 +1,6 @@ - + Driver for IMU on the Parrot Disco drone. @@ -17,8 +17,12 @@ - + + i2c,imu_common + imu,mag + +
diff --git a/conf/modules/imu_drotek_10dof_v2.xml b/conf/modules/imu_drotek_10dof_v2.xml index f86bc4c8fc..0c3e757148 100644 --- a/conf/modules/imu_drotek_10dof_v2.xml +++ b/conf/modules/imu_drotek_10dof_v2.xml @@ -1,6 +1,6 @@ - + Drotek 10DOF V2 IMU via I2C. @@ -18,7 +18,11 @@ - + + i2c,imu_common + imu,mag + +
diff --git a/conf/modules/imu_elle0.xml b/conf/modules/imu_elle0.xml index a44bf8f8e7..633fb5700a 100644 --- a/conf/modules/imu_elle0.xml +++ b/conf/modules/imu_elle0.xml @@ -1,6 +1,6 @@ - + MPU9250 IMU via SPI. diff --git a/conf/modules/imu_gl1.xml b/conf/modules/imu_gl1.xml index 0ec38db55e..098d37555f 100644 --- a/conf/modules/imu_gl1.xml +++ b/conf/modules/imu_gl1.xml @@ -1,6 +1,6 @@ - + IMU from Goodluckbuy. @@ -19,8 +19,12 @@ - + + i2c,imu_common + imu,mag + +
diff --git a/conf/modules/imu_krooz_sd.xml b/conf/modules/imu_krooz_sd.xml index 4f81c290ec..949fd756f9 100644 --- a/conf/modules/imu_krooz_sd.xml +++ b/conf/modules/imu_krooz_sd.xml @@ -1,6 +1,6 @@ - + IMU on KroozSD board. @@ -16,8 +16,12 @@ - + + i2c,imu_common + imu,mag + +
diff --git a/conf/modules/imu_krooz_sd_memsic.xml b/conf/modules/imu_krooz_sd_memsic.xml index 59971e54fc..3097ecc9a1 100644 --- a/conf/modules/imu_krooz_sd_memsic.xml +++ b/conf/modules/imu_krooz_sd_memsic.xml @@ -1,6 +1,6 @@ - + IMU on KroozSD board. @@ -18,10 +18,11 @@ - spi_master + spi_master,i2c,imu_common + imu,mag - +
diff --git a/conf/modules/imu_lisa_m_v2.1.xml b/conf/modules/imu_lisa_m_v2.1.xml index beba3866a5..618eed1d9e 100644 --- a/conf/modules/imu_lisa_m_v2.1.xml +++ b/conf/modules/imu_lisa_m_v2.1.xml @@ -1,6 +1,6 @@ - + IMU on Lisa/M and MX v2.1 boards. @@ -16,7 +16,12 @@ - + + imu_aspirin_v2_common + imu + + + diff --git a/conf/modules/imu_lisa_mx_v2.1.xml b/conf/modules/imu_lisa_mx_v2.1.xml index 72a4844def..1266e66c2e 100644 --- a/conf/modules/imu_lisa_mx_v2.1.xml +++ b/conf/modules/imu_lisa_mx_v2.1.xml @@ -1,6 +1,6 @@ - + IMU on Lisa/MX v2.1 boards. diff --git a/conf/modules/imu_lisa_s_v1.0.xml b/conf/modules/imu_lisa_s_v1.0.xml index 22125737a8..f438fcaade 100644 --- a/conf/modules/imu_lisa_s_v1.0.xml +++ b/conf/modules/imu_lisa_s_v1.0.xml @@ -1,6 +1,6 @@ - + IMU on LisaS board. @@ -16,7 +16,12 @@ - + + imu_aspirin_v2_common + imu + + + diff --git a/conf/modules/imu_mpu6000.xml b/conf/modules/imu_mpu6000.xml index bc4f4a800f..c4be53cedb 100644 --- a/conf/modules/imu_mpu6000.xml +++ b/conf/modules/imu_mpu6000.xml @@ -1,6 +1,6 @@ - + IMU with MPU6000 via SPI. @@ -13,10 +13,11 @@ - spi_master + spi_master,imu_common + imu - +
diff --git a/conf/modules/imu_mpu6000_hmc5883.xml b/conf/modules/imu_mpu6000_hmc5883.xml index 850dfcc277..a6da7df2bd 100644 --- a/conf/modules/imu_mpu6000_hmc5883.xml +++ b/conf/modules/imu_mpu6000_hmc5883.xml @@ -1,6 +1,6 @@ - + IMU with MPU6000 and HMC5883. @@ -30,10 +30,11 @@ - spi_master + spi_master,i2c,imu_common + imu,mag - +
diff --git a/conf/modules/imu_mpu60x0_i2c.xml b/conf/modules/imu_mpu60x0_i2c.xml index 913602c82a..08eb5f65a9 100644 --- a/conf/modules/imu_mpu60x0_i2c.xml +++ b/conf/modules/imu_mpu60x0_i2c.xml @@ -1,6 +1,6 @@ - + IMU with MPU60x0 via I2C. @@ -12,8 +12,12 @@ - + + i2c,imu_common + imu + +
diff --git a/conf/modules/imu_mpu9250.xml b/conf/modules/imu_mpu9250.xml index 710dc43005..c732ab9813 100644 --- a/conf/modules/imu_mpu9250.xml +++ b/conf/modules/imu_mpu9250.xml @@ -1,6 +1,6 @@ - + Test module for the mpu9250 with I2C @@ -9,6 +9,12 @@ + + i2c,imu_common + imu,mag + + +
diff --git a/conf/modules/imu_mpu9250_i2c.xml b/conf/modules/imu_mpu9250_i2c.xml index bce3fd9eef..30caf8be22 100644 --- a/conf/modules/imu_mpu9250_i2c.xml +++ b/conf/modules/imu_mpu9250_i2c.xml @@ -1,6 +1,6 @@ - + IMU with MPU9250 via I2C. @@ -17,8 +17,12 @@ - + + i2c,imu_common + imu,mag + +
diff --git a/conf/modules/imu_mpu9250_spi.xml b/conf/modules/imu_mpu9250_spi.xml index 700aee05f2..573d99cb35 100644 --- a/conf/modules/imu_mpu9250_spi.xml +++ b/conf/modules/imu_mpu9250_spi.xml @@ -1,6 +1,6 @@ - + IMU with MPU9250 via SPI. @@ -22,10 +22,11 @@ - spi_master + spi_master,imu_common + imu,mag - +
diff --git a/conf/modules/imu_navstik.xml b/conf/modules/imu_navstik.xml index 3f737b4cf5..58a86d4d6f 100644 --- a/conf/modules/imu_navstik.xml +++ b/conf/modules/imu_navstik.xml @@ -1,6 +1,6 @@ - + Navstik IMU: MPU60x0 and HMC5883 via I2C. @@ -17,8 +17,12 @@ - + + i2c,imu_common + imu,mag + +
diff --git a/conf/modules/imu_nps.xml b/conf/modules/imu_nps.xml index a6501e2f34..646bf39c1f 100644 --- a/conf/modules/imu_nps.xml +++ b/conf/modules/imu_nps.xml @@ -1,12 +1,15 @@ - + Simulated IMU for NPS. - + + imu_common + imu,mag +
diff --git a/conf/modules/imu_openpilot_revo.xml b/conf/modules/imu_openpilot_revo.xml index 9485d8cafe..e45394b46a 100644 --- a/conf/modules/imu_openpilot_revo.xml +++ b/conf/modules/imu_openpilot_revo.xml @@ -1,6 +1,6 @@ - + Driver for IMU on OpenPilot Revo board. @@ -21,10 +21,11 @@ - spi_master + spi_master,i2c,imu_common + imu,mag - +
diff --git a/conf/modules/imu_openpilot_revo_nano.xml b/conf/modules/imu_openpilot_revo_nano.xml index fc9a33d3d0..b65ffcf981 100644 --- a/conf/modules/imu_openpilot_revo_nano.xml +++ b/conf/modules/imu_openpilot_revo_nano.xml @@ -1,6 +1,6 @@ - + IMU driver for OpenPilot Revo Nano. @@ -23,10 +23,11 @@ - spi_master + spi_master,imu_common + imu,mag - +
diff --git a/conf/modules/imu_pprzuav.xml b/conf/modules/imu_pprzuav.xml index ff6d33e8a3..6e4702bda6 100644 --- a/conf/modules/imu_pprzuav.xml +++ b/conf/modules/imu_pprzuav.xml @@ -1,6 +1,6 @@ - + PPZUAV IMU. @@ -19,8 +19,12 @@ - + + i2c,imu_common + imu,mag + +
diff --git a/conf/modules/imu_px4fmu_v1.7.xml b/conf/modules/imu_px4fmu_v1.7.xml index 079ec09217..82a8c8faa2 100644 --- a/conf/modules/imu_px4fmu_v1.7.xml +++ b/conf/modules/imu_px4fmu_v1.7.xml @@ -1,6 +1,6 @@ - + MPU6000 via SPI and HMC5883 via I2C on the PX4FMU v1.7 board @@ -11,10 +11,11 @@ - spi_master + spi_master,i2c,imu_common + imu,mag - +
diff --git a/conf/modules/imu_px4fmu_v2.4.xml b/conf/modules/imu_px4fmu_v2.4.xml index dcf3f9b718..f59dca4c5e 100644 --- a/conf/modules/imu_px4fmu_v2.4.xml +++ b/conf/modules/imu_px4fmu_v2.4.xml @@ -1,6 +1,6 @@ - + PX4 Pixhawk IMU via SPI. @@ -13,10 +13,11 @@ - spi_master + spi_master,i2c,imu_common + imu,mag - +
diff --git a/conf/modules/imu_quality_assessment.xml b/conf/modules/imu_quality_assessment.xml index 1d482b1ed5..05e56fe28c 100644 --- a/conf/modules/imu_quality_assessment.xml +++ b/conf/modules/imu_quality_assessment.xml @@ -1,6 +1,6 @@ - + Give comparable with IMU Health information. diff --git a/conf/modules/imu_sim.xml b/conf/modules/imu_sim.xml new file mode 100644 index 0000000000..b9d5fe5975 --- /dev/null +++ b/conf/modules/imu_sim.xml @@ -0,0 +1,14 @@ + + + + + + Dummy IMU for SIM. + + + + imu_common + imu,mag + + + diff --git a/conf/modules/imu_swing.xml b/conf/modules/imu_swing.xml index 00c9c75da0..61e7fdbef9 100644 --- a/conf/modules/imu_swing.xml +++ b/conf/modules/imu_swing.xml @@ -1,14 +1,18 @@ - + Driver for IMU on the Parrot Swing drone. - Accelerometer/Gyroscope: MPU6000 via I2C0 - + + i2c,imu_common + imu + +
diff --git a/conf/modules/imu_temp_ctrl.xml b/conf/modules/imu_temp_ctrl.xml index f283fb138f..5b669df189 100644 --- a/conf/modules/imu_temp_ctrl.xml +++ b/conf/modules/imu_temp_ctrl.xml @@ -1,6 +1,6 @@ - + Bebop2/Disco INS (MPU6x) sensor temperature control. diff --git a/conf/modules/imu_um6.xml b/conf/modules/imu_um6.xml index 2ecf581297..52a10446f3 100644 --- a/conf/modules/imu_um6.xml +++ b/conf/modules/imu_um6.xml @@ -1,6 +1,6 @@ - + CHR-UM6 IMU. @@ -8,8 +8,12 @@ - + + uart,imu_common + imu,mag + +
diff --git a/conf/modules/imu_vectornav.xml b/conf/modules/imu_vectornav.xml index 21a0323673..6494b049e6 100644 --- a/conf/modules/imu_vectornav.xml +++ b/conf/modules/imu_vectornav.xml @@ -1,6 +1,6 @@ - + Vectornav VN-200 over uart used as IMU. @@ -10,8 +10,12 @@ - + + uart,imu_common + imu + +
diff --git a/conf/modules/imu_xsens.xml b/conf/modules/imu_xsens.xml index bca2e7f03a..bb8fbc137d 100644 --- a/conf/modules/imu_xsens.xml +++ b/conf/modules/imu_xsens.xml @@ -1,6 +1,6 @@ - + XSens IMU. @@ -10,8 +10,12 @@ - + + uart,imu_common + imu,mag + +
diff --git a/conf/modules/ins.xml b/conf/modules/ins.xml index 2d70868c3f..30999e963a 100644 --- a/conf/modules/ins.xml +++ b/conf/modules/ins.xml @@ -1,6 +1,6 @@ - + simple INS with vertical filter. @@ -11,6 +11,10 @@ + + @imu,@gps + ins +
diff --git a/conf/modules/ins_alt_float.xml b/conf/modules/ins_alt_float.xml index 6959265bc4..e0fd6a4fa8 100644 --- a/conf/modules/ins_alt_float.xml +++ b/conf/modules/ins_alt_float.xml @@ -1,6 +1,6 @@ - + INS with Kalman Filter on altitude. @@ -12,6 +12,10 @@ + + @imu,@gps + ins +
diff --git a/conf/modules/ins_arduimu.xml b/conf/modules/ins_arduimu.xml index af5a2f6253..eeb9a6f64e 100644 --- a/conf/modules/ins_arduimu.xml +++ b/conf/modules/ins_arduimu.xml @@ -1,9 +1,13 @@ - + ArduIMU v2 + + @gps + imu,ins,ahrs +
diff --git a/conf/modules/ins_arduimu_basic.xml b/conf/modules/ins_arduimu_basic.xml index 438d4140a6..98073a2934 100644 --- a/conf/modules/ins_arduimu_basic.xml +++ b/conf/modules/ins_arduimu_basic.xml @@ -1,6 +1,6 @@ - + ArduIMU v2 @@ -15,6 +15,10 @@ + + @gps + imu,ins,ahrs +
diff --git a/conf/modules/ins_ekf2.xml b/conf/modules/ins_ekf2.xml index 9e1858e500..1f15a31bcb 100644 --- a/conf/modules/ins_ekf2.xml +++ b/conf/modules/ins_ekf2.xml @@ -1,6 +1,6 @@ - + simple INS and AHRS using EKF2 from PX4 @@ -25,6 +25,10 @@ + + @gps,@mag,@imu + ins,ahrs +
diff --git a/conf/modules/ins_extended.xml b/conf/modules/ins_extended.xml index b0aa764d80..35254c1797 100644 --- a/conf/modules/ins_extended.xml +++ b/conf/modules/ins_extended.xml @@ -1,6 +1,6 @@ - + extended INS with vertical filter using sonar. @@ -32,6 +32,10 @@ + + @imu,@gps + ins +
diff --git a/conf/modules/ins_float_invariant.xml b/conf/modules/ins_float_invariant.xml index d8778a200f..6de85d4311 100644 --- a/conf/modules/ins_float_invariant.xml +++ b/conf/modules/ins_float_invariant.xml @@ -1,6 +1,6 @@ - + Invariant INS (in float). @@ -29,6 +29,10 @@ + + @imu,@gps + ins,ahrs +
diff --git a/conf/modules/ins_gps_passthrough.xml b/conf/modules/ins_gps_passthrough.xml index 67e0e35d5e..1083abc6f3 100644 --- a/conf/modules/ins_gps_passthrough.xml +++ b/conf/modules/ins_gps_passthrough.xml @@ -1,12 +1,16 @@ - + INS which just passes GPS through. + + @gps + ins +
diff --git a/conf/modules/ins_hff.xml b/conf/modules/ins_hff.xml index e536cd22f2..2e8320e367 100644 --- a/conf/modules/ins_hff.xml +++ b/conf/modules/ins_hff.xml @@ -1,6 +1,6 @@ - + INS with float vertical and horizontal filters. @@ -11,6 +11,10 @@ + + @imu,@gps + ins +
diff --git a/conf/modules/ins_hff_extended.xml b/conf/modules/ins_hff_extended.xml index 30a6d7fdbf..250e7267b9 100644 --- a/conf/modules/ins_hff_extended.xml +++ b/conf/modules/ins_hff_extended.xml @@ -1,6 +1,6 @@ - + extended INS with vertical filter using sonar. @@ -26,6 +26,10 @@ + + @imu,@gps + ins +
diff --git a/conf/modules/ins_mekf_wind.xml b/conf/modules/ins_mekf_wind.xml index c584029606..0d3d8508c4 100644 --- a/conf/modules/ins_mekf_wind.xml +++ b/conf/modules/ins_mekf_wind.xml @@ -1,6 +1,6 @@ - + MEKF-Wind INS estimator. @@ -59,6 +59,10 @@ + + @imu,@gps,@airspeed + ahrs,ins +
diff --git a/conf/modules/ins_nps.xml b/conf/modules/ins_nps.xml index cafba1bc2a..c445087bec 100644 --- a/conf/modules/ins_nps.xml +++ b/conf/modules/ins_nps.xml @@ -1,11 +1,15 @@ - + Simulated AHRS and INS. + + @imu,@gps + ins +
diff --git a/conf/modules/ins_sim.xml b/conf/modules/ins_sim.xml index 5d3b4053a7..1e540521a5 100644 --- a/conf/modules/ins_sim.xml +++ b/conf/modules/ins_sim.xml @@ -1,12 +1,17 @@ - + Simulated AHRS and INS. - + + @imu,@gps + ins,ahrs + + +
diff --git a/conf/modules/ins_skeleton.xml b/conf/modules/ins_skeleton.xml index 7c8558c2f5..e369f7b467 100644 --- a/conf/modules/ins_skeleton.xml +++ b/conf/modules/ins_skeleton.xml @@ -1,6 +1,6 @@ - + INS module skeleton. @@ -18,6 +18,10 @@ + + @imu,@gps + ins +
diff --git a/conf/modules/ins_vectornav.xml b/conf/modules/ins_vectornav.xml index 3c61650205..05beb8d496 100644 --- a/conf/modules/ins_vectornav.xml +++ b/conf/modules/ins_vectornav.xml @@ -1,6 +1,6 @@ - + Vectornav INS Driver. @@ -8,9 +8,14 @@ - + + uart,gps + imu,ins,ahrs,gps + + +
diff --git a/conf/modules/ins_vn100.xml b/conf/modules/ins_vn100.xml index 57fabbb312..2d9fad0ace 100644 --- a/conf/modules/ins_vn100.xml +++ b/conf/modules/ins_vn100.xml @@ -1,14 +1,14 @@ - + VectorNav VN100 (SPI) - spi_master - + spi_master,gps + imu,mag,ins,ahrs,gps
diff --git a/conf/modules/ins_xsens.xml b/conf/modules/ins_xsens.xml index 5cb433d6b9..49e7634d83 100644 --- a/conf/modules/ins_xsens.xml +++ b/conf/modules/ins_xsens.xml @@ -1,6 +1,6 @@ - + XSens Mti-G INS @@ -8,7 +8,10 @@ - + + uart,gps + ins,ahrs,gps +
diff --git a/conf/modules/ins_xsens700.xml b/conf/modules/ins_xsens700.xml index 4f1f2c603a..7889a730cc 100644 --- a/conf/modules/ins_xsens700.xml +++ b/conf/modules/ins_xsens700.xml @@ -1,6 +1,6 @@ - + XSens Mti-G 700 INS @@ -8,7 +8,10 @@ - + + uart,gps + ins,ahrs,gps +
diff --git a/conf/modules/intermcu_can.xml b/conf/modules/intermcu_can.xml index 94647d79d4..dd71d7ec70 100644 --- a/conf/modules/intermcu_can.xml +++ b/conf/modules/intermcu_can.xml @@ -1,6 +1,6 @@ - + Inter-MCU communication over CAN @@ -11,6 +11,9 @@ + + intermcu,commands,radio_control + ifeq (,$(findstring $(SEPARATE_FBW),1 TRUE)) diff --git a/conf/modules/intermcu_spi.xml b/conf/modules/intermcu_spi.xml index 9e226cc027..916516510d 100644 --- a/conf/modules/intermcu_spi.xml +++ b/conf/modules/intermcu_spi.xml @@ -1,6 +1,6 @@ - + Inter-MCU communication over SPI @@ -14,8 +14,9 @@ spi_master + intermcu,commands,radio_control - + ifeq (,$(findstring $(SEPARATE_FBW),1 TRUE)) diff --git a/conf/modules/intermcu_uart.xml b/conf/modules/intermcu_uart.xml index d91c7a74d7..088f473367 100644 --- a/conf/modules/intermcu_uart.xml +++ b/conf/modules/intermcu_uart.xml @@ -1,6 +1,6 @@ - + Inter-MCU communication over UART @@ -14,6 +14,16 @@ + + uart + intermcu,commands,radio_control + +
+ + +
+ + diff --git a/conf/modules/jevois.xml b/conf/modules/jevois.xml index 6e57e8c910..1596a75bfe 100644 --- a/conf/modules/jevois.xml +++ b/conf/modules/jevois.xml @@ -19,6 +19,9 @@ + + uart +
diff --git a/conf/modules/lidar_lite.xml b/conf/modules/lidar_lite.xml index 7e1715aadd..93f8de60e6 100644 --- a/conf/modules/lidar_lite.xml +++ b/conf/modules/lidar_lite.xml @@ -13,7 +13,6 @@ - @@ -22,6 +21,10 @@ + + i2c + sonar +
diff --git a/conf/modules/lidar_sf11.xml b/conf/modules/lidar_sf11.xml index 7dd5cadeec..284ab28630 100644 --- a/conf/modules/lidar_sf11.xml +++ b/conf/modules/lidar_sf11.xml @@ -22,6 +22,10 @@ + + i2c + sonar +
diff --git a/conf/modules/lidar_tfmini.xml b/conf/modules/lidar_tfmini.xml index 0279febee3..c041f45bfa 100644 --- a/conf/modules/lidar_tfmini.xml +++ b/conf/modules/lidar_tfmini.xml @@ -19,6 +19,10 @@ + + uart + sonar +
diff --git a/conf/modules/lidar_tfmini_i2c.xml b/conf/modules/lidar_tfmini_i2c.xml index 02e3682028..9ebea9c5f2 100644 --- a/conf/modules/lidar_tfmini_i2c.xml +++ b/conf/modules/lidar_tfmini_i2c.xml @@ -31,6 +31,10 @@ + + i2c + sonar +
diff --git a/conf/modules/logger_control_effectiveness.xml b/conf/modules/logger_control_effectiveness.xml index a8ff4459f8..9dee98f2a2 100644 --- a/conf/modules/logger_control_effectiveness.xml +++ b/conf/modules/logger_control_effectiveness.xml @@ -1,6 +1,6 @@ - + Logs to a csv file data required to compute control effectiveness diff --git a/conf/modules/logger_dataflash.xml b/conf/modules/logger_dataflash.xml index 5dcc29d454..dd48ada7f7 100644 --- a/conf/modules/logger_dataflash.xml +++ b/conf/modules/logger_dataflash.xml @@ -1,6 +1,6 @@ - + SPI logger diff --git a/conf/modules/logger_file.xml b/conf/modules/logger_file.xml index acb2320f3d..b4cb07008d 100644 --- a/conf/modules/logger_file.xml +++ b/conf/modules/logger_file.xml @@ -1,6 +1,6 @@ - + Logs to a csv file. diff --git a/conf/modules/logger_sd_chibios.xml b/conf/modules/logger_sd_chibios.xml index 69bf7541e3..a5ca912118 100644 --- a/conf/modules/logger_sd_chibios.xml +++ b/conf/modules/logger_sd_chibios.xml @@ -1,6 +1,6 @@ - + Log on a SD card, either text or binary data. diff --git a/conf/modules/logger_sd_spi_direct.xml b/conf/modules/logger_sd_spi_direct.xml index f7ac850f1f..46f0cad52a 100644 --- a/conf/modules/logger_sd_spi_direct.xml +++ b/conf/modules/logger_sd_spi_direct.xml @@ -1,6 +1,6 @@ - + Direct SPI SD Logger that saves pprzlog messages to SD Card. diff --git a/conf/modules/logger_spi_link.xml b/conf/modules/logger_spi_link.xml index 57e685ef7b..25c662e326 100644 --- a/conf/modules/logger_spi_link.xml +++ b/conf/modules/logger_spi_link.xml @@ -1,6 +1,6 @@ - + Stream all IMU data to external High-Speed SD-logger via SPI diff --git a/conf/modules/logger_uart.xml b/conf/modules/logger_uart.xml index 405aa4ae72..b53d99f812 100644 --- a/conf/modules/logger_uart.xml +++ b/conf/modules/logger_uart.xml @@ -1,6 +1,6 @@ - + Stream IMU raw data over UART for off-board logging. diff --git a/conf/modules/mag_calib_ukf.xml b/conf/modules/mag_calib_ukf.xml index dd25dfd997..1afdd7596a 100644 --- a/conf/modules/mag_calib_ukf.xml +++ b/conf/modules/mag_calib_ukf.xml @@ -1,6 +1,6 @@ - + Calibrate magnetometer using UKF diff --git a/conf/modules/mag_hmc5843.xml b/conf/modules/mag_hmc5843.xml index 60deb84249..efb74ad442 100644 --- a/conf/modules/mag_hmc5843.xml +++ b/conf/modules/mag_hmc5843.xml @@ -1,10 +1,14 @@ - + hmc5843 magnetometer + + i2c + mag +
diff --git a/conf/modules/mag_hmc58xx.xml b/conf/modules/mag_hmc58xx.xml index f1d3cc7754..26fbbafdd4 100644 --- a/conf/modules/mag_hmc58xx.xml +++ b/conf/modules/mag_hmc58xx.xml @@ -1,6 +1,6 @@ - + HMC58xx magnetometer. @@ -22,6 +22,10 @@ + + i2c + mag +
diff --git a/conf/modules/mag_ist8310.xml b/conf/modules/mag_ist8310.xml index b032e6db36..fc0f6eaab9 100644 --- a/conf/modules/mag_ist8310.xml +++ b/conf/modules/mag_ist8310.xml @@ -1,6 +1,6 @@ - + ST IST8310 magnetometer. @@ -20,6 +20,10 @@ + + i2c + mag +
diff --git a/conf/modules/mag_lis3mdl.xml b/conf/modules/mag_lis3mdl.xml index 4a591d984d..cf8c583054 100644 --- a/conf/modules/mag_lis3mdl.xml +++ b/conf/modules/mag_lis3mdl.xml @@ -1,6 +1,6 @@ - + ST LIS3MDL magnetometer. @@ -20,6 +20,10 @@ + + i2c + mag +
diff --git a/conf/modules/mag_pitot_uart.xml b/conf/modules/mag_pitot_uart.xml index 341673aedc..0b583e8b32 100644 --- a/conf/modules/mag_pitot_uart.xml +++ b/conf/modules/mag_pitot_uart.xml @@ -1,6 +1,6 @@ - + Remotely located magnetometer and pitot tube over uart (RS232) communication @@ -9,6 +9,10 @@ + + uart + mag +
diff --git a/conf/modules/math.xml b/conf/modules/math.xml new file mode 100644 index 0000000000..2cdabff4c4 --- /dev/null +++ b/conf/modules/math.xml @@ -0,0 +1,41 @@ + + + + + + Math library. + - algebra (integer, float, double) + - geodetic (integer, float, double) + - trigo (int) + - orientation conversion + Basic functions, extra matrix decompositions not included. + + + + math + +
+ + + + + + + + + +
+ + + + + + + + + + + + +
+ diff --git a/conf/modules/mcu.xml b/conf/modules/mcu.xml index f0c2dc0a9b..d1fb5c698b 100644 --- a/conf/modules/mcu.xml +++ b/conf/modules/mcu.xml @@ -7,20 +7,28 @@ Also includes GPIO and LED drivers
+ + mcu +
-
+ + - - - - - + + + + + + + + +
diff --git a/conf/modules/mission_fw.xml b/conf/modules/mission_fw.xml index de5a4b4dce..006a7560c2 100644 --- a/conf/modules/mission_fw.xml +++ b/conf/modules/mission_fw.xml @@ -1,6 +1,6 @@ - + Interface for mission control of fixed wing aircraft. diff --git a/conf/modules/mission_rotorcraft.xml b/conf/modules/mission_rotorcraft.xml index a9fd03055a..60d7169c05 100644 --- a/conf/modules/mission_rotorcraft.xml +++ b/conf/modules/mission_rotorcraft.xml @@ -1,6 +1,6 @@ - + Interface for mission control of rotorcraft. diff --git a/conf/modules/module.dtd b/conf/modules/module.dtd index 771f78dce9..f636bdbd46 100644 --- a/conf/modules/module.dtd +++ b/conf/modules/module.dtd @@ -12,7 +12,7 @@ - + @@ -44,7 +44,8 @@ type CDATA #IMPLIED> +fun CDATA #REQUIRED +cond CDATA #IMPLIED> +autorun (TRUE|FALSE|LOCK) #IMPLIED +cond CDATA #IMPLIED> - - +fun CDATA #REQUIRED +cond CDATA #IMPLIED> + + @commands + mixing +
diff --git a/conf/modules/nav_basic_fw.xml b/conf/modules/nav_basic_fw.xml index ef5cb74c7e..2ddb61174e 100644 --- a/conf/modules/nav_basic_fw.xml +++ b/conf/modules/nav_basic_fw.xml @@ -1,6 +1,6 @@ - + Standard navigation patterns and flight plan handling @@ -25,6 +25,9 @@ + + navigation +
diff --git a/conf/modules/nav_basic_rotorcraft.xml b/conf/modules/nav_basic_rotorcraft.xml index 6b9cd31315..41e24d7670 100644 --- a/conf/modules/nav_basic_rotorcraft.xml +++ b/conf/modules/nav_basic_rotorcraft.xml @@ -1,6 +1,6 @@ - + Standard navigation patterns and flight plan handling for rotorcraft @@ -19,6 +19,7 @@ guidance_rotorcraft + navigation
diff --git a/conf/modules/nav_bungee_takeoff.xml b/conf/modules/nav_bungee_takeoff.xml index df0f44a9ab..0f338e312e 100644 --- a/conf/modules/nav_bungee_takeoff.xml +++ b/conf/modules/nav_bungee_takeoff.xml @@ -1,6 +1,6 @@ - + Takeoff functions for bungee takeoff. @@ -19,6 +19,9 @@ + + @navigation +
diff --git a/conf/modules/nav_catapult.xml b/conf/modules/nav_catapult.xml index 4d8f76a23c..a63e11d5a7 100644 --- a/conf/modules/nav_catapult.xml +++ b/conf/modules/nav_catapult.xml @@ -1,6 +1,6 @@ - + Catapult launch timing system. @@ -44,6 +44,9 @@ Block example: + + @navigation +
diff --git a/conf/modules/nav_cube.xml b/conf/modules/nav_cube.xml index d0ba754ec7..3173493521 100644 --- a/conf/modules/nav_cube.xml +++ b/conf/modules/nav_cube.xml @@ -1,6 +1,6 @@ - + Fixedwing Navigation in a cube towards a center. @@ -24,6 +24,9 @@ + + @navigation +
diff --git a/conf/modules/nav_drop.xml b/conf/modules/nav_drop.xml index a19deff3f7..f734f57209 100644 --- a/conf/modules/nav_drop.xml +++ b/conf/modules/nav_drop.xml @@ -1,6 +1,6 @@ - + Compute the dropping point for a fixedwing aircraft. @@ -8,6 +8,9 @@ Needs some waypoints to be defined in the flight plan: REALEASE, CLIMB, BASELEG + + @navigation +
diff --git a/conf/modules/nav_fish.xml b/conf/modules/nav_fish.xml index aa6be6f46f..84a8f08d78 100644 --- a/conf/modules/nav_fish.xml +++ b/conf/modules/nav_fish.xml @@ -1,6 +1,6 @@ - + Bio-inspired swarm navigation @@ -44,6 +44,9 @@ + + @navigation +
diff --git a/conf/modules/nav_flower.xml b/conf/modules/nav_flower.xml index 751d743b79..90708c3142 100644 --- a/conf/modules/nav_flower.xml +++ b/conf/modules/nav_flower.xml @@ -1,11 +1,14 @@ - + Make a flower navigation pattern + + @navigation +
diff --git a/conf/modules/nav_gls.xml b/conf/modules/nav_gls.xml index 7833782716..cbf10a1374 100644 --- a/conf/modules/nav_gls.xml +++ b/conf/modules/nav_gls.xml @@ -1,6 +1,6 @@ - + gps landing system @@ -12,6 +12,9 @@
+ + @navigation + diff --git a/conf/modules/nav_heli_spinup.xml b/conf/modules/nav_heli_spinup.xml index c2976a5958..fe5c1bcbae 100644 --- a/conf/modules/nav_heli_spinup.xml +++ b/conf/modules/nav_heli_spinup.xml @@ -1,6 +1,6 @@ - + Helicopter Rotor spinup This module controls the spinup of the main rotor from a Helicopter. @@ -9,6 +9,9 @@ - Then call nav_heli_spinup_run + + @navigation +
diff --git a/conf/modules/nav_launcher.xml b/conf/modules/nav_launcher.xml index 3852c5bbc3..87980cb43c 100644 --- a/conf/modules/nav_launcher.xml +++ b/conf/modules/nav_launcher.xml @@ -1,6 +1,6 @@ - + Launcher. @@ -12,6 +12,9 @@ with takeoff circle radius, until you reach desired takeoff altitude + + @navigation +
diff --git a/conf/modules/nav_line.xml b/conf/modules/nav_line.xml index 36860ddb12..97ac1e0aec 100644 --- a/conf/modules/nav_line.xml +++ b/conf/modules/nav_line.xml @@ -1,6 +1,6 @@ - + Fixedwing navigation along a line with nice U-turns. @@ -11,6 +11,9 @@ + + @navigation +
diff --git a/conf/modules/nav_line_border.xml b/conf/modules/nav_line_border.xml index 080e8c2a87..ca0c9b31c0 100644 --- a/conf/modules/nav_line_border.xml +++ b/conf/modules/nav_line_border.xml @@ -1,6 +1,6 @@ - + navigate along a border line (line 1-2) with turns in the same direction @@ -16,6 +16,9 @@ + + @navigation +
diff --git a/conf/modules/nav_line_osam.xml b/conf/modules/nav_line_osam.xml index 2505f0aca4..232a4dd601 100644 --- a/conf/modules/nav_line_osam.xml +++ b/conf/modules/nav_line_osam.xml @@ -1,11 +1,14 @@ - + Fly along a line + + @navigation +
diff --git a/conf/modules/nav_poles.xml b/conf/modules/nav_poles.xml index 5c84ff836f..2defc8de80 100644 --- a/conf/modules/nav_poles.xml +++ b/conf/modules/nav_poles.xml @@ -1,6 +1,6 @@ - + Navigate around two poles @@ -13,6 +13,9 @@ + + @navigation +
diff --git a/conf/modules/nav_rover_base.xml b/conf/modules/nav_rover_base.xml index 25facbf880..064b3874b1 100644 --- a/conf/modules/nav_rover_base.xml +++ b/conf/modules/nav_rover_base.xml @@ -1,6 +1,6 @@ - + Basic navigation functions for Rovers @@ -15,6 +15,9 @@ + + navigation +
diff --git a/conf/modules/nav_skid_landing.xml b/conf/modules/nav_skid_landing.xml index 2a1a2973f0..f5b0b16772 100644 --- a/conf/modules/nav_skid_landing.xml +++ b/conf/modules/nav_skid_landing.xml @@ -1,6 +1,6 @@ - + Landing on skidpads @@ -49,6 +49,9 @@ + + @navigation +
diff --git a/conf/modules/nav_smooth.xml b/conf/modules/nav_smooth.xml index 80aa0d9496..0de2ef51ef 100644 --- a/conf/modules/nav_smooth.xml +++ b/conf/modules/nav_smooth.xml @@ -1,6 +1,6 @@ - + Smooth navigation to wp_a along an arc (around wp_cd), a segment (from wp_rd to wp_ta) and a second arc (around wp_ca). @@ -13,6 +13,9 @@ + + @navigation +
diff --git a/conf/modules/nav_spiral.xml b/conf/modules/nav_spiral.xml index 43aaae1233..ea5cc4cb19 100644 --- a/conf/modules/nav_spiral.xml +++ b/conf/modules/nav_spiral.xml @@ -1,6 +1,6 @@ - + Fixedwing navigation in a spiral/helix. @@ -11,6 +11,9 @@ + + @navigation +
diff --git a/conf/modules/nav_survey_disc.xml b/conf/modules/nav_survey_disc.xml index a9ee9079f3..86e79728a7 100644 --- a/conf/modules/nav_survey_disc.xml +++ b/conf/modules/nav_survey_disc.xml @@ -1,11 +1,14 @@ - + Disc Survey. + + @navigation +
diff --git a/conf/modules/nav_survey_poly_osam.xml b/conf/modules/nav_survey_poly_osam.xml index 5c7f637f49..7a44f5c8b1 100644 --- a/conf/modules/nav_survey_poly_osam.xml +++ b/conf/modules/nav_survey_poly_osam.xml @@ -1,6 +1,6 @@ - + Polygon survey from OSAM. @@ -28,6 +28,9 @@ You can use: + + @navigation +
diff --git a/conf/modules/nav_survey_poly_rotorcraft.xml b/conf/modules/nav_survey_poly_rotorcraft.xml index c57061f65e..8e841f5c6b 100644 --- a/conf/modules/nav_survey_poly_rotorcraft.xml +++ b/conf/modules/nav_survey_poly_rotorcraft.xml @@ -1,6 +1,6 @@ - + Polygon survey for rotorcraft. @@ -24,6 +24,9 @@ You can use: + + @navigation +
diff --git a/conf/modules/nav_survey_polygon.xml b/conf/modules/nav_survey_polygon.xml index 0a81ab61c3..36d9c0a12a 100644 --- a/conf/modules/nav_survey_polygon.xml +++ b/conf/modules/nav_survey_polygon.xml @@ -1,6 +1,6 @@ - + Survey a polygon with a fixedwing. @@ -26,6 +26,9 @@ Block example: --> + + @navigation +
diff --git a/conf/modules/nav_survey_rectangle_rotorcraft.xml b/conf/modules/nav_survey_rectangle_rotorcraft.xml index 66ca9c493f..753a14a41c 100644 --- a/conf/modules/nav_survey_rectangle_rotorcraft.xml +++ b/conf/modules/nav_survey_rectangle_rotorcraft.xml @@ -1,6 +1,6 @@ - + Survey a rectangle with a rotorcraft. @@ -40,6 +40,9 @@ or using flightplan primitive + + @navigation +
diff --git a/conf/modules/nav_survey_zamboni.xml b/conf/modules/nav_survey_zamboni.xml index cc31ce5992..0028e03ff3 100644 --- a/conf/modules/nav_survey_zamboni.xml +++ b/conf/modules/nav_survey_zamboni.xml @@ -1,11 +1,14 @@ - + Zamboni pattern survey for fixedwings. + + @navigation +
diff --git a/conf/modules/nav_vertical_raster.xml b/conf/modules/nav_vertical_raster.xml index 808291afae..9ae33ec8cc 100644 --- a/conf/modules/nav_vertical_raster.xml +++ b/conf/modules/nav_vertical_raster.xml @@ -1,11 +1,14 @@ - + Copy of nav line with altitude changes at every sweep + + @navigation +
diff --git a/conf/modules/navigation.xml b/conf/modules/navigation.xml index 66e44c5f05..96bbb84ef2 100644 --- a/conf/modules/navigation.xml +++ b/conf/modules/navigation.xml @@ -1,6 +1,6 @@ - + Meta module for loading proper navigation diff --git a/conf/modules/photogrammetry_calculator.xml b/conf/modules/photogrammetry_calculator.xml index 9d3d96600a..bcdbc20658 100644 --- a/conf/modules/photogrammetry_calculator.xml +++ b/conf/modules/photogrammetry_calculator.xml @@ -33,7 +33,7 @@ - + diff --git a/conf/modules/pipe.xml b/conf/modules/pipe.xml index 37ebba6693..a054050cac 100644 --- a/conf/modules/pipe.xml +++ b/conf/modules/pipe.xml @@ -17,6 +17,9 @@ + + mcu +
diff --git a/conf/modules/radio_control_cc2500_frsky.xml b/conf/modules/radio_control_cc2500_frsky.xml index cc1f5d0028..fc4b258b96 100644 --- a/conf/modules/radio_control_cc2500_frsky.xml +++ b/conf/modules/radio_control_cc2500_frsky.xml @@ -1,6 +1,6 @@ - + Software implementation of Frsky radio control protocol for onboard CC2500 receiver. @@ -37,6 +37,7 @@ spi_master + radio_control
diff --git a/conf/modules/radio_control_datalink.xml b/conf/modules/radio_control_datalink.xml index 81e8c00ab0..df70de5bb7 100644 --- a/conf/modules/radio_control_datalink.xml +++ b/conf/modules/radio_control_datalink.xml @@ -1,6 +1,6 @@ - + Radio control over datalink @@ -8,6 +8,9 @@ + + radio_control +
diff --git a/conf/modules/radio_control_hott.xml b/conf/modules/radio_control_hott.xml index 2487a6cda2..c1c0ea0be6 100644 --- a/conf/modules/radio_control_hott.xml +++ b/conf/modules/radio_control_hott.xml @@ -1,6 +1,6 @@ - + Radio control based on Graupner HOTT SUMD @@ -8,6 +8,10 @@ + + uart + radio_control +
diff --git a/conf/modules/radio_control_ppm.xml b/conf/modules/radio_control_ppm.xml index 1a6af7b651..c2e0e28b0a 100644 --- a/conf/modules/radio_control_ppm.xml +++ b/conf/modules/radio_control_ppm.xml @@ -1,6 +1,6 @@ - + Radio control based on PPM input @@ -13,6 +13,9 @@ + + radio_control +
diff --git a/conf/modules/radio_control_sbus.xml b/conf/modules/radio_control_sbus.xml index a72c561d78..478fc9ec9a 100644 --- a/conf/modules/radio_control_sbus.xml +++ b/conf/modules/radio_control_sbus.xml @@ -1,6 +1,6 @@ - + Radio control based on Futaba SBUS @@ -8,6 +8,10 @@ + + uart + radio_control +
diff --git a/conf/modules/radio_control_sbus_dual.xml b/conf/modules/radio_control_sbus_dual.xml index a39face4d3..a157b3745a 100644 --- a/conf/modules/radio_control_sbus_dual.xml +++ b/conf/modules/radio_control_sbus_dual.xml @@ -1,6 +1,6 @@ - + Radio control using two Futaba SBUS receivers @@ -9,6 +9,10 @@ + + uart + radio_control +
diff --git a/conf/modules/radio_control_spektrum.xml b/conf/modules/radio_control_spektrum.xml index 8e7bc531f2..d7c3637a04 100644 --- a/conf/modules/radio_control_spektrum.xml +++ b/conf/modules/radio_control_spektrum.xml @@ -1,6 +1,6 @@ - + Radio control based on Spektrum DSM2 or DSMX receivers @@ -14,6 +14,10 @@ + + uart + radio_control +
diff --git a/conf/modules/radio_control_superbitrf_rc.xml b/conf/modules/radio_control_superbitrf_rc.xml index 6a3b3b9cb5..ac586f838f 100644 --- a/conf/modules/radio_control_superbitrf_rc.xml +++ b/conf/modules/radio_control_superbitrf_rc.xml @@ -1,6 +1,6 @@ - + Radio control based on the SuperbitRF chip @@ -21,6 +21,7 @@ spi_master + radio_control
diff --git a/conf/modules/rng.xml b/conf/modules/rng.xml index 0a29142924..c132ea8e9a 100644 --- a/conf/modules/rng.xml +++ b/conf/modules/rng.xml @@ -6,6 +6,9 @@ Random Number Generator + + mcu +
diff --git a/conf/modules/settings.xml b/conf/modules/settings.xml new file mode 100644 index 0000000000..a1f0a09d89 --- /dev/null +++ b/conf/modules/settings.xml @@ -0,0 +1,23 @@ + + + + + + Settings interface + + + + settings + +
+ +
+ + + + + + +
+ + diff --git a/conf/modules/shell.xml b/conf/modules/shell.xml index 9b074cf33c..7a06ecf00c 100644 --- a/conf/modules/shell.xml +++ b/conf/modules/shell.xml @@ -1,5 +1,5 @@ - + Simple debug shell diff --git a/conf/modules/sonar_adc.xml b/conf/modules/sonar_adc.xml index bd8eb99174..b1fa718850 100644 --- a/conf/modules/sonar_adc.xml +++ b/conf/modules/sonar_adc.xml @@ -1,6 +1,6 @@ - + Sonar ADC driver. @@ -12,6 +12,10 @@ + + adc + sonar +
diff --git a/conf/modules/sonar_bebop.xml b/conf/modules/sonar_bebop.xml index cf0dd807b0..4cfdc1eb79 100644 --- a/conf/modules/sonar_bebop.xml +++ b/conf/modules/sonar_bebop.xml @@ -1,6 +1,6 @@ - + Bebop Sonar driver. @@ -12,7 +12,8 @@ - spi_master + spi_master,adc + sonar
diff --git a/conf/modules/sonar_pwm.xml b/conf/modules/sonar_pwm.xml index 4bc5a6ce8f..e82833ff1d 100644 --- a/conf/modules/sonar_pwm.xml +++ b/conf/modules/sonar_pwm.xml @@ -1,6 +1,6 @@ - + Driver for a PWM based sonar range sensor @@ -28,6 +28,7 @@ pwm_meas + sonar
diff --git a/conf/modules/sonar_vl53l1x.xml b/conf/modules/sonar_vl53l1x.xml index db02d01947..747eafd8ee 100644 --- a/conf/modules/sonar_vl53l1x.xml +++ b/conf/modules/sonar_vl53l1x.xml @@ -1,6 +1,6 @@ - + VL53L1X laser ranger AGL driver @@ -21,6 +21,10 @@ + + i2c + sonar +
diff --git a/conf/modules/spi_master.xml b/conf/modules/spi_master.xml index 8578fc82f0..f4a6300b4c 100644 --- a/conf/modules/spi_master.xml +++ b/conf/modules/spi_master.xml @@ -7,6 +7,9 @@ To activate a specific SPI peripheral, define flag USE_SPIX where X is your SPI peripheral number + + mcu +
diff --git a/conf/modules/stabilization_adaptive_fw.xml b/conf/modules/stabilization_adaptive_fw.xml index 0a4b3b205c..ea810886a5 100644 --- a/conf/modules/stabilization_adaptive_fw.xml +++ b/conf/modules/stabilization_adaptive_fw.xml @@ -1,6 +1,6 @@ - + Adaptive attitude and lateral (heading) control for fixedwing aircraft. @@ -65,6 +65,10 @@ + + @attitude_command + commands +
diff --git a/conf/modules/stabilization_attitude_fw.xml b/conf/modules/stabilization_attitude_fw.xml index 623981ef5e..7ddaf30ab0 100644 --- a/conf/modules/stabilization_attitude_fw.xml +++ b/conf/modules/stabilization_attitude_fw.xml @@ -1,6 +1,6 @@ - + Legacy attitude and lateral (heading) control for fixedwing aircraft @@ -46,6 +46,10 @@ + + @attitude_command + commands +
diff --git a/conf/modules/stabilization_float_euler.xml b/conf/modules/stabilization_float_euler.xml index b072a262e4..8c17928f61 100644 --- a/conf/modules/stabilization_float_euler.xml +++ b/conf/modules/stabilization_float_euler.xml @@ -1,6 +1,6 @@ - + Stabilization controller for rotorcraft using float euler implementation @@ -58,7 +58,8 @@ - stabilization_rotorcraft + stabilization_rotorcraft,@attitude_command + commands
diff --git a/conf/modules/stabilization_float_quat.xml b/conf/modules/stabilization_float_quat.xml index 1e1af8d617..6255f23d33 100644 --- a/conf/modules/stabilization_float_quat.xml +++ b/conf/modules/stabilization_float_quat.xml @@ -1,6 +1,6 @@ - + Stabilization controller for rotorcraft using float quaternion implementation @@ -64,7 +64,8 @@ - stabilization_rotorcraft + stabilization_rotorcraft,@attitude_command + commands
diff --git a/conf/modules/stabilization_heli_indi.xml b/conf/modules/stabilization_heli_indi.xml index 32ca2e0c37..ac6807d7f6 100644 --- a/conf/modules/stabilization_heli_indi.xml +++ b/conf/modules/stabilization_heli_indi.xml @@ -1,6 +1,6 @@ - + INDI stabilization controller for helicopters @@ -47,7 +47,8 @@ - stabilization_rotorcraft + stabilization_rotorcraft,@attitude_command + commands
diff --git a/conf/modules/stabilization_indi.xml b/conf/modules/stabilization_indi.xml index 4a2f725902..7e46aacbe0 100644 --- a/conf/modules/stabilization_indi.xml +++ b/conf/modules/stabilization_indi.xml @@ -1,6 +1,6 @@ - + Full INDI stabilization controller for rotorcraft @@ -55,7 +55,8 @@ - stabilization_rotorcraft + stabilization_rotorcraft,@attitude_command + commands
diff --git a/conf/modules/stabilization_indi_simple.xml b/conf/modules/stabilization_indi_simple.xml index 370c780828..3d71295645 100644 --- a/conf/modules/stabilization_indi_simple.xml +++ b/conf/modules/stabilization_indi_simple.xml @@ -1,6 +1,6 @@ - + Simple INDI stabilization controller for rotorcraft @@ -72,7 +72,8 @@ - stabilization_rotorcraft + stabilization_rotorcraft,@attitude_command + commands
diff --git a/conf/modules/stabilization_int_euler.xml b/conf/modules/stabilization_int_euler.xml index d0b9e56e08..0106db9e12 100644 --- a/conf/modules/stabilization_int_euler.xml +++ b/conf/modules/stabilization_int_euler.xml @@ -1,6 +1,6 @@ - + Stabilization controller for rotorcraft using integer euler implementation @@ -55,7 +55,8 @@ - stabilization_rotorcraft + stabilization_rotorcraft,@attitude_command + commands
diff --git a/conf/modules/stabilization_int_quat.xml b/conf/modules/stabilization_int_quat.xml index d353463f78..fddaf03db1 100644 --- a/conf/modules/stabilization_int_quat.xml +++ b/conf/modules/stabilization_int_quat.xml @@ -1,6 +1,6 @@ - + Stabilization controller for rotorcraft using integer quaternion implementation @@ -61,7 +61,8 @@ - stabilization_rotorcraft + stabilization_rotorcraft,@attitude_command + commands
diff --git a/conf/modules/stabilization_passthrough.xml b/conf/modules/stabilization_passthrough.xml index 5b07665ded..5c7f0c68eb 100644 --- a/conf/modules/stabilization_passthrough.xml +++ b/conf/modules/stabilization_passthrough.xml @@ -1,13 +1,14 @@ - + Passthrough controller for rotorcraft - stabilization_rotorcraft + stabilization_rotorcraft,@attitude_command + commands
diff --git a/conf/modules/stabilization_rate.xml b/conf/modules/stabilization_rate.xml index e204d8e6b2..c3cc50b77f 100644 --- a/conf/modules/stabilization_rate.xml +++ b/conf/modules/stabilization_rate.xml @@ -1,6 +1,6 @@ - + Rate controller for rotorcraft @@ -34,6 +34,7 @@ stabilization_rotorcraft + commands
diff --git a/conf/modules/stabilization_rate_indi.xml b/conf/modules/stabilization_rate_indi.xml index 10abb8d4b5..2c5044e0ab 100644 --- a/conf/modules/stabilization_rate_indi.xml +++ b/conf/modules/stabilization_rate_indi.xml @@ -1,6 +1,6 @@ - + Rate INDI controller for rotorcraft @@ -8,6 +8,7 @@ stabilization_indi|stabilization_indi_simple,stabilization_rotorcraft + commands
diff --git a/conf/modules/stabilization_rotorcraft.xml b/conf/modules/stabilization_rotorcraft.xml index 5647d98d41..5e654163b0 100644 --- a/conf/modules/stabilization_rotorcraft.xml +++ b/conf/modules/stabilization_rotorcraft.xml @@ -1,6 +1,6 @@ - + Base stabilization code for rotorcraft diff --git a/conf/modules/state_interface.xml b/conf/modules/state_interface.xml new file mode 100644 index 0000000000..dbc63e215f --- /dev/null +++ b/conf/modules/state_interface.xml @@ -0,0 +1,25 @@ + + + + + + State Interface + + Contains the state vector and all the necessary convertion functions + + + + math + state + +
+ +
+ + + + + +
+ + diff --git a/conf/modules/stereocam.xml b/conf/modules/stereocam.xml index 15585a9114..790d529c62 100644 --- a/conf/modules/stereocam.xml +++ b/conf/modules/stereocam.xml @@ -16,6 +16,9 @@
+ + uart +
diff --git a/conf/modules/sys_mon.xml b/conf/modules/sys_mon.xml index 14e96a3198..228c424edb 100644 --- a/conf/modules/sys_mon.xml +++ b/conf/modules/sys_mon.xml @@ -1,6 +1,6 @@ - + System monitor. diff --git a/conf/modules/system_core.xml b/conf/modules/system_core.xml new file mode 100644 index 0000000000..66f1684aea --- /dev/null +++ b/conf/modules/system_core.xml @@ -0,0 +1,47 @@ + + + + + + Core system components meta module + + Includes: sys_time, commands interfaces + + + + mcu,math,state_interface,@actuators|@intermcu,settings|@no_settings + core + + + + + + + + + + + + + + +VPATH += $(PAPARAZZI_HOME)/var/share +VPATH += $(PAPARAZZI_HOME)/sw/ext +$(TARGET).ARCHDIR = $(ARCH) + + + + + + + + + + + + + + + + + diff --git a/conf/modules/telemetry_bluegiga.xml b/conf/modules/telemetry_bluegiga.xml index 7e3d54967e..41ab7e95f9 100644 --- a/conf/modules/telemetry_bluegiga.xml +++ b/conf/modules/telemetry_bluegiga.xml @@ -23,7 +23,8 @@ - spi_master + spi_master,datalink_common + datalink,telemetry @@ -39,28 +40,12 @@ - - - - - - - - - - - - - - - - diff --git a/conf/modules/telemetry_intermcu.xml b/conf/modules/telemetry_intermcu.xml index 79c9ca565b..818bcad935 100644 --- a/conf/modules/telemetry_intermcu.xml +++ b/conf/modules/telemetry_intermcu.xml @@ -8,7 +8,11 @@ + + uart + datalink,telemetry +
diff --git a/conf/modules/telemetry_ivy.xml b/conf/modules/telemetry_ivy.xml index c8326a14d7..f2d86709a5 100644 --- a/conf/modules/telemetry_ivy.xml +++ b/conf/modules/telemetry_ivy.xml @@ -6,34 +6,19 @@ Telemetry using IVY + + datalink_common + datalink,telemetry +
- - - - - - - - - - - - - - - - - - -
diff --git a/conf/modules/telemetry_nps.xml b/conf/modules/telemetry_nps.xml index 7c878b8c4b..bd1aea60b8 100644 --- a/conf/modules/telemetry_nps.xml +++ b/conf/modules/telemetry_nps.xml @@ -13,6 +13,10 @@ + + udp,datalink_common + datalink,telemetry +
@@ -28,29 +32,12 @@ - - - - - - - include $(CFG_SHARED)/udp.makefile - - - - - - - - - -
diff --git a/conf/modules/telemetry_nps_secure.xml b/conf/modules/telemetry_nps_secure.xml index 00e3e1c72a..0163ad353f 100644 --- a/conf/modules/telemetry_nps_secure.xml +++ b/conf/modules/telemetry_nps_secure.xml @@ -13,7 +13,10 @@ - + + udp,datalink_common + datalink,telemetry + @@ -26,18 +29,6 @@ - - include $(CFG_SHARED)/udp.makefile - - - - - - - - - -
diff --git a/conf/modules/telemetry_secure_common.xml b/conf/modules/telemetry_secure_common.xml index 64f8f65a02..5c4a22d40c 100644 --- a/conf/modules/telemetry_secure_common.xml +++ b/conf/modules/telemetry_secure_common.xml @@ -8,7 +8,10 @@ - + + uart,datalink_common + datalink,telemetry + @@ -16,31 +19,13 @@ - - - - - - - - - - - - - - - - - - diff --git a/conf/modules/telemetry_sim.xml b/conf/modules/telemetry_sim.xml index c95d36c983..f70652d0d6 100644 --- a/conf/modules/telemetry_sim.xml +++ b/conf/modules/telemetry_sim.xml @@ -8,23 +8,19 @@ only a copy of telemetry ivy limited to sim target for now + + datalink_common + datalink,telemetry +
- - - - - - - - diff --git a/conf/modules/telemetry_superbitrf.xml b/conf/modules/telemetry_superbitrf.xml index 3d73a86bf3..a5c1a1494f 100644 --- a/conf/modules/telemetry_superbitrf.xml +++ b/conf/modules/telemetry_superbitrf.xml @@ -6,6 +6,10 @@ Telemetry using PPRZ protocol over SuperbitRF module + + datalink_common + datalink,telemetry +
@@ -14,28 +18,12 @@ - - - - - - - - - - - - - - - - diff --git a/conf/modules/telemetry_transparent.xml b/conf/modules/telemetry_transparent.xml index 0f78445515..5c4c35632f 100644 --- a/conf/modules/telemetry_transparent.xml +++ b/conf/modules/telemetry_transparent.xml @@ -10,6 +10,10 @@ + + uart,datalink_common + datalink,telemetry +
@@ -21,32 +25,12 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/conf/modules/telemetry_transparent_frsky_x.xml b/conf/modules/telemetry_transparent_frsky_x.xml index e6da71383b..f491c12fbc 100644 --- a/conf/modules/telemetry_transparent_frsky_x.xml +++ b/conf/modules/telemetry_transparent_frsky_x.xml @@ -19,6 +19,10 @@ conf for this low data rate. + + datalink_common + datalink,telemetry +
@@ -33,34 +37,14 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/conf/modules/telemetry_transparent_gec.xml b/conf/modules/telemetry_transparent_gec.xml index a278d40052..9b1e713047 100644 --- a/conf/modules/telemetry_transparent_gec.xml +++ b/conf/modules/telemetry_transparent_gec.xml @@ -6,11 +6,10 @@ Galois Embedded Crypto over transparent datalink - - - - - + + telemetry_secure_common,rng,haclc,datalink_common + datalink,telemetry +
diff --git a/conf/modules/telemetry_transparent_udp.xml b/conf/modules/telemetry_transparent_udp.xml index 388152d1d3..580ded4d1e 100644 --- a/conf/modules/telemetry_transparent_udp.xml +++ b/conf/modules/telemetry_transparent_udp.xml @@ -11,6 +11,10 @@ + + udp,datalink_common + datalink,telemetry +
@@ -27,35 +31,12 @@ - - - - - - - include $(CFG_SHARED)/udp.makefile - - - - - - - - - - - - - - - - diff --git a/conf/modules/telemetry_transparent_usb.xml b/conf/modules/telemetry_transparent_usb.xml index c4b40cf160..3b8eca0088 100644 --- a/conf/modules/telemetry_transparent_usb.xml +++ b/conf/modules/telemetry_transparent_usb.xml @@ -6,6 +6,10 @@ Telemetry using PPRZ protocol over serial USB (e.g. /dev/ttyACM0) + + datalink_common + datalink,telemetry +
@@ -14,34 +18,14 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/conf/modules/telemetry_w5100.xml b/conf/modules/telemetry_w5100.xml index 20075cb659..208875797e 100644 --- a/conf/modules/telemetry_w5100.xml +++ b/conf/modules/telemetry_w5100.xml @@ -16,6 +16,10 @@ + + spi_master,datalink_common + datalink,telemetry +
@@ -35,27 +39,11 @@ - - - - - - - - - - - - - - - - diff --git a/conf/modules/telemetry_xbee_api.xml b/conf/modules/telemetry_xbee_api.xml index bad72c94e3..18be4b9be3 100644 --- a/conf/modules/telemetry_xbee_api.xml +++ b/conf/modules/telemetry_xbee_api.xml @@ -9,6 +9,10 @@ + + uart,datalink_common + datalink,telemetry +
@@ -20,33 +24,13 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/conf/modules/tlsf.xml b/conf/modules/tlsf.xml index 5896ed285b..2a6d1c8286 100644 --- a/conf/modules/tlsf.xml +++ b/conf/modules/tlsf.xml @@ -1,6 +1,6 @@ - + Dynamic memory allocator diff --git a/conf/modules/traffic_info.xml b/conf/modules/traffic_info.xml index 97a53eb9e7..e3ab945471 100644 --- a/conf/modules/traffic_info.xml +++ b/conf/modules/traffic_info.xml @@ -1,6 +1,6 @@ - + Keeps track of other aircraft in airspace diff --git a/conf/modules/tune_airspeed.xml b/conf/modules/tune_airspeed.xml index bb11f4c4ca..a5829cb9e9 100644 --- a/conf/modules/tune_airspeed.xml +++ b/conf/modules/tune_airspeed.xml @@ -28,7 +28,7 @@
- +
diff --git a/conf/modules/uart.xml b/conf/modules/uart.xml index f8cda0b882..185298d830 100644 --- a/conf/modules/uart.xml +++ b/conf/modules/uart.xml @@ -7,6 +7,9 @@ To activate a specific UART peripheral, define flag USE_UARTX where X is your UART peripheral number
+ + mcu +
@@ -15,7 +18,7 @@ - + diff --git a/conf/modules/udp.xml b/conf/modules/udp.xml index 6a70fead1e..2730c50648 100644 --- a/conf/modules/udp.xml +++ b/conf/modules/udp.xml @@ -7,6 +7,9 @@ To activate a specific UDP peripheral, define flag USE_UDPX where X is your UDP peripheral number + + mcu +
@@ -16,7 +19,7 @@
- +