fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-03 02:51:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

replace mag_report with sensor_mag_s

Browse Source
This commit is contained in:
Daniel Agar
2020-01-10 12:15:18 -05:00
parent e19e0bd616
commit ceec0238c4
20 changed files with 61 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/magnetometer/ist8310/ist8310.cpp
+8 -8
View File
@@ -428,7 +428,7 @@ IST8310::init()
}
/* allocate basic report buffers */
_reports = new ringbuffer::RingBuffer(2, sizeof(mag_report));
_reports = new ringbuffer::RingBuffer(2, sizeof(sensor_mag_s));
if (_reports == nullptr) {
goto out;
@@ -515,8 +515,8 @@ void IST8310::check_conf(void)
ssize_t
IST8310::read(struct file *filp, char *buffer, size_t buflen)
{
unsigned count = buflen / sizeof(struct mag_report);
struct mag_report *mag_buf = reinterpret_cast<struct mag_report *>(buffer);
unsigned count = buflen / sizeof(sensor_mag_s);
sensor_mag_s *mag_buf = reinterpret_cast<sensor_mag_s *>(buffer);
int ret = 0;
/* buffer must be large enough */
@@ -533,7 +533,7 @@ IST8310::read(struct file *filp, char *buffer, size_t buflen)
*/
while (count--) {
if (_reports->get(mag_buf)) {
ret += sizeof(struct mag_report);
ret += sizeof(sensor_mag_s);
mag_buf++;
}
}
@@ -563,7 +563,7 @@ IST8310::read(struct file *filp, char *buffer, size_t buflen)
}
if (_reports->get(mag_buf)) {
ret = sizeof(struct mag_report);
ret = sizeof(sensor_mag_s);
}
} while (0);
@@ -781,7 +781,7 @@ IST8310::collect()
uint8_t check_counter;
perf_begin(_sample_perf);
struct mag_report new_report;
sensor_mag_s new_report;
const bool sensor_is_external = external();
float xraw_f;
@@ -899,7 +899,7 @@ out:
int IST8310::calibrate(struct file *filp, unsigned enable)
{
struct mag_report report {};
sensor_mag_s report {};
ssize_t sz;
int ret = 1;
float total_x = 0.0f;
@@ -1249,7 +1249,7 @@ void
test(enum IST8310_BUS busid)
{
struct ist8310_bus_option &bus = find_bus(busid);
struct mag_report report {};
sensor_mag_s report {};
ssize_t sz;
int ret;
const char *path = bus.devpath;