Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugs for DISCO #84

Open
wants to merge 4 commits into
base: indigo-devel
Choose a base branch
from
Open

Bugs for DISCO #84

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46eb1ff
fix bugs for DISCO
weiweikong Jan 2, 2017
e288e0e
Merge https://github.com/weiweikong/bebop_autonomy into indigo-devel
weiweikong Jan 2, 2017
78546d6
revert bebop_node.launch
weiweikong Jan 9, 2017
160f40f
typo
weiweikong Jan 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bebop_driver/launch/bebop_node.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
<param name="bebop_ip" value="$(arg ip)" />
<rosparam command="load" file="$(arg config_file)" />
</node>
<include file="$(find bebop_description)/launch/description.launch" />
<!--include file="$(find bebop_description)/launch/description.launch" /-->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please revert back this line? I understand that Bebop's URDF does not match Disco's, but that should be fixed in a more generalized way.

</group>
</launch>
5 changes: 3 additions & 2 deletions bebop_driver/src/bebop_driver_nodelet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,8 @@ void BebopDriverNodelet::AuxThread()
if (bebop_ptr_->ardrone3_pilotingstate_positionchanged_ptr)
{
gps_state_ptr = bebop_ptr_->ardrone3_pilotingstate_positionchanged_ptr->GetDataCstPtr();
if ((gps_state_ptr->header.stamp - last_gps_time).toSec() > util::eps)
//if ((gps_state_ptr->header.stamp - last_gps_time).toSec() > util::eps)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for my delayed feedback and thanks for making all the changes. I will merge it in very soon. Please also remove this commented line. Also, please consider adding your name to the following file as part of this pull request: https://github.com/AutonomyLab/bebop_autonomy/blob/indigo-devel/docs/contribute.rst

if (gps_state_ptr && ((gps_state_ptr->header.stamp - last_gps_time).toSec() > util::eps))
{
last_gps_time = gps_state_ptr->header.stamp;
new_gps_state = true;
Expand All @@ -559,7 +560,7 @@ void BebopDriverNodelet::AuxThread()
speed_esd_ptr = bebop_ptr_->ardrone3_pilotingstate_speedchanged_ptr->GetDataCstPtr();

// conside new data only
if ((speed_esd_ptr->header.stamp - last_speed_time).toSec() > util::eps)
if (speed_esd_ptr && ((speed_esd_ptr->header.stamp - last_speed_time).toSec() > util::eps))
{
last_speed_time = speed_esd_ptr->header.stamp;
new_speed_data = true;
Expand Down