fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-28 02:43:34 +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/hmc5883/HMC5883.cpp
+6 -6
View File
@@ -104,7 +104,7 @@ HMC5883::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;
@@ -243,8 +243,8 @@ void HMC5883::check_conf(void)
ssize_t
HMC5883::read(cdev::file_t *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 */
@@ -261,7 +261,7 @@ HMC5883::read(cdev::file_t *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++;
}
}
@@ -291,7 +291,7 @@ HMC5883::read(cdev::file_t *filp, char *buffer, size_t buflen)
}
if (_reports->get(mag_buf)) {
ret = sizeof(struct mag_report);
ret = sizeof(sensor_mag_s);
}
} while (0);
@@ -498,7 +498,7 @@ HMC5883::collect()
uint8_t check_counter;
perf_begin(_sample_perf);
struct mag_report new_report;
sensor_mag_s new_report;
bool sensor_is_onboard = false;
float xraw_f;