diff --git a/.ci/Jenkinsfile-compile b/.ci/Jenkinsfile-compile index 8199a99d68..f5c5b3aad3 100644 --- a/.ci/Jenkinsfile-compile +++ b/.ci/Jenkinsfile-compile @@ -37,6 +37,7 @@ pipeline { def nuttx_builds_archive = [ target: [ "airmind_mindpx-v2_default", + "ark_can-flow_canbootloader", "ark_can-flow_default", "av_x-v1_default", "bitcraze_crazyflie_default", @@ -49,21 +50,21 @@ pipeline { "cubepilot_cubeorange_default", "cubepilot_cubeyellow_console", "cubepilot_cubeyellow_default", + "holybro_can-gps-v1_canbootloader", + "holybro_can-gps-v1_default", "holybro_durandal-v1_default", "holybro_kakutef7_default", "holybro_pix32v5_default", - "holybro_can-gps-v1", - "holybro_can-gps-v1_canbootloader", "intel_aerofc-v1_default", "modalai_fc-v1_default", "mro_ctrl-zero-f7_default", "mro_pixracerpro_default", "mro_x21-777_default", "mro_x21_default", + "nxp_fmuk66-e_default", "nxp_fmuk66-v3_default", "nxp_fmuk66-v3_rtps", "nxp_fmuk66-v3_socketcan", - "nxp_fmuk66-e_default", "nxp_fmurt1062-v1_default", "nxp_ucans32k146_default", "omnibus_f4sd_default", @@ -89,10 +90,12 @@ pipeline { "px4_fmu-v5_rover", "px4_fmu-v5_rtps", "px4_fmu-v5_stackcheck", + "px4_fmu-v5_uavcanv0periph", + "px4_fmu-v5_uavcanv1", "px4_fmu-v5x_base_phy_DP83848C", "px4_fmu-v5x_default", - "px4_fmu-v6x_default", "px4_fmu-v6u_default", + "px4_fmu-v6x_default", "px4_io-v2_default", "spracing_h7extreme_default", "uvify_core_default" diff --git a/.github/workflows/compile_nuttx.yml b/.github/workflows/compile_nuttx.yml index 0569cd13ed..884cbd257d 100644 --- a/.github/workflows/compile_nuttx.yml +++ b/.github/workflows/compile_nuttx.yml @@ -19,8 +19,8 @@ jobs: ark_can-flow_canbootloader, ark_can-flow_default, av_x-v1_default, - bitcraze_crazyflie_default, bitcraze_crazyflie21_default, + bitcraze_crazyflie_default, cuav_can-gps-v1_canbootloader, cuav_can-gps-v1_default, cuav_nora_default, @@ -59,7 +59,6 @@ jobs: px4_fmu-v4_ctrlalloc, px4_fmu-v4_default, px4_fmu-v4_optimized, - px4_fmu-v4_uavcanv1, px4_fmu-v4pro_default, px4_fmu-v5_ctrlalloc, px4_fmu-v5_default, @@ -69,11 +68,12 @@ jobs: px4_fmu-v5_rover, px4_fmu-v5_rtps, px4_fmu-v5_stackcheck, + px4_fmu-v5_uavcanv0periph, px4_fmu-v5_uavcanv1, px4_fmu-v5x_base_phy_DP83848C, px4_fmu-v5x_default, - px4_fmu-v6x_default, px4_fmu-v6u_default, + px4_fmu-v6x_default, px4_io-v2_default, spracing_h7extreme_default, uvify_core_default diff --git a/boards/cuav/nora/uavcan.cmake b/boards/cuav/nora/uavcan.cmake deleted file mode 100644 index 08df98ad5b..0000000000 --- a/boards/cuav/nora/uavcan.cmake +++ /dev/null @@ -1,127 +0,0 @@ - -px4_add_board( - PLATFORM nuttx - VENDOR cuav - MODEL nora - LABEL uavcan - TOOLCHAIN arm-none-eabi - ARCHITECTURE cortex-m7 - ROMFSROOT px4fmu_common - #BUILD_BOOTLOADER - #TESTING - UAVCAN_INTERFACES 2 - UAVCAN_TIMER_OVERRIDE 2 - UAVCAN_PERIPHERALS - cuav_can-gps-v1_default - SERIAL_PORTS - GPS1:/dev/ttyS0 - TEL1:/dev/ttyS1 - GPS2:/dev/ttyS2 - TEL2:/dev/ttyS3 - # CONSOLE: /dev/ttyS4 - # RC: /dev/ttyS5 - DRIVERS - adc/board_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/bosch/bmi088 - imu/invensense/icm20649 - imu/invensense/icm20689 - irlock - lights/blinkm - lights/rgbled - lights/rgbled_ncp5623c - lights/rgbled_pwm - magnetometer # all available magnetometer drivers - optical_flow # all available optical flow drivers - #osd - pca9685 - power_monitor/ina226 - #protocol_splitter - pwm_out_sim - pwm_out - rc_input - roboclaw - safety_button - #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 - flight_mode_manager - fw_att_control - fw_pos_control_l1 - land_detector - landing_target_estimator - load_mon - local_position_estimator - logger - mavlink - mc_att_control - mc_hover_thrust_estimator - mc_pos_control - mc_rate_control - navigator - rc_update - rover_pos_control - sensors - sih - temperature_compensation - vmount - vtol_att_control - SYSTEMCMDS - #bl_update - dmesg - dumpfile - esc_calib - hardfault_log - i2cdetect - led_control - mft - mixer - motor_ramp - motor_test - mtd - nshterm - param - perf - pwm - reboot - reflect - sd_bench - system_time - #tests # tests and test runner - top - topic_listener - tune_control - usb_connected - ver - work_queue - EXAMPLES - #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 - #work_item - ) diff --git a/boards/cuav/x7pro/uavcan.cmake b/boards/cuav/x7pro/uavcan.cmake deleted file mode 100644 index 58dfdf0a33..0000000000 --- a/boards/cuav/x7pro/uavcan.cmake +++ /dev/null @@ -1,127 +0,0 @@ - -px4_add_board( - PLATFORM nuttx - VENDOR cuav - MODEL x7pro - LABEL uavcan - TOOLCHAIN arm-none-eabi - ARCHITECTURE cortex-m7 - ROMFSROOT px4fmu_common - #BUILD_BOOTLOADER - #TESTING - UAVCAN_INTERFACES 2 - UAVCAN_TIMER_OVERRIDE 2 - UAVCAN_PERIPHERALS - cuav_can-gps-v1_default - SERIAL_PORTS - GPS1:/dev/ttyS0 - TEL1:/dev/ttyS1 - GPS2:/dev/ttyS2 - TEL2:/dev/ttyS3 - # CONSOLE: /dev/ttyS4 - # RC: /dev/ttyS5 - DRIVERS - adc/board_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/bosch/bmi088 - imu/invensense/icm20649 - imu/invensense/icm20689 - irlock - lights/blinkm - lights/rgbled - lights/rgbled_ncp5623c - lights/rgbled_pwm - magnetometer # all available magnetometer drivers - optical_flow # all available optical flow drivers - #osd - pca9685 - power_monitor/ina226 - #protocol_splitter - pwm_out_sim - pwm_out - rc_input - roboclaw - safety_button - #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 - flight_mode_manager - fw_att_control - fw_pos_control_l1 - land_detector - landing_target_estimator - load_mon - local_position_estimator - logger - mavlink - mc_att_control - mc_hover_thrust_estimator - mc_pos_control - mc_rate_control - navigator - rc_update - rover_pos_control - sensors - sih - temperature_compensation - vmount - vtol_att_control - SYSTEMCMDS - #bl_update - dmesg - dumpfile - esc_calib - hardfault_log - i2cdetect - led_control - mft - mixer - motor_ramp - motor_test - mtd - nshterm - param - perf - pwm - reboot - reflect - sd_bench - system_time - #tests # tests and test runner - top - topic_listener - tune_control - usb_connected - ver - work_queue - EXAMPLES - #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 - #work_item - ) diff --git a/boards/px4/fmu-v4/uavcanv1.cmake b/boards/px4/fmu-v4/uavcanv1.cmake deleted file mode 100644 index acb0d8bbf2..0000000000 --- a/boards/px4/fmu-v4/uavcanv1.cmake +++ /dev/null @@ -1,137 +0,0 @@ - -px4_add_board( - PLATFORM nuttx - VENDOR px4 - MODEL fmu-v4 - LABEL uavcanv1 - 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 - WIFI:/dev/ttyS0 - - DRIVERS - adc/board_adc - adc/ads1115 - 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/analog_devices/adis16448 - imu/adis16477 - imu/adis16497 - imu/invensense/icm20602 - imu/invensense/icm20608g - imu/invensense/icm40609d - imu/invensense/mpu6500 - imu/invensense/mpu9250 - irlock - lights/blinkm - lights/rgbled - lights/rgbled_ncp5623c - magnetometer # all available magnetometer drivers - optical_flow # all available optical flow drivers - #osd - pca9685 - pca9685_pwm_out - #protocol_splitter - pwm_input - pwm_out_sim - pwm_out - rc_input - roboclaw - safety_button - tap_esc - telemetry # all available telemetry drivers - test_ppm - tone_alarm - #uavcan - uavcan_v1 - MODULES - airspeed_selector - attitude_estimator_q - battery_status - camera_feedback - commander - dataman - ekf2 - esc_battery - events - flight_mode_manager - fw_att_control - fw_pos_control_l1 - land_detector - landing_target_estimator - load_mon - local_position_estimator - logger - mavlink - mc_att_control - mc_hover_thrust_estimator - mc_pos_control - mc_rate_control - #micrortps_bridge - navigator - rc_update - rover_pos_control - sensors - sih - temperature_compensation - uuv_att_control - vmount - vtol_att_control - SYSTEMCMDS - bl_update - #dmesg - dumpfile - esc_calib - gpio - hardfault_log - i2cdetect - led_control - mft - mixer - motor_ramp - motor_test - mtd - nshterm - param - perf - pwm - reboot - reflect - sd_bench - system_time - tests # tests and test runner - top - topic_listener - tune_control - uorb - usb_connected - ver - work_queue - EXAMPLES - fake_gyro - fake_magnetometer - fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control - gyro_fft - 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 - work_item - ) diff --git a/boards/px4/fmu-v5/uavcan.cmake b/boards/px4/fmu-v5/uavcanv0periph.cmake similarity index 93% rename from boards/px4/fmu-v5/uavcan.cmake rename to boards/px4/fmu-v5/uavcanv0periph.cmake index 5ded8a87b6..2459f85ac6 100644 --- a/boards/px4/fmu-v5/uavcan.cmake +++ b/boards/px4/fmu-v5/uavcanv0periph.cmake @@ -3,12 +3,12 @@ px4_add_board( PLATFORM nuttx VENDOR px4 MODEL fmu-v5 - LABEL uavcan + LABEL uavcanv0periph TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common IO px4_io-v2_default - TESTING + #TESTING UAVCAN_INTERFACES 2 UAVCAN_PERIPHERALS cuav_can-gps-v1_default @@ -37,8 +37,8 @@ px4_add_board( imu/invensense/icm20602 imu/invensense/icm20689 #imu/mpu6000 # legacy icm20602/icm20689 driver - irlock - lights/blinkm + #irlock + #lights/blinkm lights/rgbled lights/rgbled_ncp5623c lights/rgbled_pwm @@ -78,7 +78,7 @@ px4_add_board( land_detector landing_target_estimator load_mon - local_position_estimator + #local_position_estimator logger mavlink mc_att_control @@ -90,9 +90,10 @@ px4_add_board( rc_update #rover_pos_control sensors - sih + #sih temperature_compensation #uuv_att_control + #uuv_pos_control vmount vtol_att_control SYSTEMCMDS @@ -121,11 +122,15 @@ px4_add_board( top topic_listener tune_control + uorb usb_connected ver work_queue EXAMPLES + #fake_gyro + #fake_magnetometer #fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control + #gyro_fft #hello #hwtest # Hardware test #matlab_csv_serial diff --git a/boards/px4/fmu-v5/uavcanv1.cmake b/boards/px4/fmu-v5/uavcanv1.cmake index e7612a0fd1..5410bc653b 100644 --- a/boards/px4/fmu-v5/uavcanv1.cmake +++ b/boards/px4/fmu-v5/uavcanv1.cmake @@ -8,7 +8,7 @@ px4_add_board( ARCHITECTURE cortex-m7 ROMFSROOT px4fmu_common IO px4_io-v2_default - TESTING + #TESTING UAVCAN_INTERFACES 2 SERIAL_PORTS GPS1:/dev/ttyS0 @@ -57,7 +57,7 @@ px4_add_board( safety_button tap_esc telemetry # all available telemetry drivers - test_ppm + #test_ppm tone_alarm #uavcan # legacy v0 uavcan_v1 @@ -92,6 +92,7 @@ px4_add_board( sih temperature_compensation uuv_att_control + uuv_pos_control vmount vtol_att_control SYSTEMCMDS @@ -116,7 +117,7 @@ px4_add_board( reflect sd_bench system_time - tests # tests and test runner + #tests # tests and test runner top topic_listener tune_control @@ -125,16 +126,16 @@ px4_add_board( ver work_queue EXAMPLES - fake_gyro - fake_magnetometer - fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control - gyro_fft - hello - hwtest # Hardware test + #fake_gyro + #fake_magnetometer + #fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control + #gyro_fft + #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 - work_item + #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 + #work_item )