Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 02:16:53 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

boards: CUAV keep Nora and X7pro in sync

Browse Source
This commit is contained in:
Daniel Agar
2021-04-05 11:39:29 -04:00
parent 695adbc037
commit 565c644b2e
7 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/cuav/nora/default.cmake
+1 -1
View File
@@ -34,7 +34,7 @@ px4_add_board(
imu/bosch/bmi088 imu/bosch/bmi088
imu/invensense/icm20649 imu/invensense/icm20649
imu/invensense/icm20689 imu/invensense/icm20689
#imu/invensense/icm20948 # required for ak09916 mag imu/invensense/icm20948 # required for ak09916 mag
irlock irlock
lights # all available light drivers lights # all available light drivers
lights/rgbled_pwm lights/rgbled_pwm
boards/cuav/nora/init/rc.board_defaults
+3
View File
@@ -3,6 +3,9 @@
# board specific defaults # board specific defaults
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Enables the 2nd bank of mixers
set AUX_BANK2 yes
param set-default BAT_V_DIV 18 param set-default BAT_V_DIV 18
param set-default BAT1_V_DIV 18 param set-default BAT1_V_DIV 18
param set-default BAT2_V_DIV 18 param set-default BAT2_V_DIV 18
boards/cuav/nora/nuttx-config/include/board.h
+17 -15
View File
@@ -250,25 +250,27 @@
#define GPIO_CAN2_TX GPIO_CAN2_TX_1 /* PB13 */ #define GPIO_CAN2_TX GPIO_CAN2_TX_1 /* PB13 */
/* SPI */ /* SPI */
#define GPIO_SPI1_SCK GPIO_SPI1_SCK_3 /* PG11 */ #define ADJ_SLEW_RATE(p) (((p) & ~GPIO_SPEED_MASK) | (GPIO_SPEED_2MHz))
#define GPIO_SPI1_MISO GPIO_SPI1_MISO_1 /* PA6 */
#define GPIO_SPI1_MOSI GPIO_SPI1_MOSI_3 /* PD7 */
#define GPIO_SPI2_SCK GPIO_SPI2_SCK_6 /* PI1 */ #define GPIO_SPI1_SCK ADJ_SLEW_RATE(GPIO_SPI1_SCK_3) /* PG11 */
#define GPIO_SPI2_MISO GPIO_SPI2_MISO_3 /* PI2 */ #define GPIO_SPI1_MISO GPIO_SPI1_MISO_1 /* PA6 */
#define GPIO_SPI2_MOSI GPIO_SPI2_MOSI_4 /* PI3 */ #define GPIO_SPI1_MOSI GPIO_SPI1_MOSI_3 /* PD7 */
#define GPIO_SPI4_SCK GPIO_SPI4_SCK_2 /* PE2 */ #define GPIO_SPI2_SCK ADJ_SLEW_RATE(GPIO_SPI2_SCK_6) /* PI1 */
#define GPIO_SPI4_MISO GPIO_SPI4_MISO_1 /* PE13 */ #define GPIO_SPI2_MISO GPIO_SPI2_MISO_3 /* PI2 */
#define GPIO_SPI4_MOSI GPIO_SPI4_MOSI_2 /* PE6 */ #define GPIO_SPI2_MOSI GPIO_SPI2_MOSI_4 /* PI3 */
#define GPIO_SPI5_SCK GPIO_SPI5_SCK_1 /* PF7 */ #define GPIO_SPI4_SCK ADJ_SLEW_RATE(GPIO_SPI4_SCK_2) /* PE2 */
#define GPIO_SPI5_MISO GPIO_SPI5_MISO_1 /* PF8 */ #define GPIO_SPI4_MISO GPIO_SPI4_MISO_1 /* PE13 */
#define GPIO_SPI5_MOSI GPIO_SPI5_MOSI_2 /* PF9 */ #define GPIO_SPI4_MOSI GPIO_SPI4_MOSI_2 /* PE6 */
#define GPIO_SPI6_SCK GPIO_SPI6_SCK_1 /* PG13 */ #define GPIO_SPI5_SCK ADJ_SLEW_RATE(GPIO_SPI5_SCK_1) /* PF7 */
#define GPIO_SPI6_MISO GPIO_SPI6_MISO_1 /* PG12 */ #define GPIO_SPI5_MISO GPIO_SPI5_MISO_1 /* PF8 */
#define GPIO_SPI6_MOSI GPIO_SPI6_MOSI_2 /* PA7 */ #define GPIO_SPI5_MOSI GPIO_SPI5_MOSI_2 /* PF9 */
#define GPIO_SPI6_SCK ADJ_SLEW_RATE(GPIO_SPI6_SCK_1) /* PG13 */
#define GPIO_SPI6_MISO GPIO_SPI6_MISO_1 /* PG12 */
#define GPIO_SPI6_MOSI GPIO_SPI6_MOSI_2 /* PA7 */
/* I2C */ /* I2C */
#define GPIO_I2C1_SCL GPIO_I2C1_SCL_2 /* PB8 */ #define GPIO_I2C1_SCL GPIO_I2C1_SCL_2 /* PB8 */
boards/cuav/nora/test.cmake
+3 -3
View File
@@ -49,8 +49,8 @@ px4_add_board(
pwm_out_sim pwm_out_sim
pwm_out pwm_out
rc_input rc_input
roboclaw #roboclaw
rpm #rpm
safety_button safety_button
telemetry # all available telemetry drivers telemetry # all available telemetry drivers
test_ppm test_ppm
@@ -84,7 +84,7 @@ px4_add_board(
#micrortps_bridge #micrortps_bridge
navigator navigator
rc_update rc_update
rover_pos_control #rover_pos_control
sensors sensors
sih sih
temperature_compensation temperature_compensation
boards/cuav/x7pro/default.cmake
+1
View File
@@ -30,6 +30,7 @@ px4_add_board(
gps gps
heater heater
#imu # all available imu drivers #imu # all available imu drivers
imu/analog_devices/adis16448
imu/analog_devices/adis16470 imu/analog_devices/adis16470
imu/bosch/bmi088 imu/bosch/bmi088
imu/invensense/icm20649 imu/invensense/icm20649
boards/cuav/x7pro/init/rc.board_defaults
-2
View File
@@ -17,7 +17,5 @@ param set-default BAT2_A_PER_V 24
# Enable IMU thermal control # Enable IMU thermal control
param set-default SENS_EN_THERMAL 1 param set-default SENS_EN_THERMAL 1
param set-default IMU_GYRO_FFT_EN 1
rgbled_pwm start rgbled_pwm start
safety_button start safety_button start
boards/cuav/x7pro/test.cmake
+4 -3
View File
@@ -31,6 +31,7 @@ px4_add_board(
gps gps
heater heater
#imu # all available imu drivers #imu # all available imu drivers
imu/analog_devices/adis16448
imu/analog_devices/adis16470 imu/analog_devices/adis16470
imu/bosch/bmi088 imu/bosch/bmi088
imu/invensense/icm20649 imu/invensense/icm20649
@@ -49,8 +50,8 @@ px4_add_board(
pwm_out_sim pwm_out_sim
pwm_out pwm_out
rc_input rc_input
roboclaw #roboclaw
rpm #rpm
safety_button safety_button
telemetry # all available telemetry drivers telemetry # all available telemetry drivers
test_ppm test_ppm
@@ -84,7 +85,7 @@ px4_add_board(
#micrortps_bridge #micrortps_bridge
navigator navigator
rc_update rc_update
rover_pos_control #rover_pos_control
sensors sensors
sih sih
temperature_compensation temperature_compensation