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

delete accel_report (alias for sensor_accel_s)

Browse Source
This commit is contained in:
Daniel Agar
2018-11-06 07:43:43 +08:00
committed by Lorenz Meier
parent 22c9fb7290
commit 2a83a40491
24 changed files with 86 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/drv_accel.h
-1
View File
@@ -52,7 +52,6 @@
#define ACCEL2_DEVICE_PATH "/dev/accel2"
#include <uORB/topics/sensor_accel.h>
#define accel_report sensor_accel_s
/** accel scaling factors; Vout = Vscale * (Vin + Voffset) */
struct accel_calibration_s {
src/drivers/imu/adis16448/adis16448.cpp
+7 -7
View File
@@ -603,7 +603,7 @@ ADIS16448::init()
goto out;
}
_accel_reports = new ringbuffer::RingBuffer(2, sizeof(accel_report));
_accel_reports = new ringbuffer::RingBuffer(2, sizeof(sensor_accel_s));
if (_accel_reports == nullptr) {
goto out;
@@ -665,7 +665,7 @@ ADIS16448::init()
measure();
/* advertise sensor topic, measure manually to initialize valid report */
struct accel_report arp;
sensor_accel_s arp;
_accel_reports->get(&arp);
/* measurement will have generated a report, publish */
@@ -841,7 +841,7 @@ ADIS16448::_set_gyro_dyn_range(uint16_t desired_gyro_dyn_range)
ssize_t
ADIS16448::read(struct file *filp, char *buffer, size_t buflen)
{
unsigned count = buflen / sizeof(accel_report);
unsigned count = buflen / sizeof(sensor_accel_s);
/* buffer must be large enough */
if (count < 1) {
@@ -862,7 +862,7 @@ ADIS16448::read(struct file *filp, char *buffer, size_t buflen)
perf_count(_accel_reads);
/* copy reports out of our buffer to the caller */
accel_report *arp = reinterpret_cast<accel_report *>(buffer);
sensor_accel_s *arp = reinterpret_cast<sensor_accel_s *>(buffer);
int transferred = 0;
while (count--) {
@@ -875,7 +875,7 @@ ADIS16448::read(struct file *filp, char *buffer, size_t buflen)
}
/* return the number of bytes transferred */
return (transferred * sizeof(accel_report));
return (transferred * sizeof(sensor_accel_s));
}
int
@@ -1353,7 +1353,7 @@ ADIS16448::measure()
/*
* Report buffers.
*/
accel_report arb;
sensor_accel_s arb;
gyro_report grb;
mag_report mrb;
@@ -1750,7 +1750,7 @@ fail:
void
test()
{
accel_report a_report;
sensor_accel_s a_report{};
gyro_report g_report;
mag_report m_report;
src/drivers/imu/adis16477/ADIS16477.cpp
+2 -2
View File
@@ -200,7 +200,7 @@ ADIS16477::init()
measure();
/* advertise sensor topic, measure manually to initialize valid report */
accel_report arp = {};
sensor_accel_s arp = {};
/* measurement will have generated a report, publish */
_accel_topic = orb_advertise_multi(ORB_ID(sensor_accel), &arp, &_accel_orb_class_instance, ORB_PRIO_MAX);
@@ -593,7 +593,7 @@ ADIS16477::measure()
bool
ADIS16477::publish_accel(const ADISReport &report)
{
accel_report arb = {};
sensor_accel_s arb = {};
arb.timestamp = hrt_absolute_time();
arb.device_id = _device_id.devid;
arb.error_count = perf_event_count(_bad_transfers);
src/drivers/imu/adis16477/ADIS16477_main.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ fail:
void
test()
{
accel_report a_report;
sensor_accel_s a_report{};
gyro_report g_report;
ssize_t sz;
src/drivers/imu/bma180/bma180.cpp
+6 -6
View File
@@ -278,7 +278,7 @@ BMA180::init()
}
/* allocate basic report buffers */
_reports = new ringbuffer::RingBuffer(2, sizeof(accel_report));
_reports = new ringbuffer::RingBuffer(2, sizeof(sensor_accel_s));
if (_reports == nullptr) {
goto out;
@@ -325,7 +325,7 @@ BMA180::init()
measure();
if (_class_instance == CLASS_DEVICE_PRIMARY) {
struct accel_report arp;
sensor_accel_s arp;
_reports->get(&arp);
/* measurement will have generated a report, publish */
@@ -352,8 +352,8 @@ BMA180::probe()
ssize_t
BMA180::read(struct file *filp, char *buffer, size_t buflen)
{
unsigned count = buflen / sizeof(struct accel_report);
struct accel_report *arp = reinterpret_cast<struct accel_report *>(buffer);
unsigned count = buflen / sizeof(sensor_accel_s);
sensor_accel_s *arp = reinterpret_cast<sensor_accel_s *>(buffer);
int ret = 0;
/* buffer must be large enough */
@@ -661,7 +661,7 @@ BMA180::measure()
// } raw_report;
// #pragma pack(pop)
struct accel_report report;
sensor_accel_s report;
/* start the performance counter */
perf_begin(_sample_perf);
@@ -796,7 +796,7 @@ void
test()
{
int fd = -1;
struct accel_report a_report;
sensor_accel_s a_report;
ssize_t sz;
/* get the driver */
src/drivers/imu/bmi055/BMI055_accel.cpp
+6 -6
View File
@@ -116,7 +116,7 @@ BMI055_accel::init()
}
/* allocate basic report buffers */
_accel_reports = new ringbuffer::RingBuffer(2, sizeof(accel_report));
_accel_reports = new ringbuffer::RingBuffer(2, sizeof(sensor_accel_s));
if (_accel_reports == nullptr) {
goto out;
@@ -139,7 +139,7 @@ BMI055_accel::init()
measure();
/* advertise sensor topic, measure manually to initialize valid report */
struct accel_report arp;
sensor_accel_s arp;
_accel_reports->get(&arp);
/* measurement will have generated a report, publish */
@@ -262,7 +262,7 @@ BMI055_accel::accel_set_sample_rate(float frequency)
ssize_t
BMI055_accel::read(struct file *filp, char *buffer, size_t buflen)
{
unsigned count = buflen / sizeof(accel_report);
unsigned count = buflen / sizeof(sensor_accel_s);
/* buffer must be large enough */
if (count < 1) {
@@ -281,7 +281,7 @@ BMI055_accel::read(struct file *filp, char *buffer, size_t buflen)
}
/* copy reports out of our buffer to the caller */
accel_report *arp = reinterpret_cast<accel_report *>(buffer);
sensor_accel_s *arp = reinterpret_cast<sensor_accel_s *>(buffer);
int transferred = 0;
while (count--) {
@@ -294,7 +294,7 @@ BMI055_accel::read(struct file *filp, char *buffer, size_t buflen)
}
/* return the number of bytes transferred */
return (transferred * sizeof(accel_report));
return (transferred * sizeof(sensor_accel_s));
}
int
@@ -671,7 +671,7 @@ BMI055_accel::measure()
/*
* Report buffers.
*/
accel_report arb;
sensor_accel_s arb;
arb.timestamp = hrt_absolute_time();
src/drivers/imu/bmi055/bmi055_main.cpp
+1 -1
View File
@@ -225,7 +225,7 @@ test(bool external_bus, enum sensor_type sensor)
{
const char *path_accel = external_bus ? BMI055_DEVICE_PATH_ACCEL_EXT : BMI055_DEVICE_PATH_ACCEL;
const char *path_gyro = external_bus ? BMI055_DEVICE_PATH_GYRO_EXT : BMI055_DEVICE_PATH_GYRO;
accel_report a_report;
sensor_accel_s a_report{};
gyro_report g_report;
ssize_t sz;
src/drivers/imu/bmi160/bmi160.cpp
+6 -6
View File
@@ -138,7 +138,7 @@ BMI160::init()
}
/* allocate basic report buffers */
_accel_reports = new ringbuffer::RingBuffer(2, sizeof(accel_report));
_accel_reports = new ringbuffer::RingBuffer(2, sizeof(sensor_accel_s));
if (_accel_reports == nullptr) {
goto out;
@@ -184,7 +184,7 @@ BMI160::init()
measure();
/* advertise sensor topic, measure manually to initialize valid report */
struct accel_report arp;
sensor_accel_s arp;
_accel_reports->get(&arp);
/* measurement will have generated a report, publish */
@@ -444,7 +444,7 @@ BMI160::_set_dlpf_filter(uint16_t bandwidth)
ssize_t
BMI160::read(struct file *filp, char *buffer, size_t buflen)
{
unsigned count = buflen / sizeof(accel_report);
unsigned count = buflen / sizeof(sensor_accel_s);
/* buffer must be large enough */
if (count < 1) {
@@ -465,7 +465,7 @@ BMI160::read(struct file *filp, char *buffer, size_t buflen)
perf_count(_accel_reads);
/* copy reports out of our buffer to the caller */
accel_report *arp = reinterpret_cast<accel_report *>(buffer);
sensor_accel_s *arp = reinterpret_cast<sensor_accel_s *>(buffer);
int transferred = 0;
while (count--) {
@@ -478,7 +478,7 @@ BMI160::read(struct file *filp, char *buffer, size_t buflen)
}
/* return the number of bytes transferred */
return (transferred * sizeof(accel_report));
return (transferred * sizeof(sensor_accel_s));
}
int
@@ -1043,7 +1043,7 @@ BMI160::measure()
/*
* Report buffers.
*/
accel_report arb;
sensor_accel_s arb{};
gyro_report grb;
/*
src/drivers/imu/bmi160/bmi160_main.cpp
+1 -1
View File
@@ -121,7 +121,7 @@ test(bool external_bus)
{
const char *path_accel = external_bus ? BMI160_DEVICE_PATH_ACCEL_EXT : BMI160_DEVICE_PATH_ACCEL;
const char *path_gyro = external_bus ? BMI160_DEVICE_PATH_GYRO_EXT : BMI160_DEVICE_PATH_GYRO;
accel_report a_report;
sensor_accel_s a_report{};
gyro_report g_report;
ssize_t sz;
src/drivers/imu/fxos8701cq/fxos8701cq.cpp
+8 -8
View File
@@ -582,7 +582,7 @@ FXOS8701CQ::init()
}
/* allocate basic report buffers */
_accel_reports = new ringbuffer::RingBuffer(2, sizeof(accel_report));
_accel_reports = new ringbuffer::RingBuffer(2, sizeof(sensor_accel_s));
if (_accel_reports == nullptr) {
return ret;
@@ -643,7 +643,7 @@ FXOS8701CQ::init()
_accel_class_instance = register_class_devname(ACCEL_BASE_DEVICE_PATH);
/* advertise sensor topic, measure manually to initialize valid report */
struct accel_report arp;
sensor_accel_s arp;
_accel_reports->get(&arp);
/* measurement will have generated a report, publish */
@@ -717,8 +717,8 @@ FXOS8701CQ::probe()
ssize_t
FXOS8701CQ::read(struct file *filp, char *buffer, size_t buflen)
{
unsigned count = buflen / sizeof(struct accel_report);
accel_report *arb = reinterpret_cast<accel_report *>(buffer);
unsigned count = buflen / sizeof(sensor_accel_s);
sensor_accel_s *arb = reinterpret_cast<sensor_accel_s *>(buffer);
int ret = 0;
/* buffer must be large enough */
@@ -1305,7 +1305,7 @@ FXOS8701CQ::measure()
} raw_accel_mag_report;
#pragma pack(pop)
accel_report accel_report;
sensor_accel_s accel_report;
/* start the performance counter */
perf_begin(_accel_sample_perf);
@@ -1761,7 +1761,7 @@ test()
{
int rv = 1;
int fd_accel = -1;
struct accel_report accel_report;
sensor_accel_s accel_report;
ssize_t sz;
#if !defined(BOARD_HAS_NOISY_FXOS8700_MAG)
int fd_mag = -1;
@@ -1778,9 +1778,9 @@ test()
}
/* do a simple demand read */
sz = read(fd_accel, &accel_report, sizeof(accel_report));
sz = read(fd_accel, &accel_report, sizeof(sensor_accel_s));
if (sz != sizeof(accel_report)) {
if (sz != sizeof(sensor_accel_s)) {
PX4_ERR("immediate read failed");
goto exit_with_accel;
}
src/drivers/imu/lsm303d/lsm303d.cpp
+8 -8
View File
@@ -617,7 +617,7 @@ LSM303D::init()
}
/* allocate basic report buffers */
_accel_reports = new ringbuffer::RingBuffer(2, sizeof(accel_report));
_accel_reports = new ringbuffer::RingBuffer(2, sizeof(sensor_accel_s));
if (_accel_reports == nullptr) {
goto out;
@@ -654,7 +654,7 @@ LSM303D::init()
_accel_class_instance = register_class_devname(ACCEL_BASE_DEVICE_PATH);
/* advertise sensor topic, measure manually to initialize valid report */
struct accel_report arp;
sensor_accel_s arp;
_accel_reports->get(&arp);
/* measurement will have generated a report, publish */
@@ -731,8 +731,8 @@ LSM303D::probe()
ssize_t
LSM303D::read(struct file *filp, char *buffer, size_t buflen)
{
unsigned count = buflen / sizeof(struct accel_report);
accel_report *arb = reinterpret_cast<accel_report *>(buffer);
unsigned count = buflen / sizeof(sensor_accel_s);
sensor_accel_s *arb = reinterpret_cast<sensor_accel_s *>(buffer);
int ret = 0;
/* buffer must be large enough */
@@ -1370,7 +1370,7 @@ LSM303D::measure()
} raw_accel_report;
#pragma pack(pop)
accel_report accel_report;
sensor_accel_s accel_report;
/* start the performance counter */
perf_begin(_accel_sample_perf);
@@ -1845,7 +1845,7 @@ void
test()
{
int fd_accel = -1;
struct accel_report accel_report;
sensor_accel_s accel_report;
ssize_t sz;
int ret;
@@ -1857,9 +1857,9 @@ test()
}
/* do a simple demand read */
sz = read(fd_accel, &accel_report, sizeof(accel_report));
sz = read(fd_accel, &accel_report, sizeof(sensor_accel_s));
if (sz != sizeof(accel_report)) {
if (sz != sizeof(sensor_accel_s)) {
err(1, "immediate read failed");
}
src/drivers/imu/mpu6000/mpu6000.cpp
+7 -7
View File
@@ -634,7 +634,7 @@ MPU6000::init()
ret = -ENOMEM;
/* allocate basic report buffers */
_accel_reports = new ringbuffer::RingBuffer(2, sizeof(accel_report));
_accel_reports = new ringbuffer::RingBuffer(2, sizeof(sensor_accel_s));
if (_accel_reports == nullptr) {
return ret;
@@ -706,7 +706,7 @@ MPU6000::init()
measure();
/* advertise sensor topic, measure manually to initialize valid report */
struct accel_report arp;
sensor_accel_s arp;
_accel_reports->get(&arp);
/* measurement will have generated a report, publish */
@@ -1003,7 +1003,7 @@ MPU6000::_set_icm_acc_dlpf_filter(uint16_t frequency_hz)
ssize_t
MPU6000::read(struct file *filp, char *buffer, size_t buflen)
{
unsigned count = buflen / sizeof(accel_report);
unsigned count = buflen / sizeof(sensor_accel_s);
/* buffer must be large enough */
if (count < 1) {
@@ -1022,7 +1022,7 @@ MPU6000::read(struct file *filp, char *buffer, size_t buflen)
}
/* copy reports out of our buffer to the caller */
accel_report *arp = reinterpret_cast<accel_report *>(buffer);
sensor_accel_s *arp = reinterpret_cast<sensor_accel_s *>(buffer);
int transferred = 0;
while (count--) {
@@ -1035,7 +1035,7 @@ MPU6000::read(struct file *filp, char *buffer, size_t buflen)
}
/* return the number of bytes transferred */
return (transferred * sizeof(accel_report));
return (transferred * sizeof(sensor_accel_s));
}
int
@@ -1818,7 +1818,7 @@ MPU6000::measure()
/*
* Report buffers.
*/
accel_report arb;
sensor_accel_s arb;
gyro_report grb;
/*
@@ -2270,7 +2270,7 @@ void
test(enum MPU6000_BUS busid)
{
struct mpu6000_bus_option &bus = find_bus(busid);
accel_report a_report;
sensor_accel_s a_report{};
gyro_report g_report;
ssize_t sz;
src/drivers/imu/mpu9250/main.cpp
+1 -1
View File
@@ -316,7 +316,7 @@ void
test(enum MPU9250_BUS busid)
{
struct mpu9250_bus_option &bus = find_bus(busid);
accel_report a_report;
sensor_accel_s a_report{};
gyro_report g_report;
mag_report m_report;
ssize_t sz;
src/drivers/imu/mpu9250/mpu9250.cpp
+6 -6
View File
@@ -288,7 +288,7 @@ MPU9250::init()
}
/* allocate basic report buffers */
_accel_reports = new ringbuffer::RingBuffer(2, sizeof(accel_report));
_accel_reports = new ringbuffer::RingBuffer(2, sizeof(sensor_accel_s));
ret = -ENOMEM;
if (_accel_reports == nullptr) {
@@ -390,7 +390,7 @@ MPU9250::init()
measure();
/* advertise sensor topic, measure manually to initialize valid report */
struct accel_report arp;
sensor_accel_s arp;
_accel_reports->get(&arp);
/* measurement will have generated a report, publish */
@@ -621,7 +621,7 @@ MPU9250::_set_dlpf_filter(uint16_t frequency_hz)
ssize_t
MPU9250::read(struct file *filp, char *buffer, size_t buflen)
{
unsigned count = buflen / sizeof(accel_report);
unsigned count = buflen / sizeof(sensor_accel_s);
/* buffer must be large enough */
if (count < 1) {
@@ -642,7 +642,7 @@ MPU9250::read(struct file *filp, char *buffer, size_t buflen)
perf_count(_accel_reads);
/* copy reports out of our buffer to the caller */
accel_report *arp = reinterpret_cast<accel_report *>(buffer);
sensor_accel_s *arp = reinterpret_cast<sensor_accel_s *>(buffer);
int transferred = 0;
while (count--) {
@@ -655,7 +655,7 @@ MPU9250::read(struct file *filp, char *buffer, size_t buflen)
}
/* return the number of bytes transferred */
return (transferred * sizeof(accel_report));
return (transferred * sizeof(sensor_accel_s));
}
int
@@ -1287,7 +1287,7 @@ MPU9250::measure()
/*
* Report buffers.
*/
accel_report arb;
sensor_accel_s arb{};
gyro_report grb;
/*