fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-26 06:13:35 +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/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();