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

differential_pressure drivers update orb_publish usage to uORB::PublicationMulti<>

Browse Source
This commit is contained in:
Daniel Agar
2019-11-30 15:52:53 -05:00
parent ec5730bb89
commit 6f512cc2f1
6 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/differential_pressure/ets/ets_airspeed.cpp
+2 -5
View File
@@ -124,7 +124,7 @@ ETSAirspeed::collect()
float diff_pres_pa_raw = (float)(val[1] << 8 | val[0]);
differential_pressure_s report;
differential_pressure_s report{};
report.timestamp = hrt_absolute_time();
if (diff_pres_pa_raw < FLT_EPSILON) {
@@ -147,10 +147,7 @@ ETSAirspeed::collect()
report.temperature = -1000.0f;
report.device_id = _device_id.devid;
if (_airspeed_pub != nullptr && !(_pub_blocked)) {
/* publish it */
orb_publish(ORB_ID(differential_pressure), _airspeed_pub, &report);
}
_airspeed_pub.publish(report);
ret = OK;
src/drivers/differential_pressure/ms4525/ms4525_airspeed.cpp
+2 -5
View File
@@ -202,7 +202,7 @@ MEASAirspeed::collect()
and bottom port is used as the static port
*/
struct differential_pressure_s report;
differential_pressure_s report{};
report.timestamp = hrt_absolute_time();
report.error_count = perf_event_count(_comms_errors);
@@ -211,10 +211,7 @@ MEASAirspeed::collect()
report.differential_pressure_raw_pa = diff_press_pa_raw - _diff_pres_offset;
report.device_id = _device_id.devid;
if (_airspeed_pub != nullptr && !(_pub_blocked)) {
/* publish it */
orb_publish(ORB_ID(differential_pressure), _airspeed_pub, &report);
}
_airspeed_pub.publish(report);
ret = OK;
src/drivers/differential_pressure/ms5525/MS5525.cpp
+1 -4
View File
@@ -259,10 +259,7 @@ MS5525::collect()
.device_id = _device_id.devid
};
if (_airspeed_pub != nullptr && !(_pub_blocked)) {
/* publish it */
orb_publish(ORB_ID(differential_pressure), _airspeed_pub, &diff_pressure);
}
_airspeed_pub.publish(diff_pressure);
ret = OK;
src/drivers/differential_pressure/sdp3x/SDP3X.cpp
+2 -4
View File
@@ -147,7 +147,7 @@ SDP3X::collect()
float diff_press_pa_raw = static_cast<float>(P) / static_cast<float>(_scale);
float temperature_c = temp / static_cast<float>(SDP3X_SCALE_TEMPERATURE);
differential_pressure_s report;
differential_pressure_s report{};
report.timestamp = hrt_absolute_time();
report.error_count = perf_event_count(_comms_errors);
@@ -156,9 +156,7 @@ SDP3X::collect()
report.differential_pressure_raw_pa = diff_press_pa_raw - _diff_pres_offset;
report.device_id = _device_id.devid;
if (_airspeed_pub != nullptr && !(_pub_blocked)) {
orb_publish(ORB_ID(differential_pressure), _airspeed_pub, &report);
}
_airspeed_pub.publish(report);
ret = OK;