From b3e799e2777196d1e9b2708ee74ea7d8d434b26e Mon Sep 17 00:00:00 2001 From: Peter van der Perk Date: Wed, 18 Aug 2021 16:49:25 +0200 Subject: [PATCH] [Kconfig] Add all distance sensors --- Jenkinsfile | 26 +++++++------- Kconfig | 18 ++++++---- Tools/kconfig/cmake_kconfig_lut.txt | 9 ++++- boards/airmind/mindpx-v2/default.px4board | 2 +- boards/ark/can-flow/default.px4board | 1 + boards/av/x-v1/default.px4board | 2 +- boards/beaglebone/blue/default.px4board | 2 +- boards/bitcraze/crazyflie/default.px4board | 1 + boards/bitcraze/crazyflie21/default.px4board | 1 + boards/cuav/nora/default.px4board | 2 +- boards/cuav/x7pro/default.px4board | 2 +- boards/cubepilot/cubeorange/default.px4board | 2 +- boards/cubepilot/cubeyellow/default.px4board | 2 +- boards/emlid/navio2/default.px4board | 2 +- boards/holybro/durandal-v1/default.px4board | 2 +- boards/holybro/pix32v5/default.px4board | 2 +- boards/modalai/fc-v1/default.px4board | 2 +- boards/modalai/fc-v2/default.px4board | 2 +- boards/mro/ctrl-zero-f7-oem/default.px4board | 2 +- boards/mro/ctrl-zero-f7/default.px4board | 2 +- boards/mro/ctrl-zero-h7-oem/default.px4board | 2 +- boards/mro/ctrl-zero-h7/default.px4board | 2 +- boards/mro/pixracerpro/default.px4board | 2 +- boards/mro/x21-777/default.px4board | 2 +- boards/mro/x21/default.px4board | 2 +- boards/nxp/fmuk66-e/default.px4board | 3 +- boards/nxp/fmuk66-v3/default.px4board | 1 - boards/nxp/fmurt1062-v1/default.px4board | 2 +- boards/px4/fmu-v2/fixedwing.px4board | 2 ++ boards/px4/fmu-v2/multicopter.px4board | 2 +- boards/px4/fmu-v2/rover.px4board | 2 +- boards/px4/fmu-v2/test.px4board | 2 ++ boards/px4/fmu-v3/default.px4board | 2 +- boards/px4/fmu-v4/cannode.px4board | 1 - boards/px4/fmu-v4/default.px4board | 2 +- boards/px4/fmu-v4pro/default.px4board | 2 +- boards/px4/fmu-v5/ctrlalloc.px4board | 1 + boards/px4/fmu-v5/debug.px4board | 1 + boards/px4/fmu-v5/default.px4board | 1 - boards/px4/fmu-v5/fixedwing.px4board | 1 + boards/px4/fmu-v5/multicopter.px4board | 1 + boards/px4/fmu-v5/optimized.px4board | 1 + boards/px4/fmu-v5/rover.px4board | 1 + boards/px4/fmu-v5/stackcheck.px4board | 1 + boards/px4/fmu-v5/test.px4board | 1 + boards/px4/fmu-v5x/default.px4board | 2 +- boards/px4/fmu-v6u/default.px4board | 2 +- boards/px4/fmu-v6x/default.px4board | 2 +- boards/px4/raspberrypi/default.px4board | 2 +- boards/px4/sitl/Kconfig | 9 ----- boards/px4/sitl/test.px4board | 1 + boards/scumaker/pilotpi/default.px4board | 2 +- boards/spracing/h7extreme/default.px4board | 2 +- boards/uvify/core/default.px4board | 2 +- cmake/kconfig.cmake | 8 +++-- cmake/px4_config.cmake | 9 ----- src/drivers/distance_sensor/Kconfig | 34 ++++++++++++++----- src/drivers/distance_sensor/broadcom/Kconfig | 1 + .../distance_sensor/broadcom/afbrs50/Kconfig | 5 +++ 59 files changed, 120 insertions(+), 85 deletions(-) delete mode 100644 boards/px4/sitl/Kconfig create mode 100644 src/drivers/distance_sensor/broadcom/Kconfig create mode 100644 src/drivers/distance_sensor/broadcom/afbrs50/Kconfig diff --git a/Jenkinsfile b/Jenkinsfile index d30a56004e..281397fc39 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,7 @@ pipeline { // stage('Catkin build on ROS workspace') { // agent { // docker { - // image 'px4io/px4-dev-ros-melodic:latest' + // image 'px4io/px4-dev-ros-melodic:2021-08-18' // args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' // } // } @@ -56,7 +56,7 @@ pipeline { stage('Colcon build on ROS2 workspace') { agent { docker { - image 'px4io/px4-dev-ros2-foxy:latest' + image 'px4io/px4-dev-ros2-foxy:2021-08-18' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' } } @@ -85,7 +85,7 @@ pipeline { stage('Airframe') { agent { - docker { image 'px4io/px4-dev-base-focal:latest' } + docker { image 'px4io/px4-dev-base-focal:2021-08-18' } } steps { sh 'make distclean' @@ -105,7 +105,7 @@ pipeline { stage('Parameter') { agent { - docker { image 'px4io/px4-dev-base-focal:latest' } + docker { image 'px4io/px4-dev-base-focal:2021-08-18' } } steps { sh 'make distclean' @@ -125,7 +125,7 @@ pipeline { stage('Module') { agent { - docker { image 'px4io/px4-dev-base-focal:latest' } + docker { image 'px4io/px4-dev-base-focal:2021-08-18' } } steps { sh 'make distclean' @@ -145,7 +145,7 @@ pipeline { stage('msg file docs') { agent { - docker { image 'px4io/px4-dev-base-focal:latest' } + docker { image 'px4io/px4-dev-base-focal:2021-08-18' } } steps { sh 'mkdir -p build/msg_docs; ./msg/tools/generate_msg_docs.py -d build/msg_docs' @@ -164,7 +164,7 @@ pipeline { stage('uORB graphs') { agent { docker { - image 'px4io/px4-dev-nuttx-focal:latest' + image 'px4io/px4-dev-nuttx-focal:2021-08-18' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' } } @@ -194,7 +194,7 @@ pipeline { stage('Userguide') { agent { - docker { image 'px4io/px4-dev-base-focal:latest' } + docker { image 'px4io/px4-dev-base-focal:2021-08-18' } } steps { sh('export') @@ -228,7 +228,7 @@ pipeline { stage('QGroundControl') { agent { - docker { image 'px4io/px4-dev-base-focal:latest' } + docker { image 'px4io/px4-dev-base-focal:2021-08-18' } } steps { sh('export') @@ -256,7 +256,7 @@ pipeline { stage('microRTPS agent') { agent { - docker { image 'px4io/px4-dev-base-focal:latest' } + docker { image 'px4io/px4-dev-base-focal:2021-08-18' } } steps { sh('export') @@ -286,7 +286,7 @@ pipeline { stage('PX4 ROS msgs') { agent { - docker { image 'px4io/px4-dev-base-focal:latest' } + docker { image 'px4io/px4-dev-base-focal:2021-08-18' } } steps { sh('export') @@ -315,7 +315,7 @@ pipeline { stage('PX4 ROS2 bridge') { agent { - docker { image 'px4io/px4-dev-base-focal:latest' } + docker { image 'px4io/px4-dev-base-focal:2021-08-18' } } steps { sh('export') @@ -358,7 +358,7 @@ pipeline { stage('S3') { agent { - docker { image 'px4io/px4-dev-base-focal:latest' } + docker { image 'px4io/px4-dev-base-focal:2021-08-18' } } steps { sh('export') diff --git a/Kconfig b/Kconfig index 2b8ef70f7f..bc3a80e8b4 100644 --- a/Kconfig +++ b/Kconfig @@ -7,12 +7,6 @@ comment "Vendor: $(VENDOR)" comment "Model: $(MODEL)" comment "Label: $(LABEL)" -if $(HAS_CUSTOM_BOARD_KCONFIG) - menu "Custom board config" - osource "$(CUSTOM_BOARD_KCONFIG)" - endmenu -endif - menu "Toolchain" choice prompt "Platform" @@ -31,6 +25,18 @@ menu "Toolchain" default "posix" if PLATFORM_POSIX default "qurt" if PLATFORM_QURT + config BOARD_LOCKSTEP + bool "Force enable lockstep" + depends on PLATFORM_POSIX + help + forces lockstep behaviour, despite REPLAY env variable + + config BOARD_NOLOCKSTEP + bool "Force disable lockstep" + depends on PLATFORM_POSIX + help + forces nolockstep behaviour, despite REPLAY env variable + config BOARD_LINUX bool "Linux OS" depends on PLATFORM_POSIX diff --git a/Tools/kconfig/cmake_kconfig_lut.txt b/Tools/kconfig/cmake_kconfig_lut.txt index 0f021a5729..2c3dadd505 100644 --- a/Tools/kconfig/cmake_kconfig_lut.txt +++ b/Tools/kconfig/cmake_kconfig_lut.txt @@ -29,7 +29,13 @@ bootloaders,CONFIG_DRIVERS_BOOTLOADERS=y camera_capture,CONFIG_DRIVERS_CAMERA_CAPTURE=y camera_trigger,CONFIG_DRIVERS_CAMERA_TRIGGER=y differential_pressure,CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -distance_sensor,CONFIG_DRIVERS_DISTANCE_SENSOR=y +distance_sensor,CONFIG_COMMON_DISTANCE_SENSOR=y +distance_sensor/ll40ls,CONFIG_DRIVERS_DISTANCE_SENSOR_LL40LS=y +distance_sensor/lightware_laser_serial,CONFIG_DRIVERS_DISTANCE_SENSOR_LIGHTWARE_LASER_SERIAL=y +distance_sensor/broadcom/afbrs50,CONFIG_DRIVERS_DISTANCE_SENSOR_BROADCOM_AFBRS50=y +distance_sensor/vl53l0x,CONFIG_DRIVERS_DISTANCE_SENSOR_VL53L0X=y +distance_sensor/vl53l1x,CONFIG_DRIVERS_DISTANCE_SENSOR_VL53L1X=y +distance_sensor/srf05,CONFIG_DRIVERS_DISTANCE_SENSOR_SRF05=y dshot,CONFIG_DRIVERS_DSHOT=y gps,CONFIG_DRIVERS_GPS=y heater,CONFIG_DRIVERS_HEATER=y @@ -103,6 +109,7 @@ test_ppm,CONFIG_DRIVERS_TEST_PPM=y tone_alarm,CONFIG_DRIVERS_TONE_ALARM=y uavcan,CONFIG_DRIVERS_UAVCAN=y uavcannode,CONFIG_DRIVERS_UAVCANNODE=y +uavcannode_gps_demo,CONFIG_DRIVERS_UAVCANNODE_GPS_DEMO=y airship_att_control,CONFIG_MODULES_AIRSHIP_ATT_CONTROL=y airspeed_selector,CONFIG_MODULES_AIRSPEED_SELECTOR=y velocity_controller,CONFIG_MODULES_ANGULAR_VELOCITY_CONTROLLER=y diff --git a/boards/airmind/mindpx-v2/default.px4board b/boards/airmind/mindpx-v2/default.px4board index 3ce64a5fe5..61577e5dfc 100644 --- a/boards/airmind/mindpx-v2/default.px4board +++ b/boards/airmind/mindpx-v2/default.px4board @@ -11,7 +11,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948=y CONFIG_DRIVERS_IMU_INVENSENSE_MPU6000=y diff --git a/boards/ark/can-flow/default.px4board b/boards/ark/can-flow/default.px4board index 7bca84de83..4bdac31595 100644 --- a/boards/ark/can-flow/default.px4board +++ b/boards/ark/can-flow/default.px4board @@ -4,6 +4,7 @@ CONFIG_BOARD_ROMFSROOT="cannode" CONFIG_BOARD_CONSTRAINED_FLASH=y CONFIG_BOARD_CONSTRAINED_MEMORY=y CONFIG_DRIVERS_BOOTLOADERS=y +CONFIG_DRIVERS_DISTANCE_SENSOR_BROADCOM_AFBRS50=y CONFIG_DRIVERS_IMU_BOSCH_BMI088=y CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y CONFIG_DRIVERS_OPTICAL_FLOW_PAW3902=y diff --git a/boards/av/x-v1/default.px4board b/boards/av/x-v1/default.px4board index 87c226a7d3..f53e100d4f 100644 --- a/boards/av/x-v1/default.px4board +++ b/boards/av/x-v1/default.px4board @@ -13,7 +13,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_ADIS16477=y CONFIG_DRIVERS_IMU_ADIS16497=y diff --git a/boards/beaglebone/blue/default.px4board b/boards/beaglebone/blue/default.px4board index 90a2654423..305f5666b4 100644 --- a/boards/beaglebone/blue/default.px4board +++ b/boards/beaglebone/blue/default.px4board @@ -10,7 +10,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_ANALOG_DEVICES_ADIS16448=y CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948=y diff --git a/boards/bitcraze/crazyflie/default.px4board b/boards/bitcraze/crazyflie/default.px4board index c8bb8e0453..1a5c4e7b6c 100644 --- a/boards/bitcraze/crazyflie/default.px4board +++ b/boards/bitcraze/crazyflie/default.px4board @@ -4,6 +4,7 @@ CONFIG_BOARD_CONSTRAINED_FLASH=y CONFIG_BOARD_CONSTRAINED_MEMORY=y CONFIG_BOARD_COMPILE_DEFINITIONS="-Wno-narrowing" CONFIG_DRIVERS_BAROMETER_LPS25H=y +CONFIG_DRIVERS_DISTANCE_SENSOR_VL53L0X=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_INVENSENSE_MPU9250=y CONFIG_DRIVERS_MAGNETOMETER_AKM_AK8963=y diff --git a/boards/bitcraze/crazyflie21/default.px4board b/boards/bitcraze/crazyflie21/default.px4board index 38ea18674a..b05a8472c0 100644 --- a/boards/bitcraze/crazyflie21/default.px4board +++ b/boards/bitcraze/crazyflie21/default.px4board @@ -4,6 +4,7 @@ CONFIG_BOARD_CONSTRAINED_FLASH=y CONFIG_BOARD_CONSTRAINED_MEMORY=y CONFIG_BOARD_COMPILE_DEFINITIONS="-Wno-narrowing" CONFIG_DRIVERS_BAROMETER_BMP388=y +CONFIG_DRIVERS_DISTANCE_SENSOR_VL53L1X=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_PWM_OUT=y CONFIG_MODULES_ATTITUDE_ESTIMATOR_Q=y diff --git a/boards/cuav/nora/default.px4board b/boards/cuav/nora/default.px4board index dc38a92dc8..3d124deef2 100644 --- a/boards/cuav/nora/default.px4board +++ b/boards/cuav/nora/default.px4board @@ -12,7 +12,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_HEATER=y diff --git a/boards/cuav/x7pro/default.px4board b/boards/cuav/x7pro/default.px4board index e5b00a87de..e06714fdfc 100644 --- a/boards/cuav/x7pro/default.px4board +++ b/boards/cuav/x7pro/default.px4board @@ -12,7 +12,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_HEATER=y diff --git a/boards/cubepilot/cubeorange/default.px4board b/boards/cubepilot/cubeorange/default.px4board index 48a6aa0383..02cdd07f8c 100644 --- a/boards/cubepilot/cubeorange/default.px4board +++ b/boards/cubepilot/cubeorange/default.px4board @@ -14,7 +14,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_ANALOG_DEVICES_ADIS16448=y diff --git a/boards/cubepilot/cubeyellow/default.px4board b/boards/cubepilot/cubeyellow/default.px4board index ad6c85efdd..cc91bd9218 100644 --- a/boards/cubepilot/cubeyellow/default.px4board +++ b/boards/cubepilot/cubeyellow/default.px4board @@ -13,7 +13,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_ANALOG_DEVICES_ADIS16448=y diff --git a/boards/emlid/navio2/default.px4board b/boards/emlid/navio2/default.px4board index 9c78cdba07..188e5cb712 100644 --- a/boards/emlid/navio2/default.px4board +++ b/boards/emlid/navio2/default.px4board @@ -10,7 +10,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_ANALOG_DEVICES_ADIS16448=y CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948=y diff --git a/boards/holybro/durandal-v1/default.px4board b/boards/holybro/durandal-v1/default.px4board index d74fbcad6c..e35d6e51df 100644 --- a/boards/holybro/durandal-v1/default.px4board +++ b/boards/holybro/durandal-v1/default.px4board @@ -14,7 +14,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_HEATER=y diff --git a/boards/holybro/pix32v5/default.px4board b/boards/holybro/pix32v5/default.px4board index 92167fe08d..2cf48e30dd 100644 --- a/boards/holybro/pix32v5/default.px4board +++ b/boards/holybro/pix32v5/default.px4board @@ -13,7 +13,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_ANALOG_DEVICES_ADIS16448=y diff --git a/boards/modalai/fc-v1/default.px4board b/boards/modalai/fc-v1/default.px4board index 4a40df0c52..6603b3f0fe 100644 --- a/boards/modalai/fc-v1/default.px4board +++ b/boards/modalai/fc-v1/default.px4board @@ -11,7 +11,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_BOSCH_BMI088=y diff --git a/boards/modalai/fc-v2/default.px4board b/boards/modalai/fc-v2/default.px4board index 65fccd7f64..816e2052fe 100644 --- a/boards/modalai/fc-v2/default.px4board +++ b/boards/modalai/fc-v2/default.px4board @@ -11,7 +11,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_BOSCH_BMI088=y diff --git a/boards/mro/ctrl-zero-f7-oem/default.px4board b/boards/mro/ctrl-zero-f7-oem/default.px4board index 1567676033..2b9c0697c7 100644 --- a/boards/mro/ctrl-zero-f7-oem/default.px4board +++ b/boards/mro/ctrl-zero-f7-oem/default.px4board @@ -11,7 +11,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_BOSCH_BMI088=y diff --git a/boards/mro/ctrl-zero-f7/default.px4board b/boards/mro/ctrl-zero-f7/default.px4board index 78d3ebd383..40a599b209 100644 --- a/boards/mro/ctrl-zero-f7/default.px4board +++ b/boards/mro/ctrl-zero-f7/default.px4board @@ -10,7 +10,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_BOSCH_BMI088=y diff --git a/boards/mro/ctrl-zero-h7-oem/default.px4board b/boards/mro/ctrl-zero-h7-oem/default.px4board index e5dee2e87a..269f9cc43f 100644 --- a/boards/mro/ctrl-zero-h7-oem/default.px4board +++ b/boards/mro/ctrl-zero-h7-oem/default.px4board @@ -12,7 +12,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_BOSCH_BMI088=y diff --git a/boards/mro/ctrl-zero-h7/default.px4board b/boards/mro/ctrl-zero-h7/default.px4board index 0b4cb1fb63..fae922df73 100644 --- a/boards/mro/ctrl-zero-h7/default.px4board +++ b/boards/mro/ctrl-zero-h7/default.px4board @@ -12,7 +12,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_BOSCH_BMI088=y diff --git a/boards/mro/pixracerpro/default.px4board b/boards/mro/pixracerpro/default.px4board index 457a6207b5..ba9e2fdd4f 100644 --- a/boards/mro/pixracerpro/default.px4board +++ b/boards/mro/pixracerpro/default.px4board @@ -11,7 +11,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_BOSCH_BMI088=y diff --git a/boards/mro/x21-777/default.px4board b/boards/mro/x21-777/default.px4board index fc17a9513a..910d5806cd 100644 --- a/boards/mro/x21-777/default.px4board +++ b/boards/mro/x21-777/default.px4board @@ -11,7 +11,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_INVENSENSE_ICM20602=y diff --git a/boards/mro/x21/default.px4board b/boards/mro/x21/default.px4board index 8fa79d8e4f..733d1abaf8 100644 --- a/boards/mro/x21/default.px4board +++ b/boards/mro/x21/default.px4board @@ -12,7 +12,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_INVENSENSE_ICM20602=y diff --git a/boards/nxp/fmuk66-e/default.px4board b/boards/nxp/fmuk66-e/default.px4board index a38587e3b4..978c7b5c22 100644 --- a/boards/nxp/fmuk66-e/default.px4board +++ b/boards/nxp/fmuk66-e/default.px4board @@ -12,7 +12,8 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y +CONFIG_DRIVERS_DISTANCE_SENSOR_SRF05=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_BOSCH_BMI088=y CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948=y diff --git a/boards/nxp/fmuk66-v3/default.px4board b/boards/nxp/fmuk66-v3/default.px4board index 63398b5331..31fc2f875e 100644 --- a/boards/nxp/fmuk66-v3/default.px4board +++ b/boards/nxp/fmuk66-v3/default.px4board @@ -13,7 +13,6 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y CONFIG_DRIVERS_DISTANCE_SENSOR_SRF05=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_FXAS21002C=y diff --git a/boards/nxp/fmurt1062-v1/default.px4board b/boards/nxp/fmurt1062-v1/default.px4board index e57a05ced3..e527f7de50 100644 --- a/boards/nxp/fmurt1062-v1/default.px4board +++ b/boards/nxp/fmurt1062-v1/default.px4board @@ -9,7 +9,7 @@ CONFIG_COMMON_BAROMETERS=y CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_BOSCH_BMI055=y CONFIG_DRIVERS_IMU_INVENSENSE_ICM20602=y diff --git a/boards/px4/fmu-v2/fixedwing.px4board b/boards/px4/fmu-v2/fixedwing.px4board index d4a0966d2a..c2201bfcdc 100644 --- a/boards/px4/fmu-v2/fixedwing.px4board +++ b/boards/px4/fmu-v2/fixedwing.px4board @@ -1,6 +1,8 @@ CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y +CONFIG_DRIVERS_DISTANCE_SENSOR_LIGHTWARE_LASER_SERIAL=y +CONFIG_DRIVERS_DISTANCE_SENSOR_LL40LS=y CONFIG_MODULES_CAMERA_FEEDBACK=y CONFIG_MODULES_GYRO_CALIBRATION=y CONFIG_MODULES_TEMPERATURE_COMPENSATION=y diff --git a/boards/px4/fmu-v2/multicopter.px4board b/boards/px4/fmu-v2/multicopter.px4board index 80f21ab04d..506885d228 100644 --- a/boards/px4/fmu-v2/multicopter.px4board +++ b/boards/px4/fmu-v2/multicopter.px4board @@ -1,6 +1,6 @@ +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y CONFIG_DRIVERS_IRLOCK=y CONFIG_MODULES_CAMERA_FEEDBACK=y CONFIG_MODULES_LANDING_TARGET_ESTIMATOR=y diff --git a/boards/px4/fmu-v2/rover.px4board b/boards/px4/fmu-v2/rover.px4board index d55892a40e..9b974858f6 100644 --- a/boards/px4/fmu-v2/rover.px4board +++ b/boards/px4/fmu-v2/rover.px4board @@ -1,7 +1,7 @@ +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y CONFIG_DRIVERS_OPTICAL_FLOW_PX4FLOW=y CONFIG_DRIVERS_SMART_BATTERY_BATMON=y CONFIG_MODULES_CAMERA_FEEDBACK=y diff --git a/boards/px4/fmu-v2/test.px4board b/boards/px4/fmu-v2/test.px4board index 77d98df198..7542c499ce 100644 --- a/boards/px4/fmu-v2/test.px4board +++ b/boards/px4/fmu-v2/test.px4board @@ -1,4 +1,6 @@ CONFIG_BOARD_ROMFSROOT="px4fmu_test" CONFIG_BOARD_TESTING=y +CONFIG_DRIVERS_DISTANCE_SENSOR_LIGHTWARE_LASER_SERIAL=y +CONFIG_DRIVERS_DISTANCE_SENSOR_LL40LS=y CONFIG_SYSTEMCMDS_PERF=y CONFIG_SYSTEMCMDS_VER=y diff --git a/boards/px4/fmu-v3/default.px4board b/boards/px4/fmu-v3/default.px4board index eeb9c6d316..56a11de1a1 100644 --- a/boards/px4/fmu-v3/default.px4board +++ b/boards/px4/fmu-v3/default.px4board @@ -13,7 +13,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_HEATER=y diff --git a/boards/px4/fmu-v4/cannode.px4board b/boards/px4/fmu-v4/cannode.px4board index ed556707ec..fa88a3efd5 100644 --- a/boards/px4/fmu-v4/cannode.px4board +++ b/boards/px4/fmu-v4/cannode.px4board @@ -1,4 +1,3 @@ -CONFIG_DRIVERS_UAVCAN=n CONFIG_BOARD_ROMFSROOT="cannode" CONFIG_DRIVERS_BOOTLOADERS=y CONFIG_DRIVERS_UAVCANNODE=y diff --git a/boards/px4/fmu-v4/default.px4board b/boards/px4/fmu-v4/default.px4board index c7e52a22f4..c426bf7fbc 100644 --- a/boards/px4/fmu-v4/default.px4board +++ b/boards/px4/fmu-v4/default.px4board @@ -11,7 +11,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_HEATER=y diff --git a/boards/px4/fmu-v4pro/default.px4board b/boards/px4/fmu-v4pro/default.px4board index 9812533dfd..b5e120447f 100644 --- a/boards/px4/fmu-v4pro/default.px4board +++ b/boards/px4/fmu-v4pro/default.px4board @@ -14,7 +14,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_ANALOG_DEVICES_ADIS16448=y diff --git a/boards/px4/fmu-v5/ctrlalloc.px4board b/boards/px4/fmu-v5/ctrlalloc.px4board index 927e55ee8b..7214691f76 100644 --- a/boards/px4/fmu-v5/ctrlalloc.px4board +++ b/boards/px4/fmu-v5/ctrlalloc.px4board @@ -1,3 +1,4 @@ CONFIG_COMMON_BAROMETERS=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_COMMON_MAGNETOMETER=y CONFIG_MODULES_CONTROL_ALLOCATOR=y diff --git a/boards/px4/fmu-v5/debug.px4board b/boards/px4/fmu-v5/debug.px4board index b16d234dc9..9ee965cb86 100644 --- a/boards/px4/fmu-v5/debug.px4board +++ b/boards/px4/fmu-v5/debug.px4board @@ -1,5 +1,6 @@ CONFIG_BOARD_CONSTRAINED_FLASH=y CONFIG_BOARD_TESTING=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_COMMON_MAGNETOMETER=y CONFIG_DRIVERS_BAROMETER_MS5611=y CONFIG_DRIVERS_TEST_PPM=y diff --git a/boards/px4/fmu-v5/default.px4board b/boards/px4/fmu-v5/default.px4board index 6e1b5dc5a7..2cbc53ef3a 100644 --- a/boards/px4/fmu-v5/default.px4board +++ b/boards/px4/fmu-v5/default.px4board @@ -11,7 +11,6 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_HEATER=y diff --git a/boards/px4/fmu-v5/fixedwing.px4board b/boards/px4/fmu-v5/fixedwing.px4board index 09c940f6d1..6616b300c2 100644 --- a/boards/px4/fmu-v5/fixedwing.px4board +++ b/boards/px4/fmu-v5/fixedwing.px4board @@ -1,2 +1,3 @@ CONFIG_COMMON_BAROMETERS=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_COMMON_MAGNETOMETER=y diff --git a/boards/px4/fmu-v5/multicopter.px4board b/boards/px4/fmu-v5/multicopter.px4board index 09c940f6d1..6616b300c2 100644 --- a/boards/px4/fmu-v5/multicopter.px4board +++ b/boards/px4/fmu-v5/multicopter.px4board @@ -1,2 +1,3 @@ CONFIG_COMMON_BAROMETERS=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_COMMON_MAGNETOMETER=y diff --git a/boards/px4/fmu-v5/optimized.px4board b/boards/px4/fmu-v5/optimized.px4board index 498260f5f6..8f4a1e75d3 100644 --- a/boards/px4/fmu-v5/optimized.px4board +++ b/boards/px4/fmu-v5/optimized.px4board @@ -1,5 +1,6 @@ CONFIG_BOARD_EXTERNAL_METADATA=y CONFIG_BOARD_TESTING=y CONFIG_COMMON_BAROMETERS=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_MAGNETOMETER_ISENTEK_IST8310=y CONFIG_DRIVERS_TEST_PPM=y diff --git a/boards/px4/fmu-v5/rover.px4board b/boards/px4/fmu-v5/rover.px4board index 09c940f6d1..6616b300c2 100644 --- a/boards/px4/fmu-v5/rover.px4board +++ b/boards/px4/fmu-v5/rover.px4board @@ -1,2 +1,3 @@ CONFIG_COMMON_BAROMETERS=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_COMMON_MAGNETOMETER=y diff --git a/boards/px4/fmu-v5/stackcheck.px4board b/boards/px4/fmu-v5/stackcheck.px4board index 1aa2395b66..d5cda9042e 100644 --- a/boards/px4/fmu-v5/stackcheck.px4board +++ b/boards/px4/fmu-v5/stackcheck.px4board @@ -1,4 +1,5 @@ CONFIG_BOARD_CONSTRAINED_FLASH=y CONFIG_BOARD_TESTING=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_COMMON_MAGNETOMETER=y CONFIG_DRIVERS_BAROMETER_MS5611=y diff --git a/boards/px4/fmu-v5/test.px4board b/boards/px4/fmu-v5/test.px4board index d488c9ed52..196f6888fb 100644 --- a/boards/px4/fmu-v5/test.px4board +++ b/boards/px4/fmu-v5/test.px4board @@ -1,5 +1,6 @@ CONFIG_BOARD_TESTING=y CONFIG_COMMON_BAROMETERS=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_COMMON_MAGNETOMETER=y CONFIG_DRIVERS_TEST_PPM=y CONFIG_EXAMPLES_FAKE_IMU=y diff --git a/boards/px4/fmu-v5x/default.px4board b/boards/px4/fmu-v5x/default.px4board index 8a6864c1a6..37e8a46787 100644 --- a/boards/px4/fmu-v5x/default.px4board +++ b/boards/px4/fmu-v5x/default.px4board @@ -14,7 +14,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_HEATER=y diff --git a/boards/px4/fmu-v6u/default.px4board b/boards/px4/fmu-v6u/default.px4board index 00cba14b60..565dd375e2 100644 --- a/boards/px4/fmu-v6u/default.px4board +++ b/boards/px4/fmu-v6u/default.px4board @@ -13,7 +13,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_HEATER=y diff --git a/boards/px4/fmu-v6x/default.px4board b/boards/px4/fmu-v6x/default.px4board index 0d26719f9e..5ca40a8c19 100644 --- a/boards/px4/fmu-v6x/default.px4board +++ b/boards/px4/fmu-v6x/default.px4board @@ -15,7 +15,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_HEATER=y diff --git a/boards/px4/raspberrypi/default.px4board b/boards/px4/raspberrypi/default.px4board index 7314509419..d508c054f2 100644 --- a/boards/px4/raspberrypi/default.px4board +++ b/boards/px4/raspberrypi/default.px4board @@ -9,7 +9,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948=y CONFIG_DRIVERS_IMU_INVENSENSE_MPU9250=y diff --git a/boards/px4/sitl/Kconfig b/boards/px4/sitl/Kconfig deleted file mode 100644 index 4d1465c6b5..0000000000 --- a/boards/px4/sitl/Kconfig +++ /dev/null @@ -1,9 +0,0 @@ -config BOARD_LOCKSTEP - bool "Force enable lockstep" - help - forces lockstep behaviour, despite REPLAY env variable - -config BOARD_NOLOCKSTEP - bool "Force disable lockstep" - help - forces nolockstep behaviour, despite REPLAY env variable diff --git a/boards/px4/sitl/test.px4board b/boards/px4/sitl/test.px4board index 13c824e409..3f8869cde6 100644 --- a/boards/px4/sitl/test.px4board +++ b/boards/px4/sitl/test.px4board @@ -1,2 +1,3 @@ +CONFIG_DRIVERS_DISTANCE_SENSOR_LIGHTWARE_LASER_SERIAL=y CONFIG_BOARD_NOLOCKSTEP=y CONFIG_MODULES_CONTROL_ALLOCATOR=y diff --git a/boards/scumaker/pilotpi/default.px4board b/boards/scumaker/pilotpi/default.px4board index 2c86e80863..2f9da5c948 100644 --- a/boards/scumaker/pilotpi/default.px4board +++ b/boards/scumaker/pilotpi/default.px4board @@ -9,7 +9,7 @@ CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_INVENSENSE_ICM42605=y CONFIG_DRIVERS_IMU_INVENSENSE_ICM42688P=y diff --git a/boards/spracing/h7extreme/default.px4board b/boards/spracing/h7extreme/default.px4board index cddbd1f40b..4153b20442 100644 --- a/boards/spracing/h7extreme/default.px4board +++ b/boards/spracing/h7extreme/default.px4board @@ -4,7 +4,7 @@ CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_COMMON_BAROMETERS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_INVENSENSE_ICM20602=y diff --git a/boards/uvify/core/default.px4board b/boards/uvify/core/default.px4board index 9ef0495c2d..c1c0ab799f 100644 --- a/boards/uvify/core/default.px4board +++ b/boards/uvify/core/default.px4board @@ -10,7 +10,7 @@ CONFIG_DRIVERS_BAROMETER_MS5611=y CONFIG_DRIVERS_BATT_SMBUS=y CONFIG_DRIVERS_CAMERA_CAPTURE=y CONFIG_DRIVERS_CAMERA_TRIGGER=y -CONFIG_DRIVERS_DISTANCE_SENSOR=y +CONFIG_COMMON_DISTANCE_SENSOR=y CONFIG_DRIVERS_DSHOT=y CONFIG_DRIVERS_GPS=y CONFIG_DRIVERS_IMU_INVENSENSE_ICM20602=y diff --git a/cmake/kconfig.cmake b/cmake/kconfig.cmake index 393b4e2dae..06426834d0 100644 --- a/cmake/kconfig.cmake +++ b/cmake/kconfig.cmake @@ -23,8 +23,6 @@ set(COMMON_KCONFIG_ENV_SETTINGS TOOLCHAIN=${CMAKE_TOOLCHAIN_FILE} ARCHITECTURE=${CMAKE_SYSTEM_PROCESSOR} ROMFSROOT=${config_romfs_root} - HAS_CUSTOM_BOARD_KCONFIG=${HAS_CUSTOM_BOARD_KCONFIG} - CUSTOM_BOARD_KCONFIG=${CUSTOM_BOARD_KCONFIG} ) if(EXISTS ${BOARD_DEFCONFIG}) @@ -104,6 +102,10 @@ if(EXISTS ${BOARD_DEFCONFIG}) string(REGEX REPLACE "(^[a-z]+)_([a-z0-9]+_[a-z0-9]+)_([a-z]+[a-z0-9]+).*$" "\\2" driver_p3_subfolder ${driver}) string(REGEX REPLACE "(^[a-z]+)_([a-z0-9]+_[a-z0-9]+)_([a-z]+[a-z0-9]+).*$" "\\3" driver_p3_subsubfolder ${driver}) + # Pattern 4 XXX_XXX / XXX_XXX_XXX + string(REGEX REPLACE "(^[a-z]+_[a-z0-9]+)_([a-z_0-9]+).*$" "\\1" driver_p4_folder ${driver}) + string(REGEX REPLACE "(^[a-z]+_[a-z0-9]+)_([a-z_0-9]+).*$" "\\2" driver_p4_subfolder ${driver}) + # Trick circumvent PX4 src naming problem with underscores and slashes if(EXISTS ${PX4_SOURCE_DIR}/src/drivers/${driver}) list(APPEND config_module_list drivers/${driver}) @@ -115,6 +117,8 @@ if(EXISTS ${BOARD_DEFCONFIG}) list(APPEND config_module_list drivers/${driver_p1_folder}/${driver_p1_subfolder}) elseif(EXISTS ${PX4_SOURCE_DIR}/src/drivers/${driver_p2_folder}/${driver_p2_subfolder}) list(APPEND config_module_list drivers/${driver_p2_folder}/${driver_p2_subfolder}) + elseif(EXISTS ${PX4_SOURCE_DIR}/src/drivers/${driver_p4_folder}/${driver_p4_subfolder}) + list(APPEND config_module_list drivers/${driver_p4_folder}/${driver_p4_subfolder}) else() message(FATAL_ERROR "Couldn't find path for ${driver}") endif() diff --git a/cmake/px4_config.cmake b/cmake/px4_config.cmake index 07baafa4fc..41ea7b8c07 100644 --- a/cmake/px4_config.cmake +++ b/cmake/px4_config.cmake @@ -91,7 +91,6 @@ endif() message(STATUS "PX4 config file: ${PX4_CONFIG_FILE}") - include_directories(${PX4_BOARD_DIR}/src) set(PX4_BOARD ${VENDOR}_${MODEL} CACHE STRING "PX4 board" FORCE) @@ -115,11 +114,3 @@ endif() if(EXISTS "${PX4_BOARD_DIR}/sitl.cmake") include ("${PX4_BOARD_DIR}/sitl.cmake") endif() - -set(CUSTOM_BOARD_KCONFIG "${PX4_BOARD_DIR}/Kconfig" CACHE STRING "PX4 board custom config" FORCE) - -if(EXISTS ${CUSTOM_BOARD_KCONFIG}) - set(HAS_CUSTOM_BOARD_KCONFIG "y" CACHE STRING "PX4 board custom config" FORCE) -else() - set(HAS_CUSTOM_BOARD_KCONFIG "n" CACHE STRING "PX4 board custom config" FORCE) -endif() diff --git a/src/drivers/distance_sensor/Kconfig b/src/drivers/distance_sensor/Kconfig index 8d9ca14547..3bbc73ee57 100644 --- a/src/drivers/distance_sensor/Kconfig +++ b/src/drivers/distance_sensor/Kconfig @@ -1,9 +1,25 @@ -menuconfig DRIVERS_DISTANCE_SENSOR - bool "distance_sensor" - default n - ---help--- - Enable support for distance_sensor - -if DRIVERS_DISTANCE_SENSOR -rsource "*/Kconfig" -endif #DRIVERS_DISTANCE_SENSOR +menu "Distance sensors" + menuconfig COMMON_DISTANCE_SENSOR + bool "Common distance sensor's" + default n + select DRIVERS_DISTANCE_SENSOR_CM8JL65 + select DRIVERS_DISTANCE_SENSOR_LEDDAR_ONE + select DRIVERS_DISTANCE_SENSOR_LL40LS + select DRIVERS_DISTANCE_SENSOR_LL40LS_PWM + select DRIVERS_DISTANCE_SENSOR_MAPPYDOT + select DRIVERS_DISTANCE_SENSOR_MB12XX + select DRIVERS_DISTANCE_SENSOR_PGA460 + select DRIVERS_DISTANCE_SENSOR_LIGHTWARE_LASER_I2C + select DRIVERS_DISTANCE_SENSOR_LIGHTWARE_LASER_SERIAL + select DRIVERS_DISTANCE_SENSOR_SRF02 + select DRIVERS_DISTANCE_SENSOR_TERARANGER + select DRIVERS_DISTANCE_SENSOR_TFMINI + select DRIVERS_DISTANCE_SENSOR_ULANDING_RADAR + select DRIVERS_DISTANCE_SENSOR_VL53L0X + select DRIVERS_DISTANCE_SENSOR_VL53L1X + select DRIVERS_DISTANCE_SENSOR_GY_US42 + ---help--- + Enable default set of distance sensor drivers + + rsource "*/Kconfig" +endmenu diff --git a/src/drivers/distance_sensor/broadcom/Kconfig b/src/drivers/distance_sensor/broadcom/Kconfig new file mode 100644 index 0000000000..6353836988 --- /dev/null +++ b/src/drivers/distance_sensor/broadcom/Kconfig @@ -0,0 +1 @@ +rsource "*/Kconfig" diff --git a/src/drivers/distance_sensor/broadcom/afbrs50/Kconfig b/src/drivers/distance_sensor/broadcom/afbrs50/Kconfig new file mode 100644 index 0000000000..2b88b4633d --- /dev/null +++ b/src/drivers/distance_sensor/broadcom/afbrs50/Kconfig @@ -0,0 +1,5 @@ +menuconfig DRIVERS_DISTANCE_SENSOR_BROADCOM_AFBRS50 + bool "AFBRS50" + default n + ---help--- + Enable support for AFBRS50