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

fix reading baro values from simulator

Browse Source
This commit is contained in:
tumbili
2015-06-08 22:21:59 -07:00
committed by Mark Charlebois
parent 8eee7ba321
commit 5694e37854
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platforms/posix/drivers/barosim/baro.cpp
+1 -1
View File
@@ -640,7 +640,7 @@ BAROSIM::collect()
report.error_count = perf_event_count(_comms_errors);
/* read the most recent measurement - read offset/size are hardcoded in the interface */
ret = _interface->dev_read(0, (void *)&baro_report, 0);
ret = _interface->dev_read(0, (void *)&baro_report, sizeof(baro_report));
if (ret < 0) {
perf_count(_comms_errors);
perf_end(_sample_perf);
src/platforms/posix/drivers/barosim/baro_sim.cpp
+2 -2
View File
@@ -127,7 +127,7 @@ BARO_SIM::dev_read(unsigned offset, void *data, unsigned count)
/* read the most recent measurement */
uint8_t cmd = 0;
int ret = transfer(&cmd, 1, static_cast<uint8_t *>(data), 3);
int ret = transfer(&cmd, 1, static_cast<uint8_t *>(data), count);
/*
if (ret == PX4_OK) {
@@ -208,7 +208,7 @@ BARO_SIM::transfer(const uint8_t *send, unsigned send_len,
if (recv_len == 0) {
PX4_DEBUG("BARO_SIM measurement requested");
}
else if (send_len != 1 || send[0] != 0 || recv_len != 3) {
else if (send_len != 1 || send[0] != 0 ) {
PX4_WARN("BARO_SIM::transfer invalid param %u %u %u", send_len, send[0], recv_len);
return 1;
}