Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
robotpkg-wip
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
Gepetto
robotpkg-wip
Commits
4a51cf78
Commit
4a51cf78
authored
6 years ago
by
Guilhem Saurel
Browse files
Options
Downloads
Patches
Plain Diff
[wip/talos-data] add patch-aa and bump revision
to get jmirabel's merge request !2
parent
1cd276fe
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
talos-data/Makefile
+1
-1
1 addition, 1 deletion
talos-data/Makefile
talos-data/distinfo
+1
-0
1 addition, 0 deletions
talos-data/distinfo
talos-data/patches/patch-aa
+18
-0
18 additions, 0 deletions
talos-data/patches/patch-aa
with
20 additions
and
1 deletion
talos-data/Makefile
+
1
−
1
View file @
4a51cf78
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
VERSION
=
0.0.17
VERSION
=
0.0.17
PKGNAME
=
talos-data-
${
VERSION
}
PKGNAME
=
talos-data-
${
VERSION
}
DISTNAME
=
$(
subst -,_,
${
PKGBASE
})
-
${
VERSION
}
DISTNAME
=
$(
subst -,_,
${
PKGBASE
})
-
${
VERSION
}
PKGREVISION
=
4
PKGREVISION
=
5
MASTER_SITES
=
ftp://
${
JRL_FTP_USER
}${
JRL_FTP_PASSWD:%
=
:%
}
@softs.laas.fr/talos/talos_data/
MASTER_SITES
=
ftp://
${
JRL_FTP_USER
}${
JRL_FTP_PASSWD:%
=
:%
}
@softs.laas.fr/talos/talos_data/
MASTER_REPOSITORY
=
https://redmine.laas.fr/laas/users/
MASTER_REPOSITORY
=
https://redmine.laas.fr/laas/users/
...
...
This diff is collapsed.
Click to expand it.
talos-data/distinfo
+
1
−
0
View file @
4a51cf78
SHA1 (talos_data-0.0.17.tar.gz) = e10ccb483b00d5641d6f4fab0c10babc4b3b4e7b
SHA1 (talos_data-0.0.17.tar.gz) = e10ccb483b00d5641d6f4fab0c10babc4b3b4e7b
RMD160 (talos_data-0.0.17.tar.gz) = c36035d0256e3f4917ddd9b996a4cfd79d3cd3fd
RMD160 (talos_data-0.0.17.tar.gz) = c36035d0256e3f4917ddd9b996a4cfd79d3cd3fd
Size (talos_data-0.0.17.tar.gz) = 8802583 bytes
Size (talos_data-0.0.17.tar.gz) = 8802583 bytes
SHA1 (patch-aa) = 4377a9e0d8798ef8e1587c39d1f2b7915ea59abc
This diff is collapsed.
Click to expand it.
talos-data/patches/patch-aa
0 → 100644
+
18
−
0
View file @
4a51cf78
Temporarly add https://gepgitlab.laas.fr/pyrene-dev/talos_data/merge_requests/2
--- srdf/talos.srdf
+++ srdf/talos.srdf
@@ -650,11 +650,13 @@
TALOS disabled collisions generated by Moveit! using the moveit_setup_assistant.
<position> 0 0 -0.13 0.707106 0 0.707106 0</position>
<link name="gripper_left_base_link" />
<joint name="gripper_left_joint" />
+ <torque_constant value="48e-3" unit="N.m/A"/>
</gripper>
<gripper name="right_gripper" clearance="0.03">
<position> 0 0 -0.13 0 -0.707106 0 0.707106 </position>
<link name="gripper_right_base_link" />
<joint name="gripper_right_joint" />
+ <torque_constant value="48e-3" unit="N.m/A"/>
</gripper>
</robot>
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