fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-30 12:00:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

add FUSE_MOCAP, FUSE_LIDAR, and FUSE_SONAR to select more senors

Browse Source
This commit is contained in:
stmoon
2018-01-07 20:44:13 +09:00
committed by Lorenz Meier
parent b524c8a20f
commit 28a5287a91
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/local_position_estimator/BlockLocalPositionEstimator.cpp
+9 -5
View File
@@ -181,7 +181,7 @@ BlockLocalPositionEstimator::BlockLocalPositionEstimator() :
// print fusion settings to console
printf("[lpe] fuse gps: %d, flow: %d, vis_pos: %d, "
"vis_yaw: %d, land: %d, pub_agl_z: %d, flow_gyro: %d, "
"landing_target %d\n",
"baro: %d, landing_target: %d, mocap: %d, lidar: %d, sonar: %d\n",
(_fusion.get() & FUSE_GPS) != 0,
(_fusion.get() & FUSE_FLOW) != 0,
(_fusion.get() & FUSE_VIS_POS) != 0,
@@ -189,7 +189,11 @@ BlockLocalPositionEstimator::BlockLocalPositionEstimator() :
(_fusion.get() & FUSE_LAND) != 0,
(_fusion.get() & FUSE_PUB_AGL_Z) != 0,
(_fusion.get() & FUSE_FLOW_GYRO_COMP) != 0,
(_fusion.get() & FUSE_LAND_TARGET) != 0);
(_fusion.get() & FUSE_BARO) != 0,
(_fusion.get() & FUSE_LAND_TARGET) != 0,
(_fusion.get() & FUSE_MOCAP) != 0,
(_fusion.get() & FUSE_LIDAR) != 0,
(_fusion.get() & FUSE_SONAR) != 0);
}
BlockLocalPositionEstimator::~BlockLocalPositionEstimator()
@@ -299,9 +303,9 @@ void BlockLocalPositionEstimator::update()
bool flowUpdated = (_fusion.get() & FUSE_FLOW) && _sub_flow.updated();
bool gpsUpdated = (_fusion.get() & FUSE_GPS) && _sub_gps.updated();
bool visionUpdated = (_fusion.get() & FUSE_VIS_POS) && _sub_vision_pos.updated();
bool mocapUpdated = _sub_mocap.updated();
bool lidarUpdated = (_sub_lidar != nullptr) && _sub_lidar->updated();
bool sonarUpdated = (_sub_sonar != nullptr) && _sub_sonar->updated();
bool mocapUpdated = (_fusion.get() & FUSE_MOCAP) && _sub_mocap.updated();
bool lidarUpdated = (_fusion.get() & FUSE_LIDAR) && (_sub_lidar != nullptr) && _sub_lidar->updated();
bool sonarUpdated = (_fusion.get() & FUSE_SONAR) && (_sub_sonar != nullptr) && _sub_sonar->updated();
bool landUpdated = landed()
&& ((_timeStamp - _time_last_land) > 1.0e6f / LAND_RATE); // throttle rate