Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
ros_jr3_comedi
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
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Anton Tetov Johansson
ros_jr3_comedi
Commits
e902ea68
Verified
Commit
e902ea68
authored
3 years ago
by
Anton Tetov Johansson
Browse files
Options
Downloads
Patches
Plain Diff
remove catkin_virtualenv to fix build
parent
66301060
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
CMakeLists.txt
+1
-11
1 addition, 11 deletions
CMakeLists.txt
README.md
+8
-2
8 additions, 2 deletions
README.md
nodes/publisher
+2
-0
2 additions, 0 deletions
nodes/publisher
package.xml
+0
-3
0 additions, 3 deletions
package.xml
requirements.in
+0
-1
0 additions, 1 deletion
requirements.in
with
11 additions
and
17 deletions
CMakeLists.txt
+
1
−
11
View file @
e902ea68
cmake_minimum_required
(
VERSION 3.0.2
)
cmake_minimum_required
(
VERSION 3.0.2
)
project
(
ros_jr3_comedi
)
project
(
ros_jr3_comedi
)
find_package
(
catkin REQUIRED catkin_virtualenv
)
find_package
(
catkin REQUIRED
)
catkin_generate_virtualenv
(
INPUT_REQUIREMENTS requirements.in
USE_SYSTEM_PACKAGES TRUE
)
catkin_install_python
(
catkin_install_python
(
PROGRAMS
PROGRAMS
nodes/publisher
nodes/publisher
DESTINATION
${
CATKIN_PACKAGE_BIN_DESTINATION
}
DESTINATION
${
CATKIN_PACKAGE_BIN_DESTINATION
}
)
)
install
(
FILES
requirements.txt
DESTINATION
${
CATKIN_PACKAGE_SHARE_DESTINATION
}
)
This diff is collapsed.
Click to expand it.
README.md
+
8
−
2
View file @
e902ea68
#
#
ros_jr3_comedi
## Build
## Build
...
@@ -7,8 +7,13 @@ source /usr/lib64/ros/setup.bash
...
@@ -7,8 +7,13 @@ source /usr/lib64/ros/setup.bash
source
~/catkin_ws/devel_isolated/setup.bash
source
~/catkin_ws/devel_isolated/setup.bash
mkdir
-p
~/catkin_ws/src
mkdir
-p
~/catkin_ws/src
cd
~/catkin_ws/
cd
~/catkin_ws/src
virtualenv venv
source
venv/bin/activate
pip
install
pexpect
>=
4.8.0
cd
src
git clone https://gitlab.control.lth.se/tetov/ros_jr3_comedi.git
git clone https://gitlab.control.lth.se/tetov/ros_jr3_comedi.git
cd
..
cd
..
...
@@ -20,6 +25,7 @@ catkin_make_isolated
...
@@ -20,6 +25,7 @@ catkin_make_isolated
```
bash
```
bash
source
/usr/lib64/ros/setup.bash
source
/usr/lib64/ros/setup.bash
source
~/catkin_ws/devel_isolated/setup.bash
source
~/catkin_ws/devel_isolated/setup.bash
source
~/catkin_ws/venv/bin/activate
export
ROS_MASTER_URI
=
http://130.235.83.121:11311
export
ROS_MASTER_URI
=
http://130.235.83.121:11311
roslaunch ros_jr3_comedi publish.launch
roslaunch ros_jr3_comedi publish.launch
...
...
This diff is collapsed.
Click to expand it.
nodes/publisher
100644 → 100755
+
2
−
0
View file @
e902ea68
#!/usr/bin/env python
import
rospy
import
rospy
from
geometry_msgs.msg
import
Vector3
,
Wrench
,
WrenchStamped
from
geometry_msgs.msg
import
Vector3
,
Wrench
,
WrenchStamped
...
...
This diff is collapsed.
Click to expand it.
package.xml
+
0
−
3
View file @
e902ea68
...
@@ -13,7 +13,6 @@
...
@@ -13,7 +13,6 @@
<build_depend>
rospy
</build_depend>
<build_depend>
rospy
</build_depend>
<build_depend>
geometry_msg
</build_depend>
<build_depend>
geometry_msg
</build_depend>
<build_depend>
std_msgs
</build_depend>
<build_depend>
std_msgs
</build_depend>
<build_depend>
catkin_virtualenv
</build_depend>
<build_export_depend>
roscpp
</build_export_depend>
<build_export_depend>
roscpp
</build_export_depend>
<build_export_depend>
rospy
</build_export_depend>
<build_export_depend>
rospy
</build_export_depend>
...
@@ -25,8 +24,6 @@
...
@@ -25,8 +24,6 @@
<exec_depend>
geometry_msg
</exec_depend>
<exec_depend>
geometry_msg
</exec_depend>
<exec_depend>
std_msgs
</exec_depend>
<exec_depend>
std_msgs
</exec_depend>
<depend>
pexpect
</depend>
<export>
<export>
<pip_requirements>
requirements.txt
</pip_requirements>
<pip_requirements>
requirements.txt
</pip_requirements>
</export>
</export>
...
...
This diff is collapsed.
Click to expand it.
requirements.in
deleted
100644 → 0
+
0
−
1
View file @
66301060
pexpect >= 4.8.0
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