From 8c38176d774cf9adbe691f4769432505d2af4fe2 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Tue, 19 Nov 2019 19:59:09 -0500 Subject: [PATCH] boards: alphabetize and sync common drivers and modules --- .ci/Jenkinsfile-compile | 2 +- Tools/docker_run.sh | 2 +- .../ocpoc/{ubuntu.cmake => default.cmake} | 20 +- boards/airmind/mindpx-v2/default.cmake | 24 +- boards/auav/x21/default.cmake | 23 +- boards/av/x-v1/default.cmake | 21 +- boards/beaglebone/blue/cross.cmake | 28 +- boards/beaglebone/blue/native.cmake | 28 +- boards/bitcraze/crazyflie/default.cmake | 13 +- boards/emlid/navio2/cross.cmake | 19 +- boards/emlid/navio2/native.cmake | 19 +- boards/holybro/durandal-v1/default.cmake | 7 +- boards/holybro/durandal-v1/stackcheck.cmake | 34 ++- boards/holybro/kakutef7/default.cmake | 15 +- boards/intel/aerofc-v1/default.cmake | 21 +- boards/intel/aerofc-v1/rtps.cmake | 23 +- boards/modalai/fc-v1/default.cmake | 9 +- .../fc-v1/nuttx-config/stackcheck/defconfig | 247 ------------------ boards/mro/ctrl-zero-f7/default.cmake | 19 +- boards/mro/ctrl-zero-f7/init/rc.board_sensors | 9 +- boards/nxp/fmuk66-v3/default.cmake | 25 +- boards/omnibus/f4sd/default.cmake | 21 +- boards/px4/fmu-v2/default.cmake | 25 +- boards/px4/fmu-v2/fixedwing.cmake | 26 +- boards/px4/fmu-v2/multicopter.cmake | 20 +- boards/px4/fmu-v2/test.cmake | 54 ++-- boards/px4/fmu-v3/default.cmake | 24 +- boards/px4/fmu-v3/rtps.cmake | 27 +- boards/px4/fmu-v4/default.cmake | 17 +- boards/px4/fmu-v4/rtps.cmake | 14 +- boards/px4/fmu-v4/stackcheck.cmake | 17 +- boards/px4/fmu-v4pro/default.cmake | 19 +- boards/px4/fmu-v4pro/rtps.cmake | 27 +- boards/px4/fmu-v5/default.cmake | 22 +- boards/px4/fmu-v5/fixedwing.cmake | 13 +- boards/px4/fmu-v5/multicopter.cmake | 16 +- .../fmu-v5/nuttx-config/stackcheck/defconfig | 2 + boards/px4/fmu-v5/rover.cmake | 13 +- boards/px4/fmu-v5/rtps.cmake | 22 +- boards/px4/fmu-v5/src/init.c | 2 +- boards/px4/fmu-v5/src/led.c | 2 +- boards/px4/fmu-v5/src/spi.cpp | 2 +- boards/px4/fmu-v5/src/timer_config.c | 27 +- boards/px4/fmu-v5/src/usb.c | 2 +- boards/px4/fmu-v5/stackcheck.cmake | 31 +-- boards/px4/fmu-v5x/default.cmake | 16 +- boards/px4/sitl/default.cmake | 15 +- boards/px4/sitl/rtps.cmake | 19 +- boards/uvify/core/default.cmake | 4 - 49 files changed, 405 insertions(+), 702 deletions(-) rename boards/aerotenna/ocpoc/{ubuntu.cmake => default.cmake} (95%) delete mode 100644 boards/modalai/fc-v1/nuttx-config/stackcheck/defconfig diff --git a/.ci/Jenkinsfile-compile b/.ci/Jenkinsfile-compile index ea06f1f361..fa62c29534 100644 --- a/.ci/Jenkinsfile-compile +++ b/.ci/Jenkinsfile-compile @@ -16,7 +16,7 @@ pipeline { ] def armhf_builds = [ - target: ["aerotenna_ocpoc_ubuntu", "emlid_navio2_cross", "parrot_bebop_default"], + target: ["aerotenna_ocpoc_default", "emlid_navio2_cross", "parrot_bebop_default"], image: docker_images.armhf, archive: false ] diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh index fa316f6f44..bb5ac6c9bf 100755 --- a/Tools/docker_run.sh +++ b/Tools/docker_run.sh @@ -9,7 +9,7 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then # eagle, excelsior PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2018-09-12" elif [[ $@ =~ .*ocpoc.* ]] || [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then - # aerotennaocpoc_ubuntu, posix_rpi_cross, posix_bebop_default + # aerotenna_ocpoc_default, posix_rpi_cross, posix_bebop_default PX4_DOCKER_REPO="px4io/px4-dev-armhf:2019-10-24" elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then # clang tools diff --git a/boards/aerotenna/ocpoc/ubuntu.cmake b/boards/aerotenna/ocpoc/default.cmake similarity index 95% rename from boards/aerotenna/ocpoc/ubuntu.cmake rename to boards/aerotenna/ocpoc/default.cmake index c784bc0311..316f373bc7 100644 --- a/boards/aerotenna/ocpoc/ubuntu.cmake +++ b/boards/aerotenna/ocpoc/default.cmake @@ -2,14 +2,14 @@ px4_add_board( VENDOR aerotenna MODEL ocpoc - LABEL ubuntu + LABEL default PLATFORM posix ARCHITECTURE cortex-a9 TOOLCHAIN arm-linux-gnueabihf TESTING - DRIVERS #barometer # all available barometer drivers + barometer/ms5611 batt_smbus camera_trigger differential_pressure # all available differential pressure drivers @@ -24,14 +24,14 @@ px4_add_board( magnetometer/hmc5883 pwm_out_sim #telemetry # all available telemetry drivers - DF_DRIVERS # NOTE: DriverFramework is migrating to intree PX4 drivers + hmc5883 mpu9250 ms5611 - hmc5883 - MODULES + airspeed_selector attitude_estimator_q + battery_status camera_feedback commander dataman @@ -39,7 +39,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -47,17 +46,16 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control + #micrortps_bridge navigator - battery_status + rover_pos_control sensors sih #simulator vmount vtol_att_control - airspeed_selector - SYSTEMCMDS esc_calib led_control @@ -75,12 +73,12 @@ px4_add_board( tune_control ver work_queue - EXAMPLES bottle_drop # OBC challenge fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control hello #hwtest # Hardware test + #matlab_csv_serial px4_mavlink_debug # Tutorial code from http://dev.px4.io/en/debug/debug_values.html px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app diff --git a/boards/airmind/mindpx-v2/default.cmake b/boards/airmind/mindpx-v2/default.cmake index bdbcb18188..4d71be69cf 100644 --- a/boards/airmind/mindpx-v2/default.cmake +++ b/boards/airmind/mindpx-v2/default.cmake @@ -3,24 +3,25 @@ px4_add_board( PLATFORM nuttx VENDOR airmind MODEL mindpx-v2 + LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 ROMFSROOT px4fmu_common TESTING UAVCAN_INTERFACES 1 - SERIAL_PORTS GPS1:/dev/ttyS3 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 - DRIVERS adc 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 + #dshot gps #heater #imu # all available imu drivers @@ -31,23 +32,30 @@ px4_add_board( irlock lights/blinkm lights/rgbled + #lights/rgbled_ncp5623c magnetometer # all available magnetometer drivers + #md25 mkblctrl #optical_flow # all available optical flow drivers optical_flow/px4flow + #osd pca9685 + power_monitor/ina226 + #protocol_splitter pwm_input pwm_out_sim px4fmu rc_input + roboclaw tap_esc telemetry # all available telemetry drivers test_ppm tone_alarm uavcan - MODULES + airspeed_selector attitude_estimator_q + battery_status camera_feedback commander dataman @@ -55,7 +63,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -63,19 +70,18 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control navigator - battery_status + rover_pos_control sensors sih vmount vtol_att_control - airspeed_selector - SYSTEMCMDS bl_update config + #dmesg dumpfile esc_calib hardfault_log @@ -100,7 +106,6 @@ px4_add_board( usb_connected ver work_queue - EXAMPLES bottle_drop # OBC challenge fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control @@ -111,5 +116,4 @@ px4_add_board( px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app uuv_example_app - ) diff --git a/boards/auav/x21/default.cmake b/boards/auav/x21/default.cmake index 6df1fd5494..5f649ea677 100644 --- a/boards/auav/x21/default.cmake +++ b/boards/auav/x21/default.cmake @@ -3,18 +3,17 @@ px4_add_board( PLATFORM nuttx VENDOR auav MODEL x21 + LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 ROMFSROOT px4fmu_common IO px4_io-v2_default TESTING UAVCAN_INTERFACES 1 - SERIAL_PORTS GPS1:/dev/ttyS3 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 - DRIVERS adc barometer # all available barometer drivers @@ -23,6 +22,7 @@ px4_add_board( camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers + #dshot gps #heater #imu # all available imu drivers @@ -31,15 +31,17 @@ px4_add_board( irlock lights/blinkm lights/rgbled + #lights/rgbled_ncp5623c #lights/rgbled_pwm magnetometer # all available magnetometer drivers #md25 mkblctrl #optical_flow # all available optical flow drivers - #optical_flow/pmw3901 optical_flow/px4flow + #osd pca9685 - protocol_splitter + #power_monitor/ina226 + #protocol_splitter pwm_input pwm_out_sim px4fmu @@ -50,9 +52,10 @@ px4_add_board( test_ppm tone_alarm uavcan - MODULES + airspeed_selector attitude_estimator_q + battery_status camera_feedback commander dataman @@ -60,7 +63,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -68,19 +70,18 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control navigator - battery_status + rover_pos_control sensors sih vmount vtol_att_control - airspeed_selector - SYSTEMCMDS bl_update config + #dmesg dumpfile esc_calib hardfault_log @@ -105,7 +106,6 @@ px4_add_board( usb_connected ver work_queue - EXAMPLES bottle_drop # OBC challenge fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control @@ -116,5 +116,4 @@ px4_add_board( px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app uuv_example_app - ) diff --git a/boards/av/x-v1/default.cmake b/boards/av/x-v1/default.cmake index 3f0e7e78c3..8a13e1fa15 100644 --- a/boards/av/x-v1/default.cmake +++ b/boards/av/x-v1/default.cmake @@ -9,14 +9,12 @@ px4_add_board( ROMFSROOT px4fmu_common TESTING UAVCAN_INTERFACES 2 - SERIAL_PORTS GPS1:/dev/ttyS6 TEL1:/dev/ttyS0 TEL2:/dev/ttyS1 TEL3:/dev/ttyS2 TEL4:/dev/ttyS3 - DRIVERS adc barometer # all available barometer drivers @@ -25,11 +23,12 @@ px4_add_board( camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers + #dshot gps #heater + #imu # all available imu drivers imu/adis16477 imu/adis16497 - #imu # all available imu drivers irlock lights/blinkm #lights/rgbled @@ -39,21 +38,24 @@ px4_add_board( #md25 mkblctrl optical_flow # all available optical flow drivers + #osd pca9685 + power_monitor/ina226 #protocol_splitter #pwm_input pwm_out_sim px4fmu rc_input - #roboclaw + roboclaw tap_esc telemetry # all available telemetry drivers test_ppm #tone_alarm uavcan - MODULES + airspeed_selector attitude_estimator_q + battery_status camera_feedback commander dataman @@ -61,7 +63,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -69,16 +70,14 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control navigator - battery_status + rover_pos_control sensors sih vmount vtol_att_control - airspeed_selector - SYSTEMCMDS #bl_update config @@ -105,7 +104,6 @@ px4_add_board( tune_control ver work_queue - EXAMPLES bottle_drop # OBC challenge fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control @@ -116,5 +114,4 @@ px4_add_board( px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app uuv_example_app - ) diff --git a/boards/beaglebone/blue/cross.cmake b/boards/beaglebone/blue/cross.cmake index 88a1ae5719..ee261b4f1a 100644 --- a/boards/beaglebone/blue/cross.cmake +++ b/boards/beaglebone/blue/cross.cmake @@ -7,7 +7,6 @@ px4_add_board( ARCHITECTURE cortex-a8 TOOLCHAIN arm-linux-gnueabihf TESTING - DRIVERS #barometer # all available barometer drivers barometer/bmp280 @@ -18,19 +17,19 @@ px4_add_board( gps #imu # all available imu drivers imu/mpu9250 - #magnetometer # all available magnetometer drivers - pwm_out_sim - #telemetry # all available telemetry drivers - linux_pwm_out linux_sbus - + #magnetometer # all available magnetometer drivers + magnetometer/hmc5883 + pwm_out_sim + #telemetry # all available telemetry drivers DF_DRIVERS # NOTE: DriverFramework is migrating to intree PX4 drivers - mpu9250 bmp280 - + mpu9250 MODULES + airspeed_selector attitude_estimator_q + battery_status camera_feedback commander dataman @@ -38,7 +37,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -46,17 +44,17 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control navigator - battery_status + rover_pos_control sensors sih + #simulator vmount vtol_att_control - airspeed_selector - SYSTEMCMDS + dyn esc_calib led_control mixer @@ -66,18 +64,20 @@ px4_add_board( pwm reboot sd_bench + shutdown tests # tests and test runner top topic_listener tune_control ver work_queue - EXAMPLES bottle_drop # OBC challenge + dyn_hello # dynamically loading modules example fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control hello #hwtest # Hardware test + #matlab_csv_serial px4_mavlink_debug # Tutorial code from http://dev.px4.io/en/debug/debug_values.html px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app diff --git a/boards/beaglebone/blue/native.cmake b/boards/beaglebone/blue/native.cmake index 3e2771e331..0ab0543065 100644 --- a/boards/beaglebone/blue/native.cmake +++ b/boards/beaglebone/blue/native.cmake @@ -5,7 +5,6 @@ px4_add_board( LABEL native PLATFORM posix TESTING - DRIVERS #barometer # all available barometer drivers barometer/bmp280 @@ -16,19 +15,19 @@ px4_add_board( gps #imu # all available imu drivers imu/mpu9250 - #magnetometer # all available magnetometer drivers - pwm_out_sim - #telemetry # all available telemetry drivers - linux_pwm_out linux_sbus - + #magnetometer # all available magnetometer drivers + magnetometer/hmc5883 + pwm_out_sim + #telemetry # all available telemetry drivers DF_DRIVERS # NOTE: DriverFramework is migrating to intree PX4 drivers - mpu9250 bmp280 - + mpu9250 MODULES + airspeed_selector attitude_estimator_q + battery_status camera_feedback commander dataman @@ -36,7 +35,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -44,17 +42,17 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control navigator - battery_status + rover_pos_control sensors sih + #simulator vmount vtol_att_control - airspeed_selector - SYSTEMCMDS + dyn esc_calib led_control mixer @@ -64,18 +62,20 @@ px4_add_board( pwm reboot sd_bench + shutdown tests # tests and test runner top topic_listener tune_control ver work_queue - EXAMPLES bottle_drop # OBC challenge + dyn_hello # dynamically loading modules example fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control hello #hwtest # Hardware test + #matlab_csv_serial px4_mavlink_debug # Tutorial code from http://dev.px4.io/en/debug/debug_values.html px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app diff --git a/boards/bitcraze/crazyflie/default.cmake b/boards/bitcraze/crazyflie/default.cmake index 8cea363b3b..b6cffa653d 100644 --- a/boards/bitcraze/crazyflie/default.cmake +++ b/boards/bitcraze/crazyflie/default.cmake @@ -6,7 +6,6 @@ px4_add_board( TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 ROMFSROOT px4fmu_common - DRIVERS barometer/lps25h distance_sensor/vl53lxx @@ -14,7 +13,6 @@ px4_add_board( imu/mpu9250 optical_flow/pmw3901 px4fmu - MODULES attitude_estimator_q camera_feedback @@ -22,9 +20,6 @@ px4_add_board( dataman ekf2 events - #fw_att_control - #fw_pos_control_l1 - #rover_pos_control land_detector landing_target_estimator load_mon @@ -32,14 +27,10 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control navigator sensors - sih - #vtol_att_control - airspeed_selector - SYSTEMCMDS bl_update config @@ -61,12 +52,10 @@ px4_add_board( reflect sd_bench shutdown - #tests # tests and test runner top topic_listener tune_control usb_connected ver work_queue - ) diff --git a/boards/emlid/navio2/cross.cmake b/boards/emlid/navio2/cross.cmake index 88e857915c..f64c14c090 100644 --- a/boards/emlid/navio2/cross.cmake +++ b/boards/emlid/navio2/cross.cmake @@ -7,7 +7,6 @@ px4_add_board( ARCHITECTURE cortex-a53 TOOLCHAIN arm-linux-gnueabihf TESTING - DRIVERS #barometer # all available barometer drivers barometer/ms5611 @@ -18,14 +17,12 @@ px4_add_board( gps #imu # all available imu drivers imu/mpu9250 + linux_pwm_out + linux_sbus #magnetometer # all available magnetometer drivers magnetometer/hmc5883 pwm_out_sim #telemetry # all available telemetry drivers - - linux_pwm_out - linux_sbus - DF_DRIVERS # NOTE: DriverFramework is migrating to intree PX4 drivers hmc5883 isl29501 @@ -33,9 +30,10 @@ px4_add_board( mpu9250 ms5611 trone - MODULES + airspeed_selector attitude_estimator_q + battery_status camera_feedback commander dataman @@ -43,7 +41,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -51,17 +48,15 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control navigator - battery_status + rover_pos_control sensors sih #simulator vmount vtol_att_control - airspeed_selector - SYSTEMCMDS dyn esc_calib @@ -80,13 +75,13 @@ px4_add_board( tune_control ver work_queue - EXAMPLES bottle_drop # OBC challenge dyn_hello # dynamically loading modules example fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control hello #hwtest # Hardware test + #matlab_csv_serial px4_mavlink_debug # Tutorial code from http://dev.px4.io/en/debug/debug_values.html px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app diff --git a/boards/emlid/navio2/native.cmake b/boards/emlid/navio2/native.cmake index 08e8647740..ab25617ec0 100644 --- a/boards/emlid/navio2/native.cmake +++ b/boards/emlid/navio2/native.cmake @@ -5,7 +5,6 @@ px4_add_board( LABEL native PLATFORM posix TESTING - DRIVERS #barometer # all available barometer drivers barometer/ms5611 @@ -16,14 +15,12 @@ px4_add_board( gps #imu # all available imu drivers imu/mpu9250 + linux_pwm_out + linux_sbus #magnetometer # all available magnetometer drivers magnetometer/hmc5883 pwm_out_sim #telemetry # all available telemetry drivers - - linux_pwm_out - linux_sbus - DF_DRIVERS # NOTE: DriverFramework is migrating to intree PX4 drivers hmc5883 isl29501 @@ -31,9 +28,10 @@ px4_add_board( mpu9250 ms5611 trone - MODULES + airspeed_selector attitude_estimator_q + battery_status camera_feedback commander dataman @@ -41,7 +39,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -49,17 +46,15 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control navigator - battery_status + rover_pos_control sensors sih #simulator vmount vtol_att_control - airspeed_selector - SYSTEMCMDS dyn esc_calib @@ -78,13 +73,13 @@ px4_add_board( tune_control ver work_queue - EXAMPLES bottle_drop # OBC challenge dyn_hello # dynamically loading modules example fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control hello #hwtest # Hardware test + #matlab_csv_serial px4_mavlink_debug # Tutorial code from http://dev.px4.io/en/debug/debug_values.html px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app diff --git a/boards/holybro/durandal-v1/default.cmake b/boards/holybro/durandal-v1/default.cmake index 8a39a11496..ba95dfd55b 100644 --- a/boards/holybro/durandal-v1/default.cmake +++ b/boards/holybro/durandal-v1/default.cmake @@ -27,9 +27,10 @@ px4_add_board( # dshot -- todo needslooking at gps heater - imu/adis16448 - imu/adis16497 #imu # all available imu drivers + imu/adis16448 + imu/adis16477 + imu/adis16497 imu/bmi088 imu/mpu6000 imu/mpu9250 @@ -41,6 +42,7 @@ px4_add_board( #md25 mkblctrl optical_flow # all available optical flow drivers + #osd pca9685 power_monitor/ina226 #protocol_splitter @@ -74,6 +76,7 @@ px4_add_board( mavlink mc_att_control mc_pos_control + mc_rate_control navigator rover_pos_control sensors diff --git a/boards/holybro/durandal-v1/stackcheck.cmake b/boards/holybro/durandal-v1/stackcheck.cmake index 4a77901592..3a8fd34f20 100644 --- a/boards/holybro/durandal-v1/stackcheck.cmake +++ b/boards/holybro/durandal-v1/stackcheck.cmake @@ -18,18 +18,20 @@ px4_add_board( TEL4:/dev/ttyS3 DRIVERS adc - barometer # all available barometer drivers + #barometer # all available barometer drivers + barometer/ms5611 batt_smbus - camera_capture - camera_trigger + #camera_capture + #camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers # dshot -- todo needslooking at gps - #heater - #imu/adis16448 - #imu/adis16497 + heater #imu # all available imu drivers + #imu/adis16448 + #imu/adis16477 + #imu/adis16497 imu/bmi088 imu/mpu6000 #imu/mpu9250 @@ -41,9 +43,12 @@ px4_add_board( #md25 #mkblctrl #optical_flow # all available optical flow drivers + #osd #pca9685 #power_monitor/ina226 #protocol_splitter +# pwm_input - Need to create arch/stm32 arch/stm32h7 arch/kinetis and reloacate +# all arch dependant code there pwm_out_sim px4fmu px4io @@ -72,6 +77,7 @@ px4_add_board( mavlink mc_att_control mc_pos_control + mc_rate_control navigator #rover_pos_control sensors @@ -107,13 +113,13 @@ px4_add_board( ver work_queue EXAMPLES - # bottle_drop # OBC challenge - # fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control - # hello - # hwtest # Hardware test + #bottle_drop # OBC challenge + #fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control + #hello + #hwtest # Hardware test #matlab_csv_serial - # px4_mavlink_debug # Tutorial code from http://dev.px4.io/en/debug/debug_values.html - # px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html - # rover_steering_control # Rover example app - # uuv_example_app + #px4_mavlink_debug # Tutorial code from http://dev.px4.io/en/debug/debug_values.html + #px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html + #rover_steering_control # Rover example app + #uuv_example_app ) diff --git a/boards/holybro/kakutef7/default.cmake b/boards/holybro/kakutef7/default.cmake index 700991aa3c..280c2b4be4 100644 --- a/boards/holybro/kakutef7/default.cmake +++ b/boards/holybro/kakutef7/default.cmake @@ -7,7 +7,6 @@ px4_add_board( TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common - SERIAL_PORTS TEL1:/dev/ttyS0 # UART1 TEL2:/dev/ttyS1 # UART2 @@ -15,7 +14,6 @@ px4_add_board( GPS1:/dev/ttyS3 # UART4 RC:/dev/ttyS4 # UART6 # /dev/ttyS5: UART7 (ESC telemetry) - DRIVERS adc barometer/bmp280 @@ -24,30 +22,29 @@ px4_add_board( imu/mpu6000 magnetometer optical_flow/px4flow + osd pwm_out_sim px4fmu rc_input telemetry tone_alarm - osd - MODULES attitude_estimator_q + battery_status commander dataman #ekf2 events land_detector load_mon + #local_position_estimator logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control navigator - battery_status sensors - SYSTEMCMDS bl_update config @@ -55,6 +52,7 @@ px4_add_board( dumpfile esc_calib hardfault_log + i2cdetect led_control mixer #motor_ramp @@ -68,10 +66,9 @@ px4_add_board( sd_bench shutdown top - tune_control topic_listener + tune_control usb_connected ver work_queue - ) diff --git a/boards/intel/aerofc-v1/default.cmake b/boards/intel/aerofc-v1/default.cmake index e03361657a..b18df6146b 100644 --- a/boards/intel/aerofc-v1/default.cmake +++ b/boards/intel/aerofc-v1/default.cmake @@ -3,36 +3,37 @@ px4_add_board( PLATFORM nuttx VENDOR intel MODEL aerofc-v1 + LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 ROMFSROOT px4fmu_common - SERIAL_PORTS GPS1:/dev/ttyS5 TEL1:/dev/ttyS3 TEL2:/dev/ttyS1 - DRIVERS barometer/ms5611 #camera_trigger #differential_pressure # all available differential pressure drivers distance_sensor gps - #irlock imu/mpu9250 + #irlock #magnetometer # all available magnetometer drivers magnetometer/hmc5883 magnetometer/ist8310 #optical_flow/px4flow + #protocol_splitter pwm_out_sim px4fmu rc_input tap_esc #telemetry # all available telemetry drivers #uavcan - MODULES + #airspeed_selector attitude_estimator_q + battery_status #camera_feedback commander dataman @@ -40,7 +41,6 @@ px4_add_board( events #fw_att_control #fw_pos_control_l1 - #rover_pos_control land_detector landing_target_estimator load_mon @@ -48,19 +48,19 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control + #micrortps_bridge navigator - battery_status + #rover_pos_control sensors #sih vmount #vtol_att_control - #airspeed_selector - SYSTEMCMDS bl_update config + #dmesg dumpfile esc_calib hardfault_log @@ -84,15 +84,14 @@ px4_add_board( tune_control ver work_queue - EXAMPLES #bottle_drop # OBC challenge #fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control + #hello #hwtest # Hardware test #matlab_csv_serial #px4_mavlink_debug # Tutorial code from http://dev.px4.io/en/debug/debug_values.html #px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html #rover_steering_control # Rover example app #uuv_example_app - ) diff --git a/boards/intel/aerofc-v1/rtps.cmake b/boards/intel/aerofc-v1/rtps.cmake index 91a1a6ff92..4269403e19 100644 --- a/boards/intel/aerofc-v1/rtps.cmake +++ b/boards/intel/aerofc-v1/rtps.cmake @@ -3,28 +3,25 @@ px4_add_board( PLATFORM nuttx VENDOR intel MODEL aerofc-v1 - LABEL rtsp + LABEL rtps TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 ROMFSROOT px4fmu_common - SERIAL_PORTS GPS1:/dev/ttyS5 TEL1:/dev/ttyS3 TEL2:/dev/ttyS1 - DRIVERS barometer/ms5611 #camera_trigger #differential_pressure # all available differential pressure drivers distance_sensor gps - #irlock imu/mpu9250 + #irlock #magnetometer # all available magnetometer drivers magnetometer/hmc5883 magnetometer/ist8310 - #optical_flow # all available optical flow drivers #optical_flow/px4flow protocol_splitter pwm_out_sim @@ -33,9 +30,10 @@ px4_add_board( tap_esc #telemetry # all available telemetry drivers #uavcan - MODULES + #airspeed_selector attitude_estimator_q + battery_status #camera_feedback commander dataman @@ -43,7 +41,6 @@ px4_add_board( events #fw_att_control #fw_pos_control_l1 - #rover_pos_control land_detector landing_target_estimator load_mon @@ -51,20 +48,19 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control micrortps_bridge navigator - battery_status + #rover_pos_control sensors - sih + #sih vmount #vtol_att_control - #airspeed_selector - SYSTEMCMDS bl_update config + #dmesg dumpfile esc_calib hardfault_log @@ -88,15 +84,14 @@ px4_add_board( tune_control ver work_queue - EXAMPLES #bottle_drop # OBC challenge #fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control + #hello #hwtest # Hardware test #matlab_csv_serial #px4_mavlink_debug # Tutorial code from http://dev.px4.io/en/debug/debug_values.html #px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html #rover_steering_control # Rover example app #uuv_example_app - ) diff --git a/boards/modalai/fc-v1/default.cmake b/boards/modalai/fc-v1/default.cmake index 69fc2d7130..0b668602bd 100644 --- a/boards/modalai/fc-v1/default.cmake +++ b/boards/modalai/fc-v1/default.cmake @@ -9,13 +9,11 @@ px4_add_board( ROMFSROOT px4fmu_common TESTING UAVCAN_INTERFACES 1 - SERIAL_PORTS GPS1:/dev/ttyS0 # UART1 / J10 TEL1:/dev/ttyS6 # UART7 / J5 TEL2:/dev/ttyS4 # UART5 / J1 TEL3:/dev/ttyS1 # USART2 / J4 - DRIVERS adc barometer # all available barometer drivers @@ -37,6 +35,7 @@ px4_add_board( #md25 mkblctrl #optical_flow # all available optical flow drivers + #osd pca9685 power_monitor/ina226 power_monitor/voxlpm @@ -44,7 +43,6 @@ px4_add_board( #pwm_input pwm_out_sim px4fmu - #px4io rc_input roboclaw safety_button @@ -53,8 +51,8 @@ px4_add_board( test_ppm #tone_alarm uavcan - MODULES + airspeed_selector attitude_estimator_q camera_feedback commander @@ -78,8 +76,6 @@ px4_add_board( sih vmount vtol_att_control - airspeed_selector - SYSTEMCMDS bl_update config @@ -108,7 +104,6 @@ px4_add_board( usb_connected ver work_queue - EXAMPLES bottle_drop # OBC challenge fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control diff --git a/boards/modalai/fc-v1/nuttx-config/stackcheck/defconfig b/boards/modalai/fc-v1/nuttx-config/stackcheck/defconfig deleted file mode 100644 index 289d857c8f..0000000000 --- a/boards/modalai/fc-v1/nuttx-config/stackcheck/defconfig +++ /dev/null @@ -1,247 +0,0 @@ -# CONFIG_DISABLE_OS_API is not set -# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set -# CONFIG_MMCSD_HAVE_CARDDETECT is not set -# CONFIG_MMCSD_HAVE_WRITEPROTECT is not set -# CONFIG_MMCSD_MMCSUPPORT is not set -# CONFIG_MMCSD_SPI is not set -# CONFIG_NSH_DISABLEBG is not set -# CONFIG_NSH_DISABLESCRIPT is not set -# CONFIG_NSH_DISABLE_DF is not set -# CONFIG_NSH_DISABLE_EXEC is not set -# CONFIG_NSH_DISABLE_EXIT is not set -# CONFIG_NSH_DISABLE_GET is not set -# CONFIG_NSH_DISABLE_ITEF is not set -# CONFIG_NSH_DISABLE_LOOPS is not set -# CONFIG_NSH_DISABLE_SEMICOLON is not set -# CONFIG_NSH_DISABLE_TIME is not set -CONFIG_ARCH="arm" -CONFIG_ARCH_BOARD_CUSTOM=y -CONFIG_ARCH_BOARD_CUSTOM_DIR="../nuttx-config" -CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y -CONFIG_ARCH_BOARD_CUSTOM_NAME="px4" -CONFIG_ARCH_CHIP_STM32F765II=y -CONFIG_ARCH_CHIP_STM32F7=y -CONFIG_ARCH_INTERRUPTSTACK=512 -CONFIG_ARCH_STACKDUMP=y -CONFIG_ARMV7M_BASEPRI_WAR=y -CONFIG_ARMV7M_DCACHE=y -CONFIG_ARMV7M_DTCM=y -CONFIG_ARMV7M_ICACHE=y -CONFIG_ARMV7M_MEMCPY=y -CONFIG_ARMV7M_STACKCHECK=y -CONFIG_ARMV7M_USEBASEPRI=y -CONFIG_BOARDCTL_RESET=y -CONFIG_BOARD_CRASHDUMP=y -CONFIG_BOARD_LOOPSPERMSEC=22114 -CONFIG_BOARD_RESET_ON_ASSERT=2 -CONFIG_BUILTIN=y -CONFIG_C99_BOOL8=y -CONFIG_CDCACM=y -CONFIG_CDCACM_PRODUCTID=0xa32f -CONFIG_CDCACM_PRODUCTSTR="PX4 FMU ModalAI FCv1" -CONFIG_CDCACM_RXBUFSIZE=600 -CONFIG_CDCACM_TXBUFSIZE=12000 -CONFIG_CDCACM_VENDORID=0x0483 -CONFIG_CDCACM_VENDORSTR="ModalAI" -CONFIG_CLOCK_MONOTONIC=y -CONFIG_DEBUG_FULLOPT=y -CONFIG_DEBUG_HARDFAULT_ALERT=y -CONFIG_DEBUG_SYMBOLS=y -CONFIG_DEFAULT_SMALL=y -CONFIG_DEV_FIFO_SIZE=0 -CONFIG_DEV_PIPE_MAXSIZE=1024 -CONFIG_DEV_PIPE_SIZE=70 -CONFIG_FAT_DMAMEMORY=y -CONFIG_FAT_LCNAMES=y -CONFIG_FAT_LFN=y -CONFIG_FAT_LFN_ALIAS_HASH=y -CONFIG_FDCLONE_STDIO=y -CONFIG_FS_BINFS=y -CONFIG_FS_CROMFS=y -CONFIG_FS_FAT=y -CONFIG_FS_FATTIME=y -CONFIG_FS_PROCFS=y -CONFIG_FS_PROCFS_EXCLUDE_BLOCKS=y -CONFIG_FS_PROCFS_EXCLUDE_MOUNT=y -CONFIG_FS_PROCFS_EXCLUDE_MOUNTS=y -CONFIG_FS_PROCFS_EXCLUDE_PARTITIONS=y -CONFIG_FS_PROCFS_EXCLUDE_USAGE=y -CONFIG_FS_PROCFS_REGISTER=y -CONFIG_FS_ROMFS=y -CONFIG_GRAN=y -CONFIG_GRAN_INTR=y -CONFIG_HAVE_CXX=y -CONFIG_HAVE_CXXINITIALIZE=y -CONFIG_I2C=y -CONFIG_I2C_RESET=y -CONFIG_IDLETHREAD_STACKSIZE=750 -CONFIG_LIBC_FLOATINGPOINT=y -CONFIG_LIBC_LONG_LONG=y -CONFIG_LIBC_STRERROR=y -CONFIG_MAX_TASKS=64 -CONFIG_MAX_WDOGPARMS=2 -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y -CONFIG_MMCSD=y -CONFIG_MMCSD_MULTIBLOCK_DISABLE=y -CONFIG_MMCSD_SDIO=y -CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y -CONFIG_MM_REGIONS=3 -CONFIG_MTD=y -CONFIG_MTD_BYTE_WRITE=y -CONFIG_MTD_PARTITION=y -CONFIG_MTD_RAMTRON=y -CONFIG_NFILE_DESCRIPTORS=54 -CONFIG_NFILE_STREAMS=8 -CONFIG_NSH_ARCHINIT=y -CONFIG_NSH_ARCHROMFS=y -CONFIG_NSH_ARGCAT=y -CONFIG_NSH_BUILTIN_APPS=y -CONFIG_NSH_CMDPARMS=y -CONFIG_NSH_CROMFSETC=y -CONFIG_NSH_DISABLE_IFCONFIG=y -CONFIG_NSH_DISABLE_IFUPDOWN=y -CONFIG_NSH_DISABLE_MB=y -CONFIG_NSH_DISABLE_MH=y -CONFIG_NSH_DISABLE_TELNETD=y -CONFIG_NSH_LINELEN=128 -CONFIG_NSH_MAXARGUMENTS=12 -CONFIG_NSH_NESTDEPTH=8 -CONFIG_NSH_QUOTE=y -CONFIG_NSH_ROMFSETC=y -CONFIG_NSH_ROMFSSECTSIZE=128 -CONFIG_NSH_STRERROR=y -CONFIG_NSH_VARS=y -CONFIG_NXFONTS_DISABLE_16BPP=y -CONFIG_NXFONTS_DISABLE_1BPP=y -CONFIG_NXFONTS_DISABLE_24BPP=y -CONFIG_NXFONTS_DISABLE_2BPP=y -CONFIG_NXFONTS_DISABLE_32BPP=y -CONFIG_NXFONTS_DISABLE_4BPP=y -CONFIG_NXFONTS_DISABLE_8BPP=y -CONFIG_PIPES=y -CONFIG_PREALLOC_MQ_MSGS=4 -CONFIG_PREALLOC_TIMERS=50 -CONFIG_PREALLOC_WDOGS=50 -CONFIG_PRIORITY_INHERITANCE=y -CONFIG_PTHREAD_MUTEX_ROBUST=y -CONFIG_PTHREAD_STACK_MIN=512 -CONFIG_RAMTRON_SETSPEED=y -CONFIG_RAMTRON_WRITEWAIT=y -CONFIG_RAM_SIZE=245760 -CONFIG_RAM_START=0x20010000 -CONFIG_RAW_BINARY=y -CONFIG_RTC_DATETIME=y -CONFIG_SCHED_ATEXIT=y -CONFIG_SCHED_HPWORK=y -CONFIG_SCHED_HPWORKPRIORITY=249 -CONFIG_SCHED_HPWORKSTACKSIZE=1024 -CONFIG_SCHED_INSTRUMENTATION=y -CONFIG_SCHED_LPWORK=y -CONFIG_SCHED_LPWORKPRIORITY=50 -CONFIG_SCHED_LPWORKSTACKSIZE=1280 -CONFIG_SCHED_WAITPID=y -CONFIG_SDCLONE_DISABLE=y -CONFIG_SEM_NNESTPRIO=8 -CONFIG_SEM_PREALLOCHOLDERS=0 -CONFIG_SERIAL_IFLOWCONTROL_WATERMARKS=y -CONFIG_SERIAL_TERMIOS=y -CONFIG_SIG_DEFAULT=y -CONFIG_SIG_SIGALRM_ACTION=y -CONFIG_SIG_SIGUSR1_ACTION=y -CONFIG_SIG_SIGUSR2_ACTION=y -CONFIG_SIG_SIGWORK=4 -CONFIG_STACK_COLORATION=y -CONFIG_START_DAY=30 -CONFIG_START_MONTH=11 -CONFIG_STDIO_BUFFER_SIZE=32 -CONFIG_STM32F7_ADC1=y -CONFIG_STM32F7_BBSRAM=y -CONFIG_STM32F7_BBSRAM_FILES=5 -CONFIG_STM32F7_BKPSRAM=y -CONFIG_STM32F7_DMA1=y -CONFIG_STM32F7_DMA2=y -CONFIG_STM32F7_DMACAPABLE=y -CONFIG_STM32F7_FLOWCONTROL_BROKEN=y -CONFIG_STM32F7_I2C1=y -CONFIG_STM32F7_I2C2=y -CONFIG_STM32F7_I2C3=y -CONFIG_STM32F7_I2C4=y -CONFIG_STM32F7_I2C_DYNTIMEO=y -CONFIG_STM32F7_I2C_DYNTIMEO_STARTSTOP=10 -CONFIG_STM32F7_OTGFS=y -CONFIG_STM32F7_PROGMEM=y -CONFIG_STM32F7_PWR=y -CONFIG_STM32F7_RTC=y -CONFIG_STM32F7_RTC_HSECLOCK=y -CONFIG_STM32F7_RTC_MAGIC_REG=1 -CONFIG_STM32F7_SAVE_CRASHDUMP=y -CONFIG_STM32F7_SDMMC2=y -CONFIG_STM32F7_SDMMC_DMA=y -CONFIG_STM32F7_SERIALBRK_BSDCOMPAT=y -CONFIG_STM32F7_SERIAL_DISABLE_REORDERING=y -CONFIG_STM32F7_SPI1=y -CONFIG_STM32F7_SPI2=y -CONFIG_STM32F7_SPI3=n -CONFIG_STM32F7_SPI4=n -CONFIG_STM32F7_SPI5=y -CONFIG_STM32F7_SPI6=y -CONFIG_STM32F7_TIM10=y -CONFIG_STM32F7_TIM11=y -CONFIG_STM32F7_TIM3=y -CONFIG_STM32F7_TIM9=y -CONFIG_STM32F7_UART4=y -CONFIG_STM32F7_UART5=y -CONFIG_STM32F7_UART7=y -CONFIG_STM32F7_UART8=y -CONFIG_STM32F7_USART1=y -CONFIG_STM32F7_USART2=y -CONFIG_STM32F7_USART3=y -CONFIG_STM32F7_USART6=y -CONFIG_STM32F7_USART_BREAKS=y -CONFIG_STM32F7_USART_SINGLEWIRE=y -CONFIG_STM32F7_WWDG=y -CONFIG_SYSTEM_CDCACM=y -CONFIG_SYSTEM_NSH=y -CONFIG_TASK_NAME_SIZE=24 -CONFIG_TIME_EXTENDED=y -CONFIG_UART4_BAUD=57600 -CONFIG_UART4_RXBUFSIZE=600 -CONFIG_UART4_TXBUFSIZE=1500 -CONFIG_UART5_IFLOWCONTROL=y -CONFIG_UART5_OFLOWCONTROL=y -CONFIG_UART5_RXBUFSIZE=600 -CONFIG_UART5_RXDMA=y -CONFIG_UART5_TXBUFSIZE=1500 -CONFIG_UART7_BAUD=57600 -CONFIG_UART7_IFLOWCONTROL=y -CONFIG_UART7_OFLOWCONTROL=y -CONFIG_UART7_RXBUFSIZE=600 -CONFIG_UART7_RXDMA=y -CONFIG_UART7_TXBUFSIZE=3000 -CONFIG_UART8_BAUD=57600 -CONFIG_UART8_RXBUFSIZE=600 -CONFIG_UART8_RXDMA=y -CONFIG_UART8_TXBUFSIZE=1500 -CONFIG_USART1_BAUD=57600 -CONFIG_USART1_RXBUFSIZE=600 -CONFIG_USART1_TXBUFSIZE=1500 -CONFIG_USART2_BAUD=57600 -CONFIG_USART2_IFLOWCONTROL=y -CONFIG_USART2_OFLOWCONTROL=y -CONFIG_USART2_RXBUFSIZE=600 -CONFIG_USART2_TXBUFSIZE=3000 -CONFIG_USART3_BAUD=57600 -CONFIG_USART3_RXBUFSIZE=180 -CONFIG_USART3_SERIAL_CONSOLE=y -CONFIG_USART3_TXBUFSIZE=1500 -CONFIG_USART6_BAUD=57600 -CONFIG_USART6_RXBUFSIZE=600 -CONFIG_USART6_RXDMA=y -CONFIG_USART6_TXBUFSIZE=1500 -CONFIG_USBDEV=y -CONFIG_USBDEV_BUSPOWERED=y -CONFIG_USBDEV_MAXPOWER=500 -CONFIG_USEC_PER_TICK=1000 -CONFIG_USERMAIN_STACKSIZE=2624 -CONFIG_USER_ENTRYPOINT="nsh_main" diff --git a/boards/mro/ctrl-zero-f7/default.cmake b/boards/mro/ctrl-zero-f7/default.cmake index 13963e3e0e..5a1ad7ab30 100644 --- a/boards/mro/ctrl-zero-f7/default.cmake +++ b/boards/mro/ctrl-zero-f7/default.cmake @@ -9,7 +9,6 @@ px4_add_board( ROMFSROOT px4fmu_common TESTING UAVCAN_INTERFACES 1 - SERIAL_PORTS TEL1:/dev/ttyS0 TEL2:/dev/ttyS1 @@ -17,7 +16,6 @@ px4_add_board( #RC:/dev/ttyS3 #CONSOLE:/dev/ttyS4 #FRSKY:/dev/ttyS5 - DRIVERS adc #barometer # all available barometer drivers @@ -27,6 +25,7 @@ px4_add_board( camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers + #dshot gps #heater #imu # all available imu drivers @@ -34,13 +33,16 @@ px4_add_board( imu/mpu6000 imu/icm20948 irlock - #lights/blinkm + lights/blinkm lights/rgbled + lights/rgbled_ncp5623c magnetometer # all available magnetometer drivers #md25 mkblctrl #optical_flow # all available optical flow drivers + #osd pca9685 + power_monitor/ina226 #protocol_splitter #pwm_input pwm_out_sim @@ -53,9 +55,10 @@ px4_add_board( test_ppm tone_alarm uavcan - MODULES + airspeed_selector attitude_estimator_q + battery_status camera_feedback commander dataman @@ -63,7 +66,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -73,14 +75,13 @@ px4_add_board( mc_att_control mc_pos_control mc_rate_control + #micrortps_bridge navigator - battery_status + rover_pos_control sensors sih vmount vtol_att_control - airspeed_selector - SYSTEMCMDS bl_update config @@ -109,7 +110,6 @@ px4_add_board( usb_connected ver work_queue - EXAMPLES bottle_drop # OBC challenge fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control @@ -120,5 +120,4 @@ px4_add_board( px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app uuv_example_app - ) diff --git a/boards/mro/ctrl-zero-f7/init/rc.board_sensors b/boards/mro/ctrl-zero-f7/init/rc.board_sensors index d0e6cbc696..b4e844839e 100644 --- a/boards/mro/ctrl-zero-f7/init/rc.board_sensors +++ b/boards/mro/ctrl-zero-f7/init/rc.board_sensors @@ -18,7 +18,8 @@ bmi088 start dps310 start # Possible external compasses -#ist8310 -C -b 1 start -#ist8310 -C -b 2 start -#hmc5883 -C -T -X start -#qmc5883 -X start +ist8310 -C -b 1 start +ist8310 -C -b 2 start +hmc5883 -C -T -X start +qmc5883 -X start +lis3mdl -X start diff --git a/boards/nxp/fmuk66-v3/default.cmake b/boards/nxp/fmuk66-v3/default.cmake index b61b4c1685..a6dcce0e83 100644 --- a/boards/nxp/fmuk66-v3/default.cmake +++ b/boards/nxp/fmuk66-v3/default.cmake @@ -3,17 +3,16 @@ px4_add_board( PLATFORM nuttx VENDOR nxp MODEL fmuk66-v3 + LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 ROMFSROOT px4fmu_common TESTING UAVCAN_INTERFACES 2 - SERIAL_PORTS GPS1:/dev/ttyS3 TEL1:/dev/ttyS4 TEL2:/dev/ttyS1 - DRIVERS adc barometer # all available barometer drivers @@ -36,22 +35,28 @@ px4_add_board( lights/rgbled_ncp5623c lights/rgbled_pwm magnetometer # all available magnetometer drivers + #md25 mkblctrl + #optical_flow # all available optical flow drivers optical_flow/px4flow + #osd pca9685 - #pwm_input # NOT Portable YET drivers + power_monitor/ina226 + #protocol_splitter pwm_out_sim px4fmu rc_input + roboclaw safety_button tap_esc telemetry # all available telemetry drivers #test_ppm # NOT Portable YET tone_alarm uavcan - MODULES + airspeed_selector attitude_estimator_q + battery_status camera_feedback commander dataman @@ -59,7 +64,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -67,23 +71,22 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control navigator - battery_status + rover_pos_control sensors sih vmount vtol_att_control - airspeed_selector - SYSTEMCMDS bl_update - i2cdetect config + #dmesg dumpfile esc_calib #hardfault_log # Needs bbsrm + i2cdetect led_control mixer motor_ramp @@ -104,7 +107,6 @@ px4_add_board( usb_connected ver work_queue - EXAMPLES bottle_drop # OBC challenge fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control @@ -115,5 +117,4 @@ px4_add_board( px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app uuv_example_app - ) diff --git a/boards/omnibus/f4sd/default.cmake b/boards/omnibus/f4sd/default.cmake index 8cb4bba015..dc5c0b6528 100644 --- a/boards/omnibus/f4sd/default.cmake +++ b/boards/omnibus/f4sd/default.cmake @@ -6,11 +6,9 @@ px4_add_board( TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 ROMFSROOT px4fmu_common - SERIAL_PORTS TEL2:/dev/ttyS1 URT6:/dev/ttyS2 - DRIVERS adc #barometer # all available barometer drivers @@ -31,6 +29,7 @@ px4_add_board( magnetometer/hmc5883 #mkblctrl optical_flow/px4flow + osd #pca9685 #pwm_input #pwm_out_sim @@ -40,10 +39,10 @@ px4_add_board( #telemetry # all available telemetry drivers telemetry/frsky_telemetry #test_ppm - osd - MODULES + #airspeed_selector attitude_estimator_q + battery_status #camera_feedback commander dataman @@ -51,7 +50,6 @@ px4_add_board( events #fw_att_control #fw_pos_control_l1 - #rover_pos_control land_detector landing_target_estimator load_mon @@ -59,20 +57,18 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control navigator - battery_status + #rover_pos_control sensors - sih + #sih #vmount #vtol_att_control - #airspeed_selector - SYSTEMCMDS #bl_update - dmesg config + dmesg dumpfile esc_calib hardfault_log @@ -97,15 +93,14 @@ px4_add_board( usb_connected ver work_queue - EXAMPLES #bottle_drop # OBC challenge #fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control + #hello #hwtest # Hardware test #matlab_csv_serial #px4_mavlink_debug # Tutorial code from http://dev.px4.io/en/debug/debug_values.html #px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html #rover_steering_control # Rover example app #uuv_example_app - ) diff --git a/boards/px4/fmu-v2/default.cmake b/boards/px4/fmu-v2/default.cmake index a09fa0c035..0a6e5104fc 100644 --- a/boards/px4/fmu-v2/default.cmake +++ b/boards/px4/fmu-v2/default.cmake @@ -10,15 +10,13 @@ px4_add_board( BOOTLOADER ${PX4_SOURCE_DIR}/ROMFS/px4fmu_common/extras/px4fmuv3_bl.bin IO px4_io-v2_default #TESTING - CONSTRAINED_FLASH #UAVCAN_INTERFACES 2 - + CONSTRAINED_FLASH SERIAL_PORTS GPS1:/dev/ttyS3 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 TEL4:/dev/ttyS6 - DRIVERS adc #barometer # all available barometer drivers @@ -31,10 +29,13 @@ px4_add_board( #distance_sensor # all available distance sensor drivers #distance_sensor/ll40ls #distance_sensor/sf0x + #dshot gps #heater - #imu/adis16448 #imu # all available imu drivers + #imu/adis16448 + #imu/adis16477 + #imu/adis16497 imu/l3gd20 imu/lsm303d imu/mpu6000 @@ -48,6 +49,7 @@ px4_add_board( #mkblctrl #optical_flow # all available optical flow drivers optical_flow/px4flow + #osd #pca9685 #protocol_splitter #pwm_input @@ -60,9 +62,10 @@ px4_add_board( #test_ppm tone_alarm #uavcan - MODULES + airspeed_selector #attitude_estimator_q + battery_status camera_feedback commander dataman @@ -70,7 +73,6 @@ px4_add_board( #events fw_att_control fw_pos_control_l1 - #rover_pos_control land_detector #landing_target_estimator load_mon @@ -78,18 +80,18 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control navigator - battery_status + #rover_pos_control sensors + #sih vmount vtol_att_control - airspeed_selector - SYSTEMCMDS bl_update #config + #dmesg #dumpfile #esc_calib hardfault_log @@ -104,7 +106,9 @@ px4_add_board( perf pwm reboot + #reflect #sd_bench + #shutdown #tests # tests and test runner top #topic_listener @@ -112,7 +116,6 @@ px4_add_board( #usb_connected ver #work_queue - EXAMPLES #bottle_drop # OBC challenge #fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control diff --git a/boards/px4/fmu-v2/fixedwing.cmake b/boards/px4/fmu-v2/fixedwing.cmake index 4d5e9a00fd..669166f0ad 100644 --- a/boards/px4/fmu-v2/fixedwing.cmake +++ b/boards/px4/fmu-v2/fixedwing.cmake @@ -9,23 +9,20 @@ px4_add_board( ROMFSROOT px4fmu_common IO px4_io-v2_default #TESTING - CONSTRAINED_FLASH #UAVCAN_INTERFACES 2 CONSTRAINED_FLASH - SERIAL_PORTS GPS1:/dev/ttyS3 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 TEL4:/dev/ttyS6 - DRIVERS adc #barometer # all available barometer drivers barometer/ms5611 - # batt_smbus - # camera_capture - # camera_trigger + #batt_smbus + #camera_capture + #camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers gps @@ -42,13 +39,14 @@ px4_add_board( telemetry/iridiumsbd tone_alarm #uavcan - MODULES + airspeed_selector + battery_status camera_feedback commander dataman ekf2 - # events + #events fw_att_control fw_pos_control_l1 land_detector @@ -56,18 +54,15 @@ px4_add_board( logger mavlink navigator - battery_status sensors vmount - airspeed_selector - SYSTEMCMDS - bl_update + #bl_update #config #dumpfile #esc_calib hardfault_log - # i2cdetect + #i2cdetect #led_control mixer #motor_ramp @@ -82,8 +77,7 @@ px4_add_board( top #topic_listener tune_control - # usb_connected + #usb_connected ver - # work_queue - + #work_queue ) diff --git a/boards/px4/fmu-v2/multicopter.cmake b/boards/px4/fmu-v2/multicopter.cmake index fd3a8d2b81..15b1e08e10 100644 --- a/boards/px4/fmu-v2/multicopter.cmake +++ b/boards/px4/fmu-v2/multicopter.cmake @@ -7,23 +7,20 @@ px4_add_board( TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 ROMFSROOT px4fmu_common - BOOTLOADER ${PX4_SOURCE_DIR}/ROMFS/px4fmu_common/extras/px4fmuv3_bl.bin IO px4_io-v2_default - CONSTRAINED_FLASH #UAVCAN_INTERFACES 2 - + CONSTRAINED_FLASH SERIAL_PORTS GPS1:/dev/ttyS3 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 TEL4:/dev/ttyS6 - DRIVERS adc barometer/ms5611 #batt_smbus - # camera_capture - # camera_trigger + #camera_capture + #camera_trigger distance_sensor # all available distance sensor drivers gps imu/l3gd20 @@ -37,14 +34,14 @@ px4_add_board( px4fmu px4io tone_alarm - MODULES #attitude_estimator_q + battery_status camera_feedback commander dataman ekf2 - events + #events land_detector landing_target_estimator load_mon @@ -52,13 +49,11 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control navigator - battery_status sensors vmount - SYSTEMCMDS #bl_update #config @@ -80,8 +75,7 @@ px4_add_board( top #topic_listener tune_control - # usb_connected + #usb_connected ver #work_queue - ) diff --git a/boards/px4/fmu-v2/test.cmake b/boards/px4/fmu-v2/test.cmake index ff47587f68..77bd9f1e37 100644 --- a/boards/px4/fmu-v2/test.cmake +++ b/boards/px4/fmu-v2/test.cmake @@ -11,28 +11,30 @@ px4_add_board( TESTING #UAVCAN_INTERFACES 2 CONSTRAINED_FLASH - SERIAL_PORTS - GPS1:/dev/ttyS0 + GPS1:/dev/ttyS3 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 - TEL4:/dev/ttyS3 - + TEL4:/dev/ttyS6 DRIVERS adc #barometer # all available barometer drivers barometer/ms5611 #batt_smbus - camera_trigger + #camera_capture + #camera_trigger #differential_pressure # all available differential pressure drivers differential_pressure/ms4525 #distance_sensor # all available distance sensor drivers distance_sensor/ll40ls distance_sensor/sf0x + #dshot gps #heater - #imu/adis16448 #imu # all available imu drivers + #imu/adis16448 + #imu/adis16477 + #imu/adis16497 imu/l3gd20 imu/lsm303d imu/mpu6000 @@ -46,75 +48,81 @@ px4_add_board( #mkblctrl #optical_flow # all available optical flow drivers optical_flow/px4flow + #osd #pca9685 #protocol_splitter #pwm_input #pwm_out_sim px4fmu px4io + #roboclaw #tap_esc #telemetry # all available telemetry drivers #test_ppm tone_alarm #uavcan - MODULES + #airspeed_selector #attitude_estimator_q - # camera_feedback + battery_status + camera_feedback commander dataman #ekf2 - events + #events #fw_att_control #fw_pos_control_l1 - #rover_pos_control - # land_detector - # landing_target_estimator + land_detector + #landing_target_estimator load_mon #local_position_estimator logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control navigator - battery_status + #rover_pos_control sensors - vmount - # vtol_att_control - #airspeed_selector - + #sih + #vmount + #vtol_att_control SYSTEMCMDS #bl_update #config + #dmesg #dumpfile #esc_calib hardfault_log - i2cdetect + #i2cdetect #led_control mixer #motor_ramp - motor_test + #motor_test mtd #nshterm param perf pwm reboot - sd_bench + #reflect + #sd_bench + #shutdown tests # tests and test runner top #topic_listener tune_control + #usb_connected ver - work_queue - + #work_queue EXAMPLES #bottle_drop # OBC challenge #fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control #hello #hwtest # Hardware test + #matlab_csv_serial #px4_mavlink_debug # Tutorial code from http://dev.px4.io/en/debug/debug_values.html #px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html #rover_steering_control # Rover example app + #uuv_example_app ) diff --git a/boards/px4/fmu-v3/default.cmake b/boards/px4/fmu-v3/default.cmake index 4fb71aaa08..0c92b534e8 100644 --- a/boards/px4/fmu-v3/default.cmake +++ b/boards/px4/fmu-v3/default.cmake @@ -12,13 +12,11 @@ px4_add_board( IO px4_io-v2_default TESTING UAVCAN_INTERFACES 2 - SERIAL_PORTS GPS1:/dev/ttyS3 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 TEL4:/dev/ttyS6 - DRIVERS adc barometer # all available barometer drivers @@ -30,8 +28,10 @@ px4_add_board( dshot gps #heater - imu/adis16448 #imu # all available imu drivers + imu/adis16448 + imu/adis16477 + imu/adis16497 imu/l3gd20 imu/lsm303d imu/mpu6000 @@ -47,8 +47,10 @@ px4_add_board( mkblctrl #optical_flow # all available optical flow drivers optical_flow/px4flow + #osd pca9685 - protocol_splitter + #power_monitor/ina226 + #protocol_splitter pwm_input pwm_out_sim px4fmu @@ -59,9 +61,10 @@ px4_add_board( test_ppm tone_alarm uavcan - MODULES + airspeed_selector attitude_estimator_q + battery_status camera_feedback commander dataman @@ -69,7 +72,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -77,19 +79,19 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control + #micrortps_bridge navigator - battery_status + rover_pos_control sensors sih vmount vtol_att_control - airspeed_selector - SYSTEMCMDS bl_update config + #dmesg dumpfile esc_calib hardfault_log @@ -114,7 +116,6 @@ px4_add_board( usb_connected ver work_queue - EXAMPLES bottle_drop # OBC challenge fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control @@ -125,5 +126,4 @@ px4_add_board( px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app uuv_example_app - ) diff --git a/boards/px4/fmu-v3/rtps.cmake b/boards/px4/fmu-v3/rtps.cmake index d26fdee2d8..0398236cc4 100644 --- a/boards/px4/fmu-v3/rtps.cmake +++ b/boards/px4/fmu-v3/rtps.cmake @@ -12,13 +12,11 @@ px4_add_board( IO px4_io-v2_default TESTING UAVCAN_INTERFACES 2 - SERIAL_PORTS - GPS1:/dev/ttyS0 + GPS1:/dev/ttyS3 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 - TEL4:/dev/ttyS3 - + TEL4:/dev/ttyS6 DRIVERS adc barometer # all available barometer drivers @@ -27,14 +25,18 @@ px4_add_board( camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers + dshot gps #heater - imu/adis16448 #imu # all available imu drivers + imu/adis16448 + imu/adis16477 + imu/adis16497 imu/l3gd20 imu/lsm303d imu/mpu6000 imu/mpu9250 + imu/icm20948 irlock lights/blinkm lights/rgbled @@ -45,7 +47,9 @@ px4_add_board( mkblctrl #optical_flow # all available optical flow drivers optical_flow/px4flow + #osd pca9685 + #power_monitor/ina226 protocol_splitter pwm_input pwm_out_sim @@ -57,9 +61,10 @@ px4_add_board( test_ppm tone_alarm uavcan - MODULES + airspeed_selector attitude_estimator_q + battery_status camera_feedback commander dataman @@ -67,7 +72,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -75,20 +79,19 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control micrortps_bridge navigator - battery_status + rover_pos_control sensors sih vmount vtol_att_control - airspeed_selector - SYSTEMCMDS bl_update config + #dmesg dumpfile esc_calib hardfault_log @@ -113,7 +116,6 @@ px4_add_board( usb_connected ver work_queue - EXAMPLES bottle_drop # OBC challenge fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control @@ -124,5 +126,4 @@ px4_add_board( px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app uuv_example_app - ) diff --git a/boards/px4/fmu-v4/default.cmake b/boards/px4/fmu-v4/default.cmake index 620a37b897..d37503926e 100644 --- a/boards/px4/fmu-v4/default.cmake +++ b/boards/px4/fmu-v4/default.cmake @@ -9,12 +9,10 @@ px4_add_board( ROMFSROOT px4fmu_common TESTING UAVCAN_INTERFACES 1 - SERIAL_PORTS GPS1:/dev/ttyS3 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 - DRIVERS adc barometer # all available barometer drivers @@ -27,6 +25,9 @@ px4_add_board( gps heater #imu # all available imu drivers + imu/adis16448 + imu/adis16477 + imu/adis16497 imu/mpu6000 imu/mpu9250 irlock @@ -34,20 +35,23 @@ px4_add_board( lights/rgbled lights/rgbled_ncp5623c magnetometer # all available magnetometer drivers + #md25 mkblctrl optical_flow # all available optical flow drivers + #osd pca9685 + #protocol_splitter pwm_input pwm_out_sim px4fmu rc_input + roboclaw safety_button tap_esc telemetry # all available telemetry drivers test_ppm tone_alarm uavcan - MODULES airspeed_selector attitude_estimator_q @@ -66,18 +70,19 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control + #micrortps_bridge navigator rover_pos_control sensors sih vmount vtol_att_control - SYSTEMCMDS bl_update config + #dmesg dumpfile esc_calib hardfault_log @@ -102,7 +107,6 @@ px4_add_board( usb_connected ver work_queue - EXAMPLES bottle_drop # OBC challenge fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control @@ -113,5 +117,4 @@ px4_add_board( px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app uuv_example_app - ) diff --git a/boards/px4/fmu-v4/rtps.cmake b/boards/px4/fmu-v4/rtps.cmake index 8363a5214c..5b40eae0f0 100644 --- a/boards/px4/fmu-v4/rtps.cmake +++ b/boards/px4/fmu-v4/rtps.cmake @@ -9,12 +9,10 @@ px4_add_board( ROMFSROOT px4fmu_common TESTING UAVCAN_INTERFACES 1 - SERIAL_PORTS GPS1:/dev/ttyS3 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 - DRIVERS adc barometer # all available barometer drivers @@ -27,6 +25,9 @@ px4_add_board( gps heater #imu # all available imu drivers + imu/adis16448 + imu/adis16477 + imu/adis16497 imu/mpu6000 imu/mpu9250 irlock @@ -36,19 +37,20 @@ px4_add_board( magnetometer # all available magnetometer drivers mkblctrl optical_flow # all available optical flow drivers + #osd pca9685 protocol_splitter pwm_input pwm_out_sim px4fmu rc_input + roboclaw safety_button tap_esc telemetry # all available telemetry drivers test_ppm tone_alarm uavcan - MODULES airspeed_selector attitude_estimator_q @@ -67,8 +69,8 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control micrortps_bridge navigator rover_pos_control @@ -76,10 +78,10 @@ px4_add_board( sih vmount vtol_att_control - SYSTEMCMDS bl_update config + #dmesg dumpfile esc_calib hardfault_log @@ -104,7 +106,6 @@ px4_add_board( usb_connected ver work_queue - EXAMPLES bottle_drop # OBC challenge fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control @@ -115,5 +116,4 @@ px4_add_board( px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app uuv_example_app - ) diff --git a/boards/px4/fmu-v4/stackcheck.cmake b/boards/px4/fmu-v4/stackcheck.cmake index 8f2eaa354f..161391bd43 100644 --- a/boards/px4/fmu-v4/stackcheck.cmake +++ b/boards/px4/fmu-v4/stackcheck.cmake @@ -9,12 +9,10 @@ px4_add_board( ROMFSROOT px4fmu_common TESTING #UAVCAN_INTERFACES 1 - SERIAL_PORTS GPS1:/dev/ttyS3 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 - DRIVERS adc barometer # all available barometer drivers @@ -27,6 +25,9 @@ px4_add_board( gps heater #imu # all available imu drivers + #imu/adis16448 + #imu/adis16477 + #imu/adis16497 imu/mpu6000 imu/mpu9250 irlock @@ -34,20 +35,24 @@ px4_add_board( lights/rgbled lights/rgbled_ncp5623c magnetometer # all available magnetometer drivers + #md25 mkblctrl optical_flow # all available optical flow drivers + #osd pca9685 + #power_monitor/ina226 + #protocol_splitter pwm_input pwm_out_sim px4fmu rc_input + #roboclaw safety_button tap_esc telemetry # all available telemetry drivers test_ppm tone_alarm #uavcan - MODULES airspeed_selector attitude_estimator_q @@ -66,18 +71,18 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control navigator rover_pos_control sensors sih vmount vtol_att_control - SYSTEMCMDS bl_update config + #dmesg dumpfile esc_calib hardfault_log @@ -102,7 +107,6 @@ px4_add_board( usb_connected ver work_queue - EXAMPLES #bottle_drop # OBC challenge #fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control @@ -113,5 +117,4 @@ px4_add_board( #px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html #rover_steering_control # Rover example app #uuv_example_app - ) diff --git a/boards/px4/fmu-v4pro/default.cmake b/boards/px4/fmu-v4pro/default.cmake index 52db7a1d8c..5926e7e682 100644 --- a/boards/px4/fmu-v4pro/default.cmake +++ b/boards/px4/fmu-v4pro/default.cmake @@ -10,14 +10,12 @@ px4_add_board( IO px4_io-v2_default TESTING UAVCAN_INTERFACES 2 - SERIAL_PORTS GPS1:/dev/ttyS3 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 TEL3:/dev/ttyS0 TEL4:/dev/ttyS6 - DRIVERS adc barometer # all available barometer drivers @@ -26,6 +24,7 @@ px4_add_board( camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers + #dshot gps #heater #imu # all available imu drivers @@ -41,7 +40,9 @@ px4_add_board( mkblctrl #optical_flow # all available optical flow drivers optical_flow/px4flow + #osd pca9685 + power_monitor/ina226 #protocol_splitter pwm_input pwm_out_sim @@ -53,9 +54,10 @@ px4_add_board( test_ppm tone_alarm uavcan - MODULES + airspeed_selector attitude_estimator_q + battery_status camera_feedback commander dataman @@ -63,7 +65,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -71,19 +72,19 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control + #micrortps_bridge navigator - battery_status + rover_pos_control sensors sih vmount vtol_att_control - airspeed_selector - SYSTEMCMDS bl_update config + #dmesg dumpfile esc_calib hardfault_log @@ -108,7 +109,6 @@ px4_add_board( usb_connected ver work_queue - EXAMPLES bottle_drop # OBC challenge fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control @@ -119,5 +119,4 @@ px4_add_board( px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app uuv_example_app - ) diff --git a/boards/px4/fmu-v4pro/rtps.cmake b/boards/px4/fmu-v4pro/rtps.cmake index 026bf881a3..b79b5b3657 100644 --- a/boards/px4/fmu-v4pro/rtps.cmake +++ b/boards/px4/fmu-v4pro/rtps.cmake @@ -3,34 +3,31 @@ px4_add_board( PLATFORM nuttx VENDOR px4 MODEL fmu-v4pro - LABEL default + LABEL rtps TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 ROMFSROOT px4fmu_common IO px4_io-v2_default TESTING UAVCAN_INTERFACES 2 - SERIAL_PORTS GPS1:/dev/ttyS3 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 TEL3:/dev/ttyS0 TEL4:/dev/ttyS6 - DRIVERS adc 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 + #dshot gps #heater #imu # all available imu drivers - imu/bma180 - imu/bmi160 - imu/l3gd20 imu/mpu6000 imu/mpu9250 irlock @@ -41,9 +38,10 @@ px4_add_board( magnetometer # all available magnetometer drivers #md25 mkblctrl - #optical_flow # all available optical flow drivers - optical_flow/px4flow + optical_flow # all available optical flow drivers + #osd pca9685 + power_monitor/ina226 protocol_splitter pwm_input pwm_out_sim @@ -55,9 +53,10 @@ px4_add_board( test_ppm tone_alarm uavcan - MODULES + airspeed_selector attitude_estimator_q + battery_status camera_feedback commander dataman @@ -65,7 +64,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -73,20 +71,19 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control micrortps_bridge navigator - battery_status + rover_pos_control sensors sih vmount vtol_att_control - airspeed_selector - SYSTEMCMDS bl_update config + #dmesg dumpfile esc_calib hardfault_log @@ -111,7 +108,6 @@ px4_add_board( usb_connected ver work_queue - EXAMPLES bottle_drop # OBC challenge fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control @@ -122,5 +118,4 @@ px4_add_board( px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app uuv_example_app - ) diff --git a/boards/px4/fmu-v5/default.cmake b/boards/px4/fmu-v5/default.cmake index 9625a42553..6047637844 100644 --- a/boards/px4/fmu-v5/default.cmake +++ b/boards/px4/fmu-v5/default.cmake @@ -10,13 +10,11 @@ px4_add_board( IO px4_io-v2_default TESTING UAVCAN_INTERFACES 2 - SERIAL_PORTS GPS1:/dev/ttyS0 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 TEL4:/dev/ttyS3 - DRIVERS adc barometer # all available barometer drivers @@ -28,12 +26,12 @@ px4_add_board( dshot gps #heater - imu/adis16448 - imu/adis16497 #imu # all available imu drivers + imu/adis16448 + imu/adis16477 + imu/adis16497 imu/bmi055 imu/mpu6000 - imu/mpu9250 irlock lights/blinkm lights/rgbled @@ -43,6 +41,7 @@ px4_add_board( #md25 mkblctrl optical_flow # all available optical flow drivers + #osd pca9685 power_monitor/ina226 #protocol_splitter @@ -58,9 +57,10 @@ px4_add_board( test_ppm tone_alarm uavcan - MODULES + airspeed_selector attitude_estimator_q + battery_status camera_feedback commander dataman @@ -68,7 +68,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -76,16 +75,15 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control + #micrortps_bridge navigator - battery_status + rover_pos_control sensors sih vmount vtol_att_control - airspeed_selector - SYSTEMCMDS bl_update config @@ -114,7 +112,6 @@ px4_add_board( usb_connected ver work_queue - EXAMPLES bottle_drop # OBC challenge fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control @@ -125,5 +122,4 @@ px4_add_board( px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app uuv_example_app - ) diff --git a/boards/px4/fmu-v5/fixedwing.cmake b/boards/px4/fmu-v5/fixedwing.cmake index 57bf198919..acee4338c9 100644 --- a/boards/px4/fmu-v5/fixedwing.cmake +++ b/boards/px4/fmu-v5/fixedwing.cmake @@ -9,13 +9,11 @@ px4_add_board( ROMFSROOT px4fmu_common IO px4_io-v2_default UAVCAN_INTERFACES 2 - SERIAL_PORTS GPS1:/dev/ttyS0 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 TEL4:/dev/ttyS3 - DRIVERS adc barometer # all available barometer drivers @@ -26,6 +24,9 @@ px4_add_board( distance_sensor # all available distance sensor drivers gps imu/adis16448 + imu/adis16477 + imu/adis16497 + #imu # all available imu drivers imu/bmi055 imu/mpu6000 lights/rgbled @@ -41,8 +42,9 @@ px4_add_board( telemetry # all available telemetry drivers tone_alarm uavcan - MODULES + airspeed_selector + battery_status camera_feedback commander dataman @@ -55,14 +57,12 @@ px4_add_board( logger mavlink navigator - battery_status sensors vmount - airspeed_selector - SYSTEMCMDS bl_update config + dmesg dumpfile esc_calib hardfault_log @@ -86,5 +86,4 @@ px4_add_board( usb_connected ver work_queue - ) diff --git a/boards/px4/fmu-v5/multicopter.cmake b/boards/px4/fmu-v5/multicopter.cmake index cfbd7048e8..0be3f4b9c7 100644 --- a/boards/px4/fmu-v5/multicopter.cmake +++ b/boards/px4/fmu-v5/multicopter.cmake @@ -10,13 +10,11 @@ px4_add_board( IO px4_io-v2_default TESTING UAVCAN_INTERFACES 2 - SERIAL_PORTS GPS1:/dev/ttyS0 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 TEL4:/dev/ttyS3 - DRIVERS adc barometer # all available barometer drivers @@ -24,7 +22,12 @@ px4_add_board( camera_capture camera_trigger distance_sensor # all available distance sensor drivers + dshot gps + imu/adis16448 + imu/adis16477 + imu/adis16497 + #imu # all available imu drivers imu/bmi055 imu/mpu6000 irlock @@ -45,9 +48,9 @@ px4_add_board( telemetry # all available telemetry drivers tone_alarm uavcan - MODULES attitude_estimator_q + battery_status camera_feedback commander dataman @@ -60,18 +63,16 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control navigator - battery_status sensors sih vmount - airspeed_selector - SYSTEMCMDS bl_update config + dmesg dumpfile esc_calib hardfault_log @@ -95,5 +96,4 @@ px4_add_board( usb_connected ver work_queue - ) diff --git a/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig b/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig index 5c1621b637..0e87c45b31 100644 --- a/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig +++ b/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig @@ -208,7 +208,9 @@ CONFIG_STM32F7_USART2=y CONFIG_STM32F7_USART3=y CONFIG_STM32F7_USART6=y CONFIG_STM32F7_USART_BREAKS=y +CONFIG_STM32F7_USART_INVERT=y CONFIG_STM32F7_USART_SINGLEWIRE=y +CONFIG_STM32F7_USART_SWAP=y CONFIG_STM32F7_WWDG=y CONFIG_SYSTEM_CDCACM=y CONFIG_SYSTEM_NSH=y diff --git a/boards/px4/fmu-v5/rover.cmake b/boards/px4/fmu-v5/rover.cmake index 8d5524cb59..98188c2fcd 100644 --- a/boards/px4/fmu-v5/rover.cmake +++ b/boards/px4/fmu-v5/rover.cmake @@ -9,13 +9,11 @@ px4_add_board( ROMFSROOT px4fmu_common IO px4_io-v2_default UAVCAN_INTERFACES 2 - SERIAL_PORTS GPS1:/dev/ttyS0 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 TEL4:/dev/ttyS3 - DRIVERS adc barometer # all available barometer drivers @@ -24,6 +22,9 @@ px4_add_board( camera_trigger distance_sensor # all available distance sensor drivers gps + imu/adis16448 + imu/adis16477 + imu/adis16497 imu/bmi055 imu/mpu6000 lights/rgbled @@ -44,26 +45,25 @@ px4_add_board( telemetry # all available telemetry drivers tone_alarm uavcan - MODULES + battery_status camera_feedback commander dataman ekf2 events - rover_pos_control land_detector load_mon logger mavlink navigator - battery_status + rover_pos_control sensors vmount - SYSTEMCMDS bl_update config + dmesg dumpfile esc_calib hardfault_log @@ -87,5 +87,4 @@ px4_add_board( usb_connected ver work_queue - ) diff --git a/boards/px4/fmu-v5/rtps.cmake b/boards/px4/fmu-v5/rtps.cmake index 87ff47c758..f5fd878776 100644 --- a/boards/px4/fmu-v5/rtps.cmake +++ b/boards/px4/fmu-v5/rtps.cmake @@ -10,13 +10,11 @@ px4_add_board( IO px4_io-v2_default TESTING UAVCAN_INTERFACES 2 - SERIAL_PORTS GPS1:/dev/ttyS0 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 TEL4:/dev/ttyS3 - DRIVERS adc barometer # all available barometer drivers @@ -25,13 +23,15 @@ px4_add_board( camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers + dshot gps #heater - imu/adis16448 #imu # all available imu drivers + imu/adis16448 + imu/adis16477 + imu/adis16497 imu/bmi055 imu/mpu6000 - imu/mpu9250 irlock lights/blinkm lights/rgbled @@ -41,7 +41,9 @@ px4_add_board( #md25 mkblctrl optical_flow # all available optical flow drivers + #osd pca9685 + power_monitor/ina226 protocol_splitter pwm_input pwm_out_sim @@ -55,9 +57,10 @@ px4_add_board( test_ppm tone_alarm uavcan - MODULES + airspeed_selector attitude_estimator_q + battery_status camera_feedback commander dataman @@ -65,7 +68,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -73,20 +75,19 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control micrortps_bridge navigator - battery_status + rover_pos_control sensors sih vmount vtol_att_control - airspeed_selector - SYSTEMCMDS bl_update config + dmesg dumpfile esc_calib hardfault_log @@ -111,7 +112,6 @@ px4_add_board( usb_connected ver work_queue - EXAMPLES bottle_drop # OBC challenge fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control diff --git a/boards/px4/fmu-v5/src/init.c b/boards/px4/fmu-v5/src/init.c index 56cf4ac70f..f23bfd6793 100644 --- a/boards/px4/fmu-v5/src/init.c +++ b/boards/px4/fmu-v5/src/init.c @@ -238,12 +238,12 @@ __EXPORT int board_app_initialize(uintptr_t arg) /* set up the serial DMA polling */ static struct hrt_call serial_dma_call; - struct timespec ts; /* * Poll at 1ms intervals for received bytes that have not triggered * a DMA event. */ + struct timespec ts; ts.tv_sec = 0; ts.tv_nsec = 1000000; diff --git a/boards/px4/fmu-v5/src/led.c b/boards/px4/fmu-v5/src/led.c index a45c88070b..e4da076512 100644 --- a/boards/px4/fmu-v5/src/led.c +++ b/boards/px4/fmu-v5/src/led.c @@ -32,7 +32,7 @@ ****************************************************************************/ /** - * @file px4fmu2_led.c + * @file led.c * * PX4FMU LED backend. */ diff --git a/boards/px4/fmu-v5/src/spi.cpp b/boards/px4/fmu-v5/src/spi.cpp index d94f775006..75c1daff7e 100644 --- a/boards/px4/fmu-v5/src/spi.cpp +++ b/boards/px4/fmu-v5/src/spi.cpp @@ -32,7 +32,7 @@ ****************************************************************************/ /** - * @file px4fmu_spi.c + * @file spi.cpp * * Board-specific SPI functions. */ diff --git a/boards/px4/fmu-v5/src/timer_config.c b/boards/px4/fmu-v5/src/timer_config.c index 37f57f08a0..3fe13aed11 100644 --- a/boards/px4/fmu-v5/src/timer_config.c +++ b/boards/px4/fmu-v5/src/timer_config.c @@ -32,7 +32,7 @@ ****************************************************************************/ /* - * @file px4fmu_timer_config.c + * @file timer_config.c * * Configuration data for the stm32 pwm_servo, input capture and pwm input driver. * @@ -59,7 +59,7 @@ __EXPORT const io_timers_t io_timers[MAX_IO_TIMERS] = { .first_channel_index = 0, .last_channel_index = 3, .handler = io_timer_handler0, - .vectorno = STM32_IRQ_TIM1CC, + .vectorno = STM32_IRQ_TIM1CC, .dshot = { .dma_base = STM32_DMA2_BASE, .dmamap = DMAMAP_TIM1_UP, @@ -75,7 +75,7 @@ __EXPORT const io_timers_t io_timers[MAX_IO_TIMERS] = { .first_channel_index = 4, .last_channel_index = 5, .handler = io_timer_handler1, - .vectorno = STM32_IRQ_TIM4, + .vectorno = STM32_IRQ_TIM4, }, { .base = STM32_TIM12_BASE, @@ -85,7 +85,7 @@ __EXPORT const io_timers_t io_timers[MAX_IO_TIMERS] = { .first_channel_index = 6, .last_channel_index = 7, .handler = io_timer_handler2, - .vectorno = STM32_IRQ_TIM12, + .vectorno = STM32_IRQ_TIM12, }, { .base = STM32_TIM2_BASE, @@ -95,7 +95,7 @@ __EXPORT const io_timers_t io_timers[MAX_IO_TIMERS] = { .first_channel_index = 8, .last_channel_index = 10, .handler = io_timer_handler3, - .vectorno = STM32_IRQ_TIM2, + .vectorno = STM32_IRQ_TIM2, }, { .base = STM32_TIM9_BASE, @@ -105,19 +105,18 @@ __EXPORT const io_timers_t io_timers[MAX_IO_TIMERS] = { .first_channel_index = 11, .last_channel_index = 11, .handler = io_timer_handler4, - .vectorno = STM32_IRQ_TIM9, - + .vectorno = STM32_IRQ_TIM9, } }; __EXPORT const timer_io_channels_t timer_io_channels[MAX_TIMER_IO_CHANNELS] = { { .gpio_out = GPIO_TIM1_CH4OUT, - .gpio_in = GPIO_TIM1_CH4IN, + .gpio_in = GPIO_TIM1_CH4IN, .timer_index = 0, .timer_channel = 4, .ccr_offset = STM32_GTIM_CCR4_OFFSET, - .masks = GTIM_SR_CC4IF | GTIM_SR_CC4OF + .masks = GTIM_SR_CC4IF | GTIM_SR_CC4OF }, { .gpio_out = GPIO_TIM1_CH3OUT, @@ -141,7 +140,7 @@ __EXPORT const timer_io_channels_t timer_io_channels[MAX_TIMER_IO_CHANNELS] = { .timer_index = 0, .timer_channel = 1, .ccr_offset = STM32_GTIM_CCR1_OFFSET, - .masks = GTIM_SR_CC1IF | GTIM_SR_CC1OF + .masks = GTIM_SR_CC1IF | GTIM_SR_CC1OF }, { .gpio_out = GPIO_TIM4_CH2OUT, @@ -149,7 +148,7 @@ __EXPORT const timer_io_channels_t timer_io_channels[MAX_TIMER_IO_CHANNELS] = { .timer_index = 1, .timer_channel = 2, .ccr_offset = STM32_GTIM_CCR2_OFFSET, - .masks = GTIM_SR_CC2IF | GTIM_SR_CC2OF + .masks = GTIM_SR_CC2IF | GTIM_SR_CC2OF }, { .gpio_out = GPIO_TIM4_CH3OUT, @@ -157,7 +156,7 @@ __EXPORT const timer_io_channels_t timer_io_channels[MAX_TIMER_IO_CHANNELS] = { .timer_index = 1, .timer_channel = 3, .ccr_offset = STM32_GTIM_CCR3_OFFSET, - .masks = GTIM_SR_CC3IF | GTIM_SR_CC3OF + .masks = GTIM_SR_CC3IF | GTIM_SR_CC3OF }, { .gpio_out = GPIO_TIM12_CH1OUT, @@ -165,7 +164,7 @@ __EXPORT const timer_io_channels_t timer_io_channels[MAX_TIMER_IO_CHANNELS] = { .timer_index = 2, .timer_channel = 1, .ccr_offset = STM32_GTIM_CCR1_OFFSET, - .masks = GTIM_SR_CC1IF | GTIM_SR_CC1OF + .masks = GTIM_SR_CC1IF | GTIM_SR_CC1OF }, { .gpio_out = GPIO_TIM12_CH2OUT, @@ -173,7 +172,7 @@ __EXPORT const timer_io_channels_t timer_io_channels[MAX_TIMER_IO_CHANNELS] = { .timer_index = 2, .timer_channel = 2, .ccr_offset = STM32_GTIM_CCR2_OFFSET, - .masks = GTIM_SR_CC2IF | GTIM_SR_CC2OF + .masks = GTIM_SR_CC2IF | GTIM_SR_CC2OF } }; diff --git a/boards/px4/fmu-v5/src/usb.c b/boards/px4/fmu-v5/src/usb.c index 5d26ef7720..ad6d39ec12 100644 --- a/boards/px4/fmu-v5/src/usb.c +++ b/boards/px4/fmu-v5/src/usb.c @@ -32,7 +32,7 @@ ****************************************************************************/ /** - * @file px4fmu_usb.c + * @file usb.c * * Board-specific USB functions. */ diff --git a/boards/px4/fmu-v5/stackcheck.cmake b/boards/px4/fmu-v5/stackcheck.cmake index a2f9181299..3f97b70a52 100644 --- a/boards/px4/fmu-v5/stackcheck.cmake +++ b/boards/px4/fmu-v5/stackcheck.cmake @@ -10,28 +10,29 @@ px4_add_board( IO px4_io-v2_default TESTING #UAVCAN_INTERFACES 2 - SERIAL_PORTS GPS1:/dev/ttyS0 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 TEL4:/dev/ttyS3 - DRIVERS adc + #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 + dshot gps #heater - #imu/adis16448 #imu # all available imu drivers + #imu/adis16448 + #imu/adis16477 + #imu/adis16497 #imu/bmi055 imu/mpu6000 - #imu/mpu9250 #irlock #lights/blinkm lights/rgbled @@ -39,7 +40,7 @@ px4_add_board( lights/rgbled_pwm magnetometer # all available magnetometer drivers #md25 - mkblctrl + #mkblctrl optical_flow # all available optical flow drivers #pca9685 #power_monitor/ina226 @@ -51,14 +52,15 @@ px4_add_board( rc_input #roboclaw safety_button - tap_esc + #tap_esc telemetry # all available telemetry drivers - test_ppm + #test_ppm tone_alarm #uavcan - MODULES + airspeed_selector attitude_estimator_q + battery_status camera_feedback commander dataman @@ -66,7 +68,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -74,19 +75,16 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control - #micrortps_bridge + mc_rate_control navigator - battery_status + rover_pos_control sensors sih vmount vtol_att_control - airspeed_selector - SYSTEMCMDS - #bl_update + bl_update config dmesg dumpfile @@ -106,14 +104,13 @@ px4_add_board( reflect sd_bench shutdown - # tests # tests and test runner + #tests # tests and test runner top topic_listener tune_control usb_connected ver work_queue - EXAMPLES #bottle_drop # OBC challenge #fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control diff --git a/boards/px4/fmu-v5x/default.cmake b/boards/px4/fmu-v5x/default.cmake index eddedd50d0..dd06a1060b 100644 --- a/boards/px4/fmu-v5x/default.cmake +++ b/boards/px4/fmu-v5x/default.cmake @@ -10,14 +10,12 @@ px4_add_board( IO px4_io-v2_default TESTING UAVCAN_INTERFACES 2 - SERIAL_PORTS GPS1:/dev/ttyS0 TEL1:/dev/ttyS6 TEL2:/dev/ttyS4 TEL3:/dev/ttyS2 GPS2:/dev/ttyS0 - DRIVERS adc barometer # all available barometer drivers @@ -26,11 +24,13 @@ px4_add_board( camera_trigger differential_pressure # all available differential pressure drivers distance_sensor # all available distance sensor drivers + #dshot gps #heater - imu/adis16448 - imu/adis16497 #imu # all available imu drivers + imu/adis16448 + imu/adis16477 + imu/adis16497 imu/bmi088 # TBD imu/ism330dlc - needs bus selection imu/mpu6000 @@ -42,6 +42,7 @@ px4_add_board( #md25 mkblctrl optical_flow # all available optical flow drivers + #osd pca9685 power_monitor/ina226 #protocol_splitter @@ -57,8 +58,8 @@ px4_add_board( test_ppm tone_alarm uavcan - MODULES + airspeed_selector attitude_estimator_q camera_feedback commander @@ -74,16 +75,14 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control navigator rover_pos_control sensors sih vmount vtol_att_control - airspeed_selector - SYSTEMCMDS bl_update config @@ -112,7 +111,6 @@ px4_add_board( usb_connected ver work_queue - EXAMPLES bottle_drop # OBC challenge fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control diff --git a/boards/px4/sitl/default.cmake b/boards/px4/sitl/default.cmake index b5912ec74e..6ddef271d3 100644 --- a/boards/px4/sitl/default.cmake +++ b/boards/px4/sitl/default.cmake @@ -5,7 +5,6 @@ px4_add_board( MODEL sitl LABEL default TESTING - DRIVERS #barometer # all available barometer drivers #batt_smbus @@ -19,8 +18,8 @@ px4_add_board( #telemetry # all available telemetry drivers tone_alarm #uavcan - MODULES + airspeed_selector attitude_estimator_q camera_feedback commander @@ -29,7 +28,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -37,23 +35,21 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control navigator replay + rover_pos_control sensors + #sih simulator vmount vtol_att_control - airspeed_selector - SYSTEMCMDS - #bl_update #config #dumpfile dyn esc_calib - #hardfault_log led_control mixer motor_ramp @@ -72,16 +68,17 @@ px4_add_board( tune_control ver work_queue - EXAMPLES bottle_drop # OBC challenge dyn_hello # dynamically loading modules example fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control hello #hwtest # Hardware test + #matlab_csv_serial px4_mavlink_debug # Tutorial code from http://dev.px4.io/en/debug/debug_values.html px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app + uuv_example_app ) set(config_sitl_viewer jmavsim CACHE STRING "viewer for sitl") diff --git a/boards/px4/sitl/rtps.cmake b/boards/px4/sitl/rtps.cmake index 389c76215b..3c392d3a1d 100644 --- a/boards/px4/sitl/rtps.cmake +++ b/boards/px4/sitl/rtps.cmake @@ -5,7 +5,6 @@ px4_add_board( MODEL sitl LABEL rtps TESTING - DRIVERS #barometer # all available barometer drivers #batt_smbus @@ -15,12 +14,13 @@ px4_add_board( gps #imu # all available imu drivers #magnetometer # all available magnetometer drivers + #protocol_splitter pwm_out_sim #telemetry # all available telemetry drivers tone_alarm #uavcan - MODULES + airspeed_selector attitude_estimator_q camera_feedback commander @@ -29,7 +29,6 @@ px4_add_board( events fw_att_control fw_pos_control_l1 - rover_pos_control land_detector landing_target_estimator load_mon @@ -37,27 +36,26 @@ px4_add_board( logger mavlink mc_att_control - mc_rate_control mc_pos_control + mc_rate_control micrortps_bridge navigator replay + rover_pos_control sensors + #sih simulator vmount vtol_att_control - airspeed_selector - SYSTEMCMDS - #bl_update #config #dumpfile dyn esc_calib - #hardfault_log led_control mixer motor_ramp + motor_test #mtd #nshterm param @@ -72,16 +70,17 @@ px4_add_board( tune_control ver work_queue - EXAMPLES bottle_drop # OBC challenge dyn_hello # dynamically loading modules example fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control hello #hwtest # Hardware test + #matlab_csv_serial px4_mavlink_debug # Tutorial code from http://dev.px4.io/en/debug/debug_values.html px4_simple_app # Tutorial code from http://dev.px4.io/en/apps/hello_sky.html rover_steering_control # Rover example app + uuv_example_app ) set(config_sitl_viewer jmavsim CACHE STRING "viewer for sitl") @@ -94,7 +93,7 @@ set_property(CACHE config_sitl_debugger PROPERTY STRINGS "disable;gdb;lldb") # support. In this case, we enable the orb publisher rules. set(REPLAY_FILE "$ENV{replay}") if(REPLAY_FILE) - message("Building with uorb publisher rules support") + message(STATUS "Building with uorb publisher rules support") add_definitions(-DORB_USE_PUBLISHER_RULES) message(STATUS "Building without lockstep for replay") diff --git a/boards/uvify/core/default.cmake b/boards/uvify/core/default.cmake index 6e36477534..1e3834b605 100644 --- a/boards/uvify/core/default.cmake +++ b/boards/uvify/core/default.cmake @@ -8,12 +8,10 @@ px4_add_board( ARCHITECTURE cortex-m4 ROMFSROOT px4fmu_common UAVCAN_INTERFACES 1 - SERIAL_PORTS GPS1:/dev/ttyS3 TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 - DRIVERS adc barometer/ms5611 @@ -38,7 +36,6 @@ px4_add_board( rc_input tone_alarm uavcan - MODULES attitude_estimator_q battery_status @@ -60,7 +57,6 @@ px4_add_board( sensors sih vmount - SYSTEMCMDS bl_update config