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

delete gyro_report (alias for sensor_gyro_s)

Browse Source
This commit is contained in:
Daniel Agar
2018-11-06 07:43:43 +08:00
committed by Lorenz Meier
parent 42f9aa6e43
commit acc24da0c2
25 changed files with 79 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/drv_gyro.h
-1
View File
@@ -49,7 +49,6 @@
#define GYRO_BASE_DEVICE_PATH "/dev/gyro"
#include <uORB/topics/sensor_gyro.h>
#define gyro_report sensor_gyro_s
/** gyro scaling factors; Vout = (Vin * Vscale) + Voffset */
struct gyro_calibration_s {
src/drivers/imu/adis16448/adis16448.cpp
+7 -7
View File
@@ -597,7 +597,7 @@ ADIS16448::init()
}
/* allocate basic report buffers */
_gyro_reports = new ringbuffer::RingBuffer(2, sizeof(gyro_report));
_gyro_reports = new ringbuffer::RingBuffer(2, sizeof(sensor_gyro_s));
if (_gyro_reports == nullptr) {
goto out;
@@ -676,7 +676,7 @@ ADIS16448::init()
warnx("ADVERT FAIL");
}
struct gyro_report grp;
sensor_gyro_s grp;
_gyro_reports->get(&grp);
@@ -892,7 +892,7 @@ ADIS16448::self_test()
ssize_t
ADIS16448::gyro_read(struct file *filp, char *buffer, size_t buflen)
{
unsigned count = buflen / sizeof(gyro_report);
unsigned count = buflen / sizeof(sensor_gyro_s);
/* buffer must be large enough */
if (count < 1) {
@@ -913,7 +913,7 @@ ADIS16448::gyro_read(struct file *filp, char *buffer, size_t buflen)
perf_count(_gyro_reads);
/* copy reports out of our buffer to the caller */
gyro_report *grp = reinterpret_cast<gyro_report *>(buffer);
sensor_gyro_s *grp = reinterpret_cast<sensor_gyro_s *>(buffer);
int transferred = 0;
while (count--) {
@@ -926,7 +926,7 @@ ADIS16448::gyro_read(struct file *filp, char *buffer, size_t buflen)
}
/* return the number of bytes transferred */
return (transferred * sizeof(gyro_report));
return (transferred * sizeof(sensor_gyro_s));
}
ssize_t
@@ -1332,7 +1332,7 @@ ADIS16448::measure()
* Report buffers.
*/
sensor_accel_s arb;
gyro_report grb;
sensor_gyro_s grb;
mag_report mrb;
grb.timestamp = arb.timestamp = mrb.timestamp = hrt_absolute_time();
@@ -1729,7 +1729,7 @@ void
test()
{
sensor_accel_s a_report{};
gyro_report g_report;
sensor_gyro_s g_report{};
mag_report m_report;
ssize_t sz;
src/drivers/imu/adis16477/ADIS16477.cpp
+2 -2
View File
@@ -209,7 +209,7 @@ ADIS16477::init()
PX4_ERR("ADVERT FAIL");
}
gyro_report grp = {};
sensor_gyro_s grp = {};
_gyro->_gyro_topic = orb_advertise_multi(ORB_ID(sensor_gyro), &grp, &_gyro->_gyro_orb_class_instance, ORB_PRIO_MAX);
if (_gyro->_gyro_topic == nullptr) {
@@ -622,7 +622,7 @@ ADIS16477::publish_accel(const ADISReport &report)
bool
ADIS16477::publish_gyro(const ADISReport &report)
{
gyro_report grb = {};
sensor_gyro_s grb = {};
grb.timestamp = hrt_absolute_time();
grb.device_id = _gyro->_device_id.devid;
grb.error_count = perf_event_count(_bad_transfers);
src/drivers/imu/adis16477/ADIS16477_main.cpp
+1 -1
View File
@@ -114,7 +114,7 @@ void
test()
{
sensor_accel_s a_report{};
gyro_report g_report;
sensor_gyro_s g_report{};
ssize_t sz;
src/drivers/imu/bmi055/BMI055_gyro.cpp
+6 -6
View File
@@ -114,7 +114,7 @@ BMI055_gyro::init()
}
/* allocate basic report buffers */
_gyro_reports = new ringbuffer::RingBuffer(2, sizeof(gyro_report));
_gyro_reports = new ringbuffer::RingBuffer(2, sizeof(sensor_gyro_s));
if (_gyro_reports == nullptr) {
goto out;
@@ -144,7 +144,7 @@ BMI055_gyro::init()
measure();
/* advertise sensor topic, measure manually to initialize valid report */
struct gyro_report grp;
sensor_gyro_s grp;
_gyro_reports->get(&grp);
_gyro_topic = orb_advertise_multi(ORB_ID(sensor_gyro), &grp,
@@ -270,7 +270,7 @@ BMI055_gyro::test_error()
ssize_t
BMI055_gyro::read(struct file *filp, char *buffer, size_t buflen)
{
unsigned count = buflen / sizeof(gyro_report);
unsigned count = buflen / sizeof(sensor_gyro_s);
/* buffer must be large enough */
if (count < 1) {
@@ -289,7 +289,7 @@ BMI055_gyro::read(struct file *filp, char *buffer, size_t buflen)
}
/* copy reports out of our buffer to the caller */
gyro_report *grp = reinterpret_cast<gyro_report *>(buffer);
sensor_gyro_s *grp = reinterpret_cast<sensor_gyro_s *>(buffer);
int transferred = 0;
while (count--) {
@@ -302,7 +302,7 @@ BMI055_gyro::read(struct file *filp, char *buffer, size_t buflen)
}
/* return the number of bytes transferred */
return (transferred * sizeof(gyro_report));
return (transferred * sizeof(sensor_gyro_s));
}
int
@@ -624,7 +624,7 @@ BMI055_gyro::measure()
/*
* Report buffers.
*/
gyro_report grb;
sensor_gyro_s grb;
grb.timestamp = hrt_absolute_time();
src/drivers/imu/bmi055/bmi055_main.cpp
+1 -1
View File
@@ -226,7 +226,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;
sensor_accel_s a_report{};
gyro_report g_report;
sensor_gyro_s g_report{};
ssize_t sz;
if (sensor == BMI055_ACCEL) {
src/drivers/imu/bmi160/bmi160.cpp
+6 -6
View File
@@ -144,7 +144,7 @@ BMI160::init()
goto out;
}
_gyro_reports = new ringbuffer::RingBuffer(2, sizeof(gyro_report));
_gyro_reports = new ringbuffer::RingBuffer(2, sizeof(sensor_gyro_s));
if (_gyro_reports == nullptr) {
goto out;
@@ -197,7 +197,7 @@ BMI160::init()
/* advertise sensor topic, measure manually to initialize valid report */
struct gyro_report grp;
sensor_gyro_s grp;
_gyro_reports->get(&grp);
_gyro->_gyro_topic = orb_advertise_multi(ORB_ID(sensor_gyro), &grp,
@@ -506,7 +506,7 @@ BMI160::test_error()
ssize_t
BMI160::gyro_read(struct file *filp, char *buffer, size_t buflen)
{
unsigned count = buflen / sizeof(gyro_report);
unsigned count = buflen / sizeof(sensor_gyro_s);
/* buffer must be large enough */
if (count < 1) {
@@ -527,7 +527,7 @@ BMI160::gyro_read(struct file *filp, char *buffer, size_t buflen)
perf_count(_gyro_reads);
/* copy reports out of our buffer to the caller */
gyro_report *grp = reinterpret_cast<gyro_report *>(buffer);
sensor_gyro_s *grp = reinterpret_cast<sensor_gyro_s *>(buffer);
int transferred = 0;
while (count--) {
@@ -540,7 +540,7 @@ BMI160::gyro_read(struct file *filp, char *buffer, size_t buflen)
}
/* return the number of bytes transferred */
return (transferred * sizeof(gyro_report));
return (transferred * sizeof(sensor_gyro_s));
}
@@ -1027,7 +1027,7 @@ BMI160::measure()
* Report buffers.
*/
sensor_accel_s arb{};
gyro_report grb;
sensor_gyro_s grb{};
/*
* Adjust and scale results to m/s^2.
src/drivers/imu/bmi160/bmi160_main.cpp
+1 -1
View File
@@ -122,7 +122,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;
sensor_accel_s a_report{};
gyro_report g_report;
sensor_gyro_s g_report{};
ssize_t sz;
/* get the driver */
src/drivers/imu/fxas21002c/fxas21002c.cpp
+6 -6
View File
@@ -527,7 +527,7 @@ FXAS21002C::init()
}
/* allocate basic report buffers */
_reports = new ringbuffer::RingBuffer(2, sizeof(gyro_report));
_reports = new ringbuffer::RingBuffer(2, sizeof(sensor_gyro_s));
if (_reports == nullptr) {
return PX4_ERROR;
@@ -541,7 +541,7 @@ FXAS21002C::init()
_class_instance = register_class_devname(GYRO_BASE_DEVICE_PATH);
/* advertise sensor topic, measure manually to initialize valid report */
struct gyro_report grp;
sensor_gyro_s grp;
_reports->get(&grp);
/* measurement will have generated a report, publish */
@@ -608,8 +608,8 @@ FXAS21002C::probe()
ssize_t
FXAS21002C::read(struct file *filp, char *buffer, size_t buflen)
{
unsigned count = buflen / sizeof(struct gyro_report);
struct gyro_report *gbuf = reinterpret_cast<struct gyro_report *>(buffer);
unsigned count = buflen / sizeof(sensor_gyro_s);
sensor_gyro_s *gbuf = reinterpret_cast<sensor_gyro_s *>(buffer);
int ret = 0;
/* buffer must be large enough */
@@ -1042,7 +1042,7 @@ FXAS21002C::measure()
} raw_gyro_report;
#pragma pack(pop)
struct gyro_report gyro_report;
sensor_gyro_s gyro_report;
/* start the performance counter */
perf_begin(_sample_perf);
@@ -1310,7 +1310,7 @@ void
test()
{
int fd_gyro = -1;
struct gyro_report g_report;
sensor_gyro_s g_report{};
ssize_t sz;
/* get the driver */
src/drivers/imu/l3gd20/l3gd20.cpp
+6 -6
View File
@@ -463,7 +463,7 @@ L3GD20::init()
}
/* allocate basic report buffers */
_reports = new ringbuffer::RingBuffer(2, sizeof(gyro_report));
_reports = new ringbuffer::RingBuffer(2, sizeof(sensor_gyro_s));
if (_reports == nullptr) {
goto out;
@@ -476,7 +476,7 @@ L3GD20::init()
measure();
/* advertise sensor topic, measure manually to initialize valid report */
struct gyro_report grp;
sensor_gyro_s grp;
_reports->get(&grp);
_gyro_topic = orb_advertise_multi(ORB_ID(sensor_gyro), &grp,
@@ -528,8 +528,8 @@ L3GD20::probe()
ssize_t
L3GD20::read(struct file *filp, char *buffer, size_t buflen)
{
unsigned count = buflen / sizeof(struct gyro_report);
struct gyro_report *gbuf = reinterpret_cast<struct gyro_report *>(buffer);
unsigned count = buflen / sizeof(sensor_gyro_s);
sensor_gyro_s *gbuf = reinterpret_cast<sensor_gyro_s *>(buffer);
int ret = 0;
/* buffer must be large enough */
@@ -926,7 +926,7 @@ L3GD20::measure()
} raw_report;
#pragma pack(pop)
gyro_report report;
sensor_gyro_s report;
/* start the performance counter */
perf_begin(_sample_perf);
@@ -1201,7 +1201,7 @@ void
test()
{
int fd_gyro = -1;
struct gyro_report g_report;
sensor_gyro_s g_report;
ssize_t sz;
/* get the driver */
src/drivers/imu/mpu6000/mpu6000.cpp
+7 -7
View File
@@ -640,7 +640,7 @@ MPU6000::init()
return ret;
}
_gyro_reports = new ringbuffer::RingBuffer(2, sizeof(gyro_report));
_gyro_reports = new ringbuffer::RingBuffer(2, sizeof(sensor_gyro_s));
if (_gyro_reports == nullptr) {
return ret;
@@ -718,7 +718,7 @@ MPU6000::init()
}
/* advertise sensor topic, measure manually to initialize valid report */
struct gyro_report grp;
sensor_gyro_s grp;
_gyro_reports->get(&grp);
_gyro->_gyro_topic = orb_advertise_multi(ORB_ID(sensor_gyro), &grp,
@@ -1220,7 +1220,7 @@ MPU6000::test_error()
ssize_t
MPU6000::gyro_read(struct file *filp, char *buffer, size_t buflen)
{
unsigned count = buflen / sizeof(gyro_report);
unsigned count = buflen / sizeof(sensor_gyro_s);
/* buffer must be large enough */
if (count < 1) {
@@ -1239,7 +1239,7 @@ MPU6000::gyro_read(struct file *filp, char *buffer, size_t buflen)
}
/* copy reports out of our buffer to the caller */
gyro_report *grp = reinterpret_cast<gyro_report *>(buffer);
sensor_gyro_s *grp = reinterpret_cast<sensor_gyro_s *>(buffer);
int transferred = 0;
while (count--) {
@@ -1252,7 +1252,7 @@ MPU6000::gyro_read(struct file *filp, char *buffer, size_t buflen)
}
/* return the number of bytes transferred */
return (transferred * sizeof(gyro_report));
return (transferred * sizeof(sensor_gyro_s));
}
int
@@ -1796,7 +1796,7 @@ MPU6000::measure()
* Report buffers.
*/
sensor_accel_s arb;
gyro_report grb;
sensor_gyro_s grb;
/*
* Adjust and scale results to m/s^2.
@@ -2248,7 +2248,7 @@ test(enum MPU6000_BUS busid)
{
struct mpu6000_bus_option &bus = find_bus(busid);
sensor_accel_s a_report{};
gyro_report g_report;
sensor_gyro_s g_report{};
ssize_t sz;
/* get the driver */
src/drivers/imu/mpu9250/main.cpp
+1 -1
View File
@@ -317,7 +317,7 @@ test(enum MPU9250_BUS busid)
{
struct mpu9250_bus_option &bus = find_bus(busid);
sensor_accel_s a_report{};
gyro_report g_report;
sensor_gyro_s g_report{};
mag_report m_report;
ssize_t sz;
src/drivers/imu/mpu9250/mpu9250.cpp
+6 -6
View File
@@ -295,7 +295,7 @@ MPU9250::init()
return ret;
}
_gyro_reports = new ringbuffer::RingBuffer(2, sizeof(gyro_report));
_gyro_reports = new ringbuffer::RingBuffer(2, sizeof(sensor_gyro_s));
if (_gyro_reports == nullptr) {
return ret;
@@ -403,7 +403,7 @@ MPU9250::init()
}
/* advertise sensor topic, measure manually to initialize valid report */
struct gyro_report grp;
sensor_gyro_s grp;
_gyro_reports->get(&grp);
_gyro->_gyro_topic = orb_advertise_multi(ORB_ID(sensor_gyro), &grp,
@@ -686,7 +686,7 @@ MPU9250::test_error()
ssize_t
MPU9250::gyro_read(struct file *filp, char *buffer, size_t buflen)
{
unsigned count = buflen / sizeof(gyro_report);
unsigned count = buflen / sizeof(sensor_gyro_s);
/* buffer must be large enough */
if (count < 1) {
@@ -707,7 +707,7 @@ MPU9250::gyro_read(struct file *filp, char *buffer, size_t buflen)
perf_count(_gyro_reads);
/* copy reports out of our buffer to the caller */
gyro_report *grp = reinterpret_cast<gyro_report *>(buffer);
sensor_gyro_s *grp = reinterpret_cast<sensor_gyro_s *>(buffer);
int transferred = 0;
while (count--) {
@@ -720,7 +720,7 @@ MPU9250::gyro_read(struct file *filp, char *buffer, size_t buflen)
}
/* return the number of bytes transferred */
return (transferred * sizeof(gyro_report));
return (transferred * sizeof(sensor_gyro_s));
}
int
@@ -1265,7 +1265,7 @@ MPU9250::measure()
* Report buffers.
*/
sensor_accel_s arb{};
gyro_report grb;
sensor_gyro_s grb{};
/*
* Adjust and scale results to m/s^2.