Skip to content
Snippets Groups Projects
Commit 47d86206 authored by Mirko Wächter's avatar Mirko Wächter
Browse files

Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI 

* 'master' of https://gitlab.com/ArmarX/RobotAPI:
  string fields can now be plotted as vertical markers
  kinematic unit gui uses now deg instead of rad
  Added mutex to filters
  fixed plotter deadlock
  switched highlighting of current==0 situation (now checking jointStatus.operation!=eOffline)
parents 2e0114ff 915d4373
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 222 additions and 88 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment