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

Merge branch 'master' into inav_alt_gps

Browse Source
This commit is contained in:
Anton Babushkin
2013-11-11 14:48:50 +04:00
parent c3944f49b1 a1398c991e
commit e4f0c7d26a
41 changed files with 313 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uORB/topics/differential_pressure.h
+2 -2
View File
@@ -54,8 +54,8 @@
struct differential_pressure_s {
uint64_t timestamp; /**< microseconds since system boot, needed to integrate */
uint64_t error_count;
uint16_t differential_pressure_pa; /**< Differential pressure reading */
uint16_t max_differential_pressure_pa; /**< Maximum differential pressure reading */
float differential_pressure_pa; /**< Differential pressure reading */
float max_differential_pressure_pa; /**< Maximum differential pressure reading */
float voltage; /**< Voltage from analog airspeed sensors (voltage divider already compensated) */
float temperature; /**< Temperature provided by sensor */
src/modules/uORB/uORB.cpp
+3 -1
View File
@@ -249,8 +249,10 @@ ORBDevNode::close(struct file *filp)
} else {
SubscriberData *sd = filp_to_sd(filp);
if (sd != nullptr)
if (sd != nullptr) {
hrt_cancel(&sd->update_call);
delete sd;
}
}
return CDev::close(filp);