From eb89cddea3b82d6dd331c9c7c901ff955c037d6e Mon Sep 17 00:00:00 2001 From: jwilson Date: Tue, 26 Apr 2016 15:01:54 -0700 Subject: [PATCH] Adds pressure sensor driver to the build and modifies the configuration file to get the associated driver loaded. --- .../qurt_eagle_legacy_driver_release.cmake | 5 ++ .../eagle/200qx/px4-flight-v1-board.config | 48 +++++++++---------- .../eagle/200qx/px4-flight-v2-board.config | 48 +++++++++---------- posix-configs/eagle/210qc/px4-flight.config | 25 +++++----- 4 files changed, 66 insertions(+), 60 deletions(-) diff --git a/cmake/configs/qurt_eagle_legacy_driver_release.cmake b/cmake/configs/qurt_eagle_legacy_driver_release.cmake index ece4f8a54d..4e8d3ae774 100644 --- a/cmake/configs/qurt_eagle_legacy_driver_release.cmake +++ b/cmake/configs/qurt_eagle_legacy_driver_release.cmake @@ -41,6 +41,7 @@ set(config_module_list # drivers/device modules/sensors + platforms/posix/drivers/df_bmp280_wrapper ${EAGLE_DRIVERS_SRC}/mpu_spi ${EAGLE_DRIVERS_SRC}/uart_esc ${EAGLE_DRIVERS_SRC}/rc_receiver @@ -99,3 +100,7 @@ set(config_module_list # modules/muorb/adsp ) + +set(config_df_driver_list + bmp280 + ) diff --git a/posix-configs/eagle/200qx/px4-flight-v1-board.config b/posix-configs/eagle/200qx/px4-flight-v1-board.config index d7f54064bd..61120ad5e0 100644 --- a/posix-configs/eagle/200qx/px4-flight-v1-board.config +++ b/posix-configs/eagle/200qx/px4-flight-v1-board.config @@ -3,17 +3,21 @@ param set CAL_GYRO0_ID 2293760 param set CAL_ACC0_ID 1310720 param set CAL_ACC1_ID 1376256 param set CAL_MAG0_ID 196608 -commander start -param set RC_RECEIVER_TYPE 1 -rc_receiver start -D /dev/tty-1 -attitude_estimator_q start -position_estimator_inav start -mc_pos_control start -mc_att_control start -sleep 1 param set SYS_AUTOSTART 4001 param set SYS_AUTOCONFIG 1 param set MAV_TYPE 2 +param set MC_YAW_P 7.0 +param set MC_YAWRATE_P 0.08 +param set MC_YAWRATE_I 0.0 +param set MC_YAWRATE_D 0 +param set MC_PITCH_P 7.0 +param set MC_PITCHRATE_P 0.08 +param set MC_PITCHRATE_I 0.0 +param set MC_PITCHRATE_D 0.0001 +param set MC_ROLL_P 7.0 +param set MC_ROLLRATE_P 0.08 +param set MC_ROLLRATE_I 0.0 +param set MC_ROLLRATE_D 0.0001 param set RC_MAP_THROTTLE 1 param set RC_MAP_ROLL 2 param set RC_MAP_PITCH 3 @@ -44,27 +48,12 @@ param set RC6_MAX 1900 param set RC6_MIN 1099 param set RC6_TRIM 1099 param set RC6_REV 1 -sensors start -param set MC_YAW_P 7.0 -param set MC_YAWRATE_P 0.08 -param set MC_YAWRATE_I 0.0 -param set MC_YAWRATE_D 0 -param set MC_PITCH_P 7.0 -param set MC_PITCHRATE_P 0.08 -param set MC_PITCHRATE_I 0.0 -param set MC_PITCHRATE_D 0.0001 -param set MC_ROLL_P 7.0 -param set MC_ROLLRATE_P 0.08 -param set MC_ROLLRATE_I 0.0 -param set MC_ROLLRATE_D 0.0001 param set ATT_W_MAG 0.00 param set PE_MAG_NOISE 1.0f param set SENS_BOARD_ROT 6 param set MPU_GYRO_LPF_ENUM 4 param set MPU_ACC_LPF_ENUM 4 param set MPU_SAMPLE_RATE_ENUM 2 -sleep 1 -mpu9x50 start -D /dev/spi-1 param set UART_ESC_MODEL 0 param set UART_ESC_BAUDRATE 250000 param set UART_ESC_PX4MOTOR1 2 @@ -72,8 +61,19 @@ param set UART_ESC_PX4MOTOR2 4 param set UART_ESC_PX4MOTOR3 1 param set UART_ESC_PX4MOTOR4 3 sleep 1 +commander start +rc_receiver start -D /dev/tty-1 +sleep 1 +mpu9x50 start -D /dev/spi-1 +df_bmp280_wrapper start +sensors start +attitude_estimator_q start +position_estimator_inav start +mc_pos_control start +mc_att_control start +land_detector start multicopter +sleep 1 uart_esc start -D /dev/tty-2 -csr_gps start -D /dev/tty-3 list_devices list_files list_tasks diff --git a/posix-configs/eagle/200qx/px4-flight-v2-board.config b/posix-configs/eagle/200qx/px4-flight-v2-board.config index 7e323c2ecd..11072428e5 100644 --- a/posix-configs/eagle/200qx/px4-flight-v2-board.config +++ b/posix-configs/eagle/200qx/px4-flight-v2-board.config @@ -3,17 +3,21 @@ param set CAL_GYRO0_ID 2293760 param set CAL_ACC0_ID 1310720 param set CAL_ACC1_ID 1376256 param set CAL_MAG0_ID 196608 -commander start -param set RC_RECEIVER_TYPE 1 -rc_receiver start -D /dev/tty-1 -attitude_estimator_q start -position_estimator_inav start -mc_pos_control start -mc_att_control start -sleep 1 param set SYS_AUTOSTART 4001 param set SYS_AUTOCONFIG 1 param set MAV_TYPE 2 +param set MC_YAW_P 7.0 +param set MC_YAWRATE_P 0.08 +param set MC_YAWRATE_I 0.0 +param set MC_YAWRATE_D 0 +param set MC_PITCH_P 7.0 +param set MC_PITCHRATE_P 0.08 +param set MC_PITCHRATE_I 0.0 +param set MC_PITCHRATE_D 0.0001 +param set MC_ROLL_P 7.0 +param set MC_ROLLRATE_P 0.08 +param set MC_ROLLRATE_I 0.0 +param set MC_ROLLRATE_D 0.0001 param set RC_MAP_THROTTLE 1 param set RC_MAP_ROLL 2 param set RC_MAP_PITCH 3 @@ -44,27 +48,12 @@ param set RC6_MAX 1900 param set RC6_MIN 1099 param set RC6_TRIM 1099 param set RC6_REV 1 -sensors start -param set MC_YAW_P 7.0 -param set MC_YAWRATE_P 0.08 -param set MC_YAWRATE_I 0.0 -param set MC_YAWRATE_D 0 -param set MC_PITCH_P 7.0 -param set MC_PITCHRATE_P 0.08 -param set MC_PITCHRATE_I 0.0 -param set MC_PITCHRATE_D 0.0001 -param set MC_ROLL_P 7.0 -param set MC_ROLLRATE_P 0.08 -param set MC_ROLLRATE_I 0.0 -param set MC_ROLLRATE_D 0.0001 param set ATT_W_MAG 0.00 param set PE_MAG_NOISE 1.0f param set SENS_BOARD_ROT 0 param set MPU_GYRO_LPF_ENUM 4 param set MPU_ACC_LPF_ENUM 4 param set MPU_SAMPLE_RATE_ENUM 2 -sleep 1 -mpu9x50 start -D /dev/spi-1 param set UART_ESC_MODEL 0 param set UART_ESC_BAUDRATE 250000 param set UART_ESC_PX4MOTOR1 2 @@ -72,8 +61,19 @@ param set UART_ESC_PX4MOTOR2 4 param set UART_ESC_PX4MOTOR3 1 param set UART_ESC_PX4MOTOR4 3 sleep 1 +commander start +rc_receiver start -D /dev/tty-1 +sleep 1 +mpu9x50 start -D /dev/spi-1 +df_bmp280_wrapper start +sensors start +attitude_estimator_q start +position_estimator_inav start +mc_pos_control start +mc_att_control start +land_detector start multicopter +sleep 1 uart_esc start -D /dev/tty-2 -csr_gps start -D /dev/tty-3 list_devices list_files list_tasks diff --git a/posix-configs/eagle/210qc/px4-flight.config b/posix-configs/eagle/210qc/px4-flight.config index d1f207d513..d4da43dce7 100644 --- a/posix-configs/eagle/210qc/px4-flight.config +++ b/posix-configs/eagle/210qc/px4-flight.config @@ -4,13 +4,6 @@ param set CAL_ACC0_ID 1310720 param set CAL_ACC1_ID 1376256 param set CAL_MAG0_ID 196608 param set MAV_TYPE 2 -commander start -param set RC_RECEIVER_TYPE 1 -rc_receiver start -D /dev/tty-1 -attitude_estimator_q start -position_estimator_inav start -mc_pos_control start -mc_att_control start param set MC_YAW_P 12 param set MC_YAWRATE_P 0.08 param set MC_YAWRATE_I 0.0 @@ -23,7 +16,6 @@ param set MC_ROLL_P 7.0 param set MC_ROLLRATE_P 0.08 param set MC_ROLLRATE_I 0.0 param set MC_ROLLRATE_D 0.001 -sleep 1 param set RC_MAP_THROTTLE 1 param set RC_MAP_ROLL 2 param set RC_MAP_PITCH 3 @@ -54,7 +46,6 @@ param set RC6_MAX 1900 param set RC6_MIN 1099 param set RC6_TRIM 1099 param set RC6_REV 1 -sensors start param set ATT_W_MAG 0.00 param set PE_MAG_NOISE 1.0f param set SENS_BOARD_ROT 0 @@ -79,8 +70,7 @@ param set ACC0_ZOFF -0.0398 param set ACC0_XSCALE 1.0004 param set ACC0_YSCALE 0.9974 param set ACC0_ZSCALE 0.9951 -sleep 1 -mpu9x50 start -D /dev/spi-1 +param set RC_RECEIVER_TYPE 1 param set UART_ESC_MODEL 2 param set UART_ESC_BAUDRATE 250000 param set UART_ESC_PX4MOTOR1 4 @@ -88,8 +78,19 @@ param set UART_ESC_PX4MOTOR2 2 param set UART_ESC_PX4MOTOR3 1 param set UART_ESC_PX4MOTOR4 3 sleep 1 +commander start +rc_receiver start -D /dev/tty-1 +sleep 1 +mpu9x50 start -D /dev/spi-1 +df_bmp280_wrapper start +sensors start +attitude_estimator_q start +position_estimator_inav start +mc_pos_control start +mc_att_control start +land_detector start multicopter +sleep 1 uart_esc start -D /dev/tty-2 -csr_gps start -D /dev/tty-3 list_devices list_files list_tasks