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.

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

Add joint limits to the diagnostics #92

Merged
merged 2 commits into from
Nov 20, 2017
Merged

Add joint limits to the diagnostics #92

merged 2 commits into from
Nov 20, 2017

Conversation

mbusy
Copy link
Member

@mbusy mbusy commented Nov 20, 2017

Add the joint limits to the diagnostic message :

  • position limits in rad
  • velocity limit in rad.s-1
  • torque limit in N.m

Copy link
Member

@nlyubova nlyubova left a comment

Choose a reason for hiding this comment

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

Thanks for PR! Could you please follow the naming convention ?

@@ -65,6 +65,9 @@ DiagnosticsConverter::DiagnosticsConverter(const std::string& name,
p_body_temperature_.call<void>("setEnableNotifications", true);
}

std::vector<std::vector<float> > jointLimits;
Copy link
Member

Choose a reason for hiding this comment

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

please use the naming convention: joint_limits

@@ -65,6 +65,9 @@ DiagnosticsConverter::DiagnosticsConverter(const std::string& name,
p_body_temperature_.call<void>("setEnableNotifications", true);
}

std::vector<std::vector<float> > jointLimits;
qi::AnyValue qiJointLimits;
Copy link
Member

Choose a reason for hiding this comment

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

please use the naming convention

@mbusy
Copy link
Member Author

mbusy commented Nov 20, 2017

Should be a bit better

Copy link
Member

@nlyubova nlyubova left a comment

Choose a reason for hiding this comment

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

could you squash commits 2 and 3?

@@ -1,5 +1,5 @@
/*
* Copyright 2015 Aldebaran
* Copyright 2017 Aldebaran
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 keep this line as it is?

Add double layered float vector converter method
Add the joints limit map, and add the joints limits to the diagnostic message
@nlyubova nlyubova merged commit 601cb1b into ros-naoqi:master Nov 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants