fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-28 11:43:33 +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/lis3mdl/lis3mdl.cpp
+7 -7
View File
@@ -116,7 +116,7 @@ LIS3MDL::~LIS3MDL()
int
LIS3MDL::calibrate(struct file *file_pointer, unsigned enable)
{
struct mag_report report;
sensor_mag_s report;
ssize_t sz;
int ret = 1;
uint8_t num_samples = 10;
@@ -348,7 +348,7 @@ LIS3MDL::collect()
float yraw_f;
float zraw_f;
struct mag_report new_mag_report;
sensor_mag_s new_mag_report;
bool sensor_is_onboard = false;
perf_begin(_sample_perf);
@@ -477,7 +477,7 @@ LIS3MDL::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) {
return PX4_ERROR;
@@ -631,8 +631,8 @@ LIS3MDL::reset()
int
LIS3MDL::read(struct file *file_pointer, char *buffer, size_t buffer_len)
{
unsigned count = buffer_len / sizeof(struct mag_report);
struct mag_report *mag_buf = reinterpret_cast<struct mag_report *>(buffer);
unsigned count = buffer_len / sizeof(sensor_mag_s);
sensor_mag_s *mag_buf = reinterpret_cast<sensor_mag_s *>(buffer);
int ret = 0;
/* buffer must be large enough */
@@ -649,7 +649,7 @@ LIS3MDL::read(struct file *file_pointer, char *buffer, size_t buffer_len)
*/
while (count--) {
if (_reports->get(mag_buf)) {
ret += sizeof(struct mag_report);
ret += sizeof(sensor_mag_s);
mag_buf++;
}
}
@@ -679,7 +679,7 @@ LIS3MDL::read(struct file *file_pointer, char *buffer, size_t buffer_len)
}
if (_reports->get(mag_buf)) {
ret = sizeof(struct mag_report);
ret = sizeof(sensor_mag_s);
}
} while (0);
src/drivers/magnetometer/lis3mdl/lis3mdl.h
+1 -1
View File
@@ -145,7 +145,7 @@ private:
struct mag_calibration_s _scale;
struct mag_report _last_report {}; /**< used for info() */
sensor_mag_s _last_report {}; /**< used for info() */
orb_advert_t _mag_topic;
src/drivers/magnetometer/lis3mdl/lis3mdl_main.cpp
+1 -1
View File
@@ -160,7 +160,7 @@ lis3mdl::stop(struct lis3mdl_bus_option &bus)
int
lis3mdl::test(struct lis3mdl_bus_option &bus)
{
struct mag_report report;
sensor_mag_s report;
ssize_t sz;
int ret;
const char *path = bus.devpath;