Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

boards: alphabetize and sync common drivers and modules #13532

Merged
merged 2 commits into from Nov 21, 2019
Merged

boards: alphabetize and sync common drivers and modules #13532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7915dc2
boards: alphabetize and sync common drivers and modules
dagar Nov 20, 2019
9dc460d
delete unused md25 driver
dagar Nov 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/Jenkinsfile-compile
View file
Open in desktop
Expand Up @@ -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
]
Expand Down
2 changes: 1 addition & 1 deletion Tools/docker_run.sh
View file
Open in desktop
Expand Up @@ -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
Expand Down
20 changes: 9 additions & 11 deletions boards/aerotenna/ocpoc/ubuntu.cmake → boards/aerotenna/ocpoc/default.cmake
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -24,40 +24,38 @@ 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
ekf2
events
fw_att_control
fw_pos_control_l1
rover_pos_control
land_detector
landing_target_estimator
load_mon
local_position_estimator
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
Expand All @@ -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
Expand Down
23 changes: 13 additions & 10 deletions boards/airmind/mindpx-v2/default.cmake
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -31,51 +32,55 @@ px4_add_board(
irlock
lights/blinkm
lights/rgbled
#lights/rgbled_ncp5623c
magnetometer # all available magnetometer drivers
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
ekf2
events
fw_att_control
fw_pos_control_l1
rover_pos_control
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
sih
vmount
vtol_att_control
airspeed_selector

SYSTEMCMDS
bl_update
config
#dmesg
dumpfile
esc_calib
hardfault_log
Expand All @@ -100,7 +105,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
Expand All @@ -111,5 +115,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

)
24 changes: 11 additions & 13 deletions boards/auav/x21/default.cmake
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -31,15 +31,16 @@ 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
Expand All @@ -50,37 +51,36 @@ px4_add_board(
test_ppm
tone_alarm
uavcan

MODULES
airspeed_selector
attitude_estimator_q
battery_status
camera_feedback
commander
dataman
ekf2
events
fw_att_control
fw_pos_control_l1
rover_pos_control
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
sih
vmount
vtol_att_control
airspeed_selector

SYSTEMCMDS
bl_update
config
#dmesg
dumpfile
esc_calib
hardfault_log
Expand All @@ -105,7 +105,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
Expand All @@ -116,5 +115,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

)