From f1d17c9003280498724211310c6e5601b1df44da Mon Sep 17 00:00:00 2001 From: Daniel Agar <daniel@agar.ca> Date: Mon, 11 Feb 2019 14:15:28 -0500 Subject: [PATCH] camera_capture add to all boards --- boards/auav/x21/default.cmake | 1 + boards/px4/fmu-v2/default.cmake | 1 + boards/px4/fmu-v2/fixedwing.cmake | 1 + boards/px4/fmu-v2/lpe.cmake | 1 + boards/px4/fmu-v2/multicopter.cmake | 1 + boards/px4/fmu-v2/rover.cmake | 1 + boards/px4/fmu-v3/default.cmake | 2 +- boards/px4/fmu-v3/rtps.cmake | 1 + boards/px4/fmu-v3/stackcheck.cmake | 15 ++++++++------- boards/px4/fmu-v4/default.cmake | 1 + boards/px4/fmu-v4/rtps.cmake | 1 + boards/px4/fmu-v4/stackcheck.cmake | 1 + boards/px4/fmu-v4pro/default.cmake | 3 ++- boards/px4/fmu-v5/default.cmake | 5 +++-- boards/px4/fmu-v5/fixedwing.cmake | 1 + boards/px4/fmu-v5/multicopter.cmake | 1 + boards/px4/fmu-v5/rover.cmake | 1 + boards/px4/fmu-v5/rtps.cmake | 5 +++-- boards/px4/fmu-v5/stackcheck.cmake | 5 +++-- 19 files changed, 33 insertions(+), 15 deletions(-) diff --git a/boards/auav/x21/default.cmake b/boards/auav/x21/default.cmake index d53fb224e2..cb32cc2464 100644 --- a/boards/auav/x21/default.cmake +++ b/boards/auav/x21/default.cmake @@ -18,6 +18,7 @@ px4_add_board( DRIVERS barometer # all available barometer drivers batt_smbus + camera_capture camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers diff --git a/boards/px4/fmu-v2/default.cmake b/boards/px4/fmu-v2/default.cmake index 19166f09eb..c908147807 100644 --- a/boards/px4/fmu-v2/default.cmake +++ b/boards/px4/fmu-v2/default.cmake @@ -23,6 +23,7 @@ px4_add_board( #barometer # all available barometer drivers barometer/ms5611 #batt_smbus + #camera_capture #camera_trigger #differential_pressure # all available differential pressure drivers differential_pressure/ms4525 diff --git a/boards/px4/fmu-v2/fixedwing.cmake b/boards/px4/fmu-v2/fixedwing.cmake index 162f82d955..a4dea2c9c2 100644 --- a/boards/px4/fmu-v2/fixedwing.cmake +++ b/boards/px4/fmu-v2/fixedwing.cmake @@ -21,6 +21,7 @@ px4_add_board( #barometer # all available barometer drivers barometer/ms5611 batt_smbus + camera_capture camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers diff --git a/boards/px4/fmu-v2/lpe.cmake b/boards/px4/fmu-v2/lpe.cmake index 2989307ca3..3c8fd1430c 100644 --- a/boards/px4/fmu-v2/lpe.cmake +++ b/boards/px4/fmu-v2/lpe.cmake @@ -22,6 +22,7 @@ px4_add_board( #barometer # all available barometer drivers barometer/ms5611 #batt_smbus + camera_capture camera_trigger #differential_pressure # all available differential pressure drivers #differential_pressure/ms4525 diff --git a/boards/px4/fmu-v2/multicopter.cmake b/boards/px4/fmu-v2/multicopter.cmake index 2f5b4c505b..07863896f8 100644 --- a/boards/px4/fmu-v2/multicopter.cmake +++ b/boards/px4/fmu-v2/multicopter.cmake @@ -19,6 +19,7 @@ px4_add_board( DRIVERS barometer/ms5611 batt_smbus + camera_capture camera_trigger distance_sensor # all available distance sensor drivers gps diff --git a/boards/px4/fmu-v2/rover.cmake b/boards/px4/fmu-v2/rover.cmake index bb42a84dff..85cbb62f5b 100644 --- a/boards/px4/fmu-v2/rover.cmake +++ b/boards/px4/fmu-v2/rover.cmake @@ -18,6 +18,7 @@ px4_add_board( DRIVERS barometer/ms5611 batt_smbus + camera_capture camera_trigger distance_sensor # all available distance sensor drivers gps diff --git a/boards/px4/fmu-v3/default.cmake b/boards/px4/fmu-v3/default.cmake index 3e6eec6e9e..82a63e92dc 100644 --- a/boards/px4/fmu-v3/default.cmake +++ b/boards/px4/fmu-v3/default.cmake @@ -22,8 +22,8 @@ px4_add_board( DRIVERS barometer # all available barometer drivers batt_smbus - camera_trigger camera_capture + camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers gps diff --git a/boards/px4/fmu-v3/rtps.cmake b/boards/px4/fmu-v3/rtps.cmake index f41a0a8476..b8c6423067 100644 --- a/boards/px4/fmu-v3/rtps.cmake +++ b/boards/px4/fmu-v3/rtps.cmake @@ -22,6 +22,7 @@ px4_add_board( DRIVERS barometer # all available barometer drivers batt_smbus + camera_capture camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers diff --git a/boards/px4/fmu-v3/stackcheck.cmake b/boards/px4/fmu-v3/stackcheck.cmake index 24ff0ea563..ffb875d3eb 100644 --- a/boards/px4/fmu-v3/stackcheck.cmake +++ b/boards/px4/fmu-v3/stackcheck.cmake @@ -22,24 +22,28 @@ px4_add_board( DRIVERS barometer # all available barometer drivers batt_smbus - lights/blinkm + camera_capture camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers gps #heater - #imu # all available imu drivers imu/adis16448 + #imu # all available imu drivers imu/l3gd20 imu/lsm303d imu/mpu6000 imu/mpu9250 irlock + lights/blinkm + lights/oreoled + lights/pca8574 + lights/rgbled + lights/rgbled_ncp5623c + #lights/rgbled_pwm magnetometer # all available magnetometer drivers #md25 mkblctrl - lights/oreoled - lights/pca8574 pca9685 #pmw3901 protocol_splitter @@ -48,9 +52,6 @@ px4_add_board( px4flow px4fmu px4io - lights/rgbled - lights/rgbled_ncp5623c - #lights/rgbled_pwm roboclaw stm32 stm32/adc diff --git a/boards/px4/fmu-v4/default.cmake b/boards/px4/fmu-v4/default.cmake index b300f71124..3d08ae2f7d 100644 --- a/boards/px4/fmu-v4/default.cmake +++ b/boards/px4/fmu-v4/default.cmake @@ -18,6 +18,7 @@ px4_add_board( DRIVERS barometer # all available barometer drivers batt_smbus + camera_capture camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers diff --git a/boards/px4/fmu-v4/rtps.cmake b/boards/px4/fmu-v4/rtps.cmake index 8b292d57a5..5b49a1e143 100644 --- a/boards/px4/fmu-v4/rtps.cmake +++ b/boards/px4/fmu-v4/rtps.cmake @@ -18,6 +18,7 @@ px4_add_board( DRIVERS barometer # all available barometer drivers batt_smbus + camera_capture camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers diff --git a/boards/px4/fmu-v4/stackcheck.cmake b/boards/px4/fmu-v4/stackcheck.cmake index 0409440312..8a5ff6e1ad 100644 --- a/boards/px4/fmu-v4/stackcheck.cmake +++ b/boards/px4/fmu-v4/stackcheck.cmake @@ -18,6 +18,7 @@ px4_add_board( DRIVERS barometer # all available barometer drivers batt_smbus + camera_capture camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers diff --git a/boards/px4/fmu-v4pro/default.cmake b/boards/px4/fmu-v4pro/default.cmake index 736718e0cd..57dd490aa1 100644 --- a/boards/px4/fmu-v4pro/default.cmake +++ b/boards/px4/fmu-v4pro/default.cmake @@ -21,6 +21,7 @@ px4_add_board( DRIVERS barometer # all available barometer drivers batt_smbus + camera_capture camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers @@ -35,13 +36,13 @@ px4_add_board( irlock lights/blinkm lights/oreoled + lights/pca8574 lights/rgbled lights/rgbled_ncp5623c #lights/rgbled_pwm magnetometer # all available magnetometer drivers #md25 mkblctrl - lights/pca8574 pca9685 #pmw3901 #protocol_splitter diff --git a/boards/px4/fmu-v5/default.cmake b/boards/px4/fmu-v5/default.cmake index d5bd745405..b0db71d036 100644 --- a/boards/px4/fmu-v5/default.cmake +++ b/boards/px4/fmu-v5/default.cmake @@ -20,8 +20,8 @@ px4_add_board( DRIVERS barometer # all available barometer drivers batt_smbus - camera_trigger camera_capture + camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers gps @@ -29,9 +29,9 @@ px4_add_board( imu/adis16448 #imu # all available imu drivers imu/bmi055 + imu/icm20948 imu/mpu6000 imu/mpu9250 - imu/icm20948 irlock lights/blinkm lights/oreoled @@ -124,4 +124,5 @@ px4_add_board( rover_steering_control # Rover example app segway uuv_example_app + ) diff --git a/boards/px4/fmu-v5/fixedwing.cmake b/boards/px4/fmu-v5/fixedwing.cmake index 008891fb10..1b2497198e 100644 --- a/boards/px4/fmu-v5/fixedwing.cmake +++ b/boards/px4/fmu-v5/fixedwing.cmake @@ -19,6 +19,7 @@ px4_add_board( DRIVERS barometer # all available barometer drivers batt_smbus + camera_capture camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers diff --git a/boards/px4/fmu-v5/multicopter.cmake b/boards/px4/fmu-v5/multicopter.cmake index 5ca7513988..1a2002dd98 100644 --- a/boards/px4/fmu-v5/multicopter.cmake +++ b/boards/px4/fmu-v5/multicopter.cmake @@ -20,6 +20,7 @@ px4_add_board( DRIVERS barometer # all available barometer drivers batt_smbus + camera_capture camera_trigger distance_sensor # all available distance sensor drivers gps diff --git a/boards/px4/fmu-v5/rover.cmake b/boards/px4/fmu-v5/rover.cmake index 5439f106ca..ae10915f6f 100644 --- a/boards/px4/fmu-v5/rover.cmake +++ b/boards/px4/fmu-v5/rover.cmake @@ -19,6 +19,7 @@ px4_add_board( DRIVERS barometer # all available barometer drivers batt_smbus + camera_capture camera_trigger distance_sensor # all available distance sensor drivers gps diff --git a/boards/px4/fmu-v5/rtps.cmake b/boards/px4/fmu-v5/rtps.cmake index 61bd96b99d..d027cd2827 100644 --- a/boards/px4/fmu-v5/rtps.cmake +++ b/boards/px4/fmu-v5/rtps.cmake @@ -20,6 +20,7 @@ px4_add_board( DRIVERS barometer # all available barometer drivers batt_smbus + camera_capture camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers @@ -28,19 +29,19 @@ px4_add_board( imu/adis16448 #imu # all available imu drivers imu/bmi055 + imu/icm20948 imu/mpu6000 imu/mpu9250 - imu/icm20948 irlock lights/blinkm lights/oreoled + lights/pca8574 lights/rgbled lights/rgbled_ncp5623c lights/rgbled_pwm magnetometer # all available magnetometer drivers #md25 mkblctrl - lights/pca8574 pca9685 pmw3901 protocol_splitter diff --git a/boards/px4/fmu-v5/stackcheck.cmake b/boards/px4/fmu-v5/stackcheck.cmake index 00e0f95c72..cd411716f6 100644 --- a/boards/px4/fmu-v5/stackcheck.cmake +++ b/boards/px4/fmu-v5/stackcheck.cmake @@ -20,6 +20,7 @@ px4_add_board( DRIVERS barometer # all available barometer drivers batt_smbus + camera_capture camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers @@ -28,19 +29,19 @@ px4_add_board( imu/adis16448 #imu # all available imu drivers imu/bmi055 + imu/icm20948 imu/mpu6000 imu/mpu9250 - imu/icm20948 #irlock #lights/blinkm #lights/oreoled + lights/pca8574 lights/rgbled #lights/rgbled_ncp5623c lights/rgbled_pwm magnetometer # all available magnetometer drivers #md25 mkblctrl - lights/pca8574 pca9685 pmw3901 #protocol_splitter -- GitLab