fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 14:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

boards: add new spi+i2c config

Browse Source 
Chip-select and SPI initialization uses the new config, whereas the drivers
still use the existing defines.

The configuration in board_config.h can be removed after all drivers are
updated.
This commit is contained in:
Beat Küng
2020-03-10 10:11:43 -04:00
committed by Daniel Agar
parent 06712450a7
commit 1851665fab
142 changed files with 2607 additions and 5655 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/drv_sensor.h
+17 -6
View File
@@ -65,15 +65,17 @@
#define DRV_ACC_DEVTYPE_LSM303D 0x11
#define DRV_ACC_DEVTYPE_BMA180 0x12
#define DRV_ACC_DEVTYPE_MPU6000 0x13
#define DRV_ACC_DEVTYPE_MPU6000 0x13 // TODO: remove this
#define DRV_ACC_DEVTYPE_ACCELSIM 0x14
#define DRV_ACC_DEVTYPE_MPU9250 0x16
#define DRV_ACC_DEVTYPE_MPU9250 0x16 // TOOD: remove this
#define DRV_ACC_DEVTYPE_BMI160 0x17
#define DRV_GYR_DEVTYPE_MPU6000 0x21
#define DRV_IMU_DEVTYPE_MPU6000 DRV_GYR_DEVTYPE_MPU6000
#define DRV_GYR_DEVTYPE_L3GD20 0x22
#define DRV_GYR_DEVTYPE_GYROSIM 0x23
#define DRV_GYR_DEVTYPE_MPU9250 0x24
#define DRV_IMU_DEVTYPE_MPU9250 DRV_GYR_DEVTYPE_MPU9250
#define DRV_GYR_DEVTYPE_BMI160 0x25
#define DRV_RNG_DEVTYPE_MB12XX 0x31
@@ -82,12 +84,15 @@
#define DRV_ACC_DEVTYPE_MPU6500 0x34
#define DRV_GYR_DEVTYPE_MPU6050 0x35
#define DRV_GYR_DEVTYPE_MPU6500 0x36
#define DRV_ACC_DEVTYPE_ICM20602 0x37
#define DRV_ACC_DEVTYPE_ICM20602 0x37 // TODO: remove this
#define DRV_GYR_DEVTYPE_ICM20602 0x38
#define DRV_IMU_DEVTYPE_ICM20602 DRV_GYR_DEVTYPE_ICM20602
#define DRV_ACC_DEVTYPE_ICM20608 0x39
#define DRV_GYR_DEVTYPE_ICM20608 0x3A
#define DRV_GYR_DEVTYPE_ICM20608 0x3A // TODO: remove this
#define DRV_IMU_DEVTYPE_ICM20608 DRV_GYR_DEVTYPE_ICM20608
#define DRV_ACC_DEVTYPE_ICM20689 0x3B
#define DRV_GYR_DEVTYPE_ICM20689 0x3C
#define DRV_GYR_DEVTYPE_ICM20689 0x3C // TODO: remove this
#define DRV_IMU_DEVTYPE_ICM20689 DRV_GYR_DEVTYPE_ICM20689
#define DRV_BARO_DEVTYPE_MS5611 0x3D
#define DRV_BARO_DEVTYPE_MS5607 0x3E
#define DRV_BARO_DEVTYPE_BMP280 0x3F
@@ -120,10 +125,16 @@
#define DRV_ACC_DEVTYPE_ADIS16497 0x63
#define DRV_GYR_DEVTYPE_ADIS16497 0x64
#define DRV_BARO_DEVTYPE_BAROSIM 0x65
#define DRV_DEVTYPE_BMI088 0x66
#define DRV_GYR_DEVTYPE_BMI088 0x66
#define DRV_DEVTYPE_BMP388 0x67
#define DRV_DEVTYPE_DPS310 0x68
#define DRV_DEVTYPE_ST_ISM330DLC 0x69
#define DRV_ACC_DEVTYPE_BMI088 0x6a
#define DRV_OSD_DEVTYPE_ATXXXX 0x6b
#define DRV_FLOW_DEVTYPE_PMW3901 0x6c
#define DRV_DEVTYPE_UNUSED 0xff
/*
* ioctl() definitions
src/drivers/imu/bmi088/BMI088_accel.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ BMI088_accel::BMI088_accel(int bus, const char *path_accel, uint32_t device, enu
_duplicates(perf_alloc(PC_COUNT, "bmi088_accel_duplicates")),
_got_duplicate(false)
{
_px4_accel.set_device_type(DRV_DEVTYPE_BMI088);
_px4_accel.set_device_type(DRV_GYR_DEVTYPE_BMI088);
}
BMI088_accel::~BMI088_accel()
src/drivers/imu/bmi088/BMI088_gyro.cpp
+1 -1
View File
@@ -63,7 +63,7 @@ BMI088_gyro::BMI088_gyro(int bus, const char *path_gyro, uint32_t device, enum R
_bad_transfers(perf_alloc(PC_COUNT, "bmi088_gyro_bad_transfers")),
_bad_registers(perf_alloc(PC_COUNT, "bmi088_gyro_bad_registers"))
{
_px4_gyro.set_device_type(DRV_DEVTYPE_BMI088);
_px4_gyro.set_device_type(DRV_GYR_DEVTYPE_BMI088);
}
BMI088_gyro::~BMI088_gyro()
src/drivers/px4fmu/fmu.cpp
+1 -1
View File
@@ -1497,7 +1497,7 @@ PX4FMU::sensor_reset(int ms)
ms = 1;
}
board_spi_reset(ms);
board_spi_reset(ms, 0xffff);
}
void