From 507cce78d5ed6f96f393e8937cbd65e6f8cc7aa4 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Thu, 19 Aug 2021 10:57:06 -0400 Subject: [PATCH] boards: px4_fmu-v6{u,x} fix test variant flash overflow and sync defaults --- boards/px4/fmu-v6u/default.cmake | 10 +++---- boards/px4/fmu-v6u/test.cmake | 27 +++++++++---------- boards/px4/fmu-v6x/default.cmake | 1 + boards/px4/fmu-v6x/test.cmake | 43 ++++++++++++++++++------------- src/drivers/uavcan/CMakeLists.txt | 1 + 5 files changed, 46 insertions(+), 36 deletions(-) diff --git a/boards/px4/fmu-v6u/default.cmake b/boards/px4/fmu-v6u/default.cmake index aa2ac66ee9..0d740efa07 100644 --- a/boards/px4/fmu-v6u/default.cmake +++ b/boards/px4/fmu-v6u/default.cmake @@ -50,7 +50,7 @@ px4_add_board( uavcan MODULES airspeed_selector - attitude_estimator_q + #attitude_estimator_q battery_status camera_feedback commander @@ -66,7 +66,7 @@ px4_add_board( land_detector landing_target_estimator load_mon - local_position_estimator + #local_position_estimator logger mavlink mc_att_control @@ -103,15 +103,15 @@ px4_add_board( perf pwm reboot - reflect + #reflect sd_bench - serial_test + #serial_test system_time top topic_listener tune_control uorb - usb_connected + #usb_connected ver work_queue EXAMPLES diff --git a/boards/px4/fmu-v6u/test.cmake b/boards/px4/fmu-v6u/test.cmake index 23e626864d..c116a216fc 100644 --- a/boards/px4/fmu-v6u/test.cmake +++ b/boards/px4/fmu-v6u/test.cmake @@ -14,14 +14,15 @@ px4_add_board( TEL3:/dev/ttyS1 GPS2:/dev/ttyS7 DRIVERS - adc/ads1115 + #adc/ads1115 adc/board_adc - barometer # all available barometer drivers - batt_smbus - camera_capture + #barometer # all available barometer drivers + barometer/bmp388 + #batt_smbus + #camera_capture camera_trigger differential_pressure # all available differential pressure drivers - distance_sensor # all available distance sensor drivers + #distance_sensor # all available distance sensor drivers dshot gps heater @@ -34,19 +35,19 @@ px4_add_board( lights # all available light drivers magnetometer # all available magnetometer drivers optical_flow # all available optical flow drivers - osd - pca9685 - pca9685_pwm_out + #osd + #pca9685 + #pca9685_pwm_out power_monitor/ina226 #protocol_splitter #pwm_input - Need to create arch/stm32 arch/stm32h7 pwm_out_sim pwm_out rc_input - roboclaw - rpm + #roboclaw + #rpm safety_button - telemetry # all available telemetry drivers + #telemetry # all available telemetry drivers test_ppm tone_alarm uavcan @@ -58,7 +59,7 @@ px4_add_board( commander dataman ekf2 - esc_battery + #esc_battery events flight_mode_manager fw_att_control @@ -78,7 +79,7 @@ px4_add_board( #micrortps_bridge navigator rc_update - rover_pos_control + #rover_pos_control sensors sih temperature_compensation diff --git a/boards/px4/fmu-v6x/default.cmake b/boards/px4/fmu-v6x/default.cmake index 79679347e0..36098cb2d0 100644 --- a/boards/px4/fmu-v6x/default.cmake +++ b/boards/px4/fmu-v6x/default.cmake @@ -91,6 +91,7 @@ px4_add_board( SYSTEMCMDS bl_update dmesg + dumpfile esc_calib gpio hardfault_log diff --git a/boards/px4/fmu-v6x/test.cmake b/boards/px4/fmu-v6x/test.cmake index 1298633241..75530e1fc0 100644 --- a/boards/px4/fmu-v6x/test.cmake +++ b/boards/px4/fmu-v6x/test.cmake @@ -17,14 +17,15 @@ px4_add_board( TEL3:/dev/ttyS1 GPS2:/dev/ttyS7 DRIVERS - adc/ads1115 + #adc/ads1115 adc/board_adc - barometer # all available barometer drivers - batt_smbus - camera_capture + #barometer # all available barometer drivers + barometer/bmp388 + #batt_smbus + #camera_capture camera_trigger differential_pressure # all available differential pressure drivers - distance_sensor # all available distance sensor drivers + #distance_sensor # all available distance sensor drivers dshot gps heater @@ -34,22 +35,25 @@ px4_add_board( imu/invensense/icm20649 imu/invensense/icm20948 # required for ak09916 mag imu/invensense/icm42688p - irlock + #irlock lights # all available light drivers - magnetometer # all available magnetometer drivers - optical_flow # all available optical flow drivers - osd - pca9685 - pca9685_pwm_out + #magnetometer # all available magnetometer drivers + magnetometer/bosch/bmm150 + magnetometer/isentek/ist8310 + #optical_flow # all available optical flow drivers + #osd + #pca9685 + #pca9685_pwm_out power_monitor/ina226 #protocol_splitter pwm_out_sim pwm_out px4io rc_input - rpm + #roboclaw + #rpm safety_button - telemetry # all available telemetry drivers + #telemetry # all available telemetry drivers test_ppm tone_alarm uavcan @@ -60,7 +64,7 @@ px4_add_board( commander dataman ekf2 - esc_battery + #esc_battery events flight_mode_manager fw_att_control @@ -80,7 +84,7 @@ px4_add_board( #micrortps_bridge navigator rc_update - rover_pos_control + #rover_pos_control sensors sih temperature_compensation @@ -91,6 +95,7 @@ px4_add_board( SYSTEMCMDS bl_update dmesg + dumpfile esc_calib gpio hardfault_log @@ -99,6 +104,7 @@ px4_add_board( mft microbench mixer + motor_ramp motor_test mtd nshterm @@ -107,10 +113,11 @@ px4_add_board( perf pwm reboot + #reflect sd_bench serial_test system_time -# tests # tests and test runner + tests # tests and test runner top topic_listener tune_control @@ -120,8 +127,8 @@ px4_add_board( work_queue EXAMPLES fake_gps - #fake_imu - #fake_magnetometer + fake_imu + fake_magnetometer #fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control #hello #hwtest # Hardware test diff --git a/src/drivers/uavcan/CMakeLists.txt b/src/drivers/uavcan/CMakeLists.txt index 5c8fcb96e4..d1526fc0b4 100644 --- a/src/drivers/uavcan/CMakeLists.txt +++ b/src/drivers/uavcan/CMakeLists.txt @@ -163,6 +163,7 @@ px4_add_module( DEPENDS px4_uavcan_dsdlc + drivers_rangefinder led mixer mixer_module