Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Z
zero
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nikhil Ambardar
zero
Commits
5d80fd2b
Commit
5d80fd2b
authored
4 years ago
by
Nikhil Ambardar
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of
https://git-st.inf.tu-dresden.de/nikaviator/zero
parents
fee70155
572b9446
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+2
-2
2 additions, 2 deletions
CMakeLists.txt
src/datalink/robot.h
+1
-1
1 addition, 1 deletion
src/datalink/robot.h
src/robot_models_node.cpp
+1
-1
1 addition, 1 deletion
src/robot_models_node.cpp
with
4 additions
and
4 deletions
CMakeLists.txt
+
2
−
2
View file @
5d80fd2b
...
...
@@ -199,8 +199,8 @@ add_executable(testappm
## Specify libraries to link a library or executable target against
target_link_libraries
(
testappm
${
catkin_LIBRARIES
}
)
target_link_libraries
(
robot_models_node
${
catkin_LIBRARIES
}
)
==== BASE ====
==== BASE ====
#add_dependencies(robot_models_node ${catkin_LIBRARIES})
#############
...
...
This diff is collapsed.
Click to expand it.
src/datalink/robot.h
+
1
−
1
View file @
5d80fd2b
...
...
@@ -23,4 +23,4 @@ public:
bool
of
,
moving
,
grasppos
;
std
::
string
planninggrp
;
};
#endif //ROBOT_MODELS_TEST_H
\ No newline at end of file
#endif //ROBOT_MODELS_TEST_H
This diff is collapsed.
Click to expand it.
src/robot_models_node.cpp
+
1
−
1
View file @
5d80fd2b
...
...
@@ -266,4 +266,4 @@
rate
.
sleep
();
}
return
0
;
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment