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
2d8aed84
Commit
2d8aed84
authored
14 years ago
by
Akin
Browse files
Options
Downloads
Patches
Plain Diff
[wip/BioMove3D] patch for new hri joints for JidoKukaSAHand
parent
8b0bc120
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
BioMove3D/distinfo
+1
-0
1 addition, 0 deletions
BioMove3D/distinfo
BioMove3D/patches/patch-aa
+64
-0
64 additions, 0 deletions
BioMove3D/patches/patch-aa
with
65 additions
and
0 deletions
BioMove3D/distinfo
+
1
−
0
View file @
2d8aed84
SHA1 (BioMove3D-3.7.8.tar.gz) = 0a3e7c4c88c5a5fec34297b1d2d3f30c24b88833
RMD160 (BioMove3D-3.7.8.tar.gz) = 40a377e1874eae3e3127128dbd0d23a1989f5b78
Size (BioMove3D-3.7.8.tar.gz) = 5637040 bytes
SHA1 (patch-aa) = 97e5bf7af95a6280e3dba185c972a7febf8db869
This diff is collapsed.
Click to expand it.
BioMove3D/patches/patch-aa
0 → 100644
+
64
−
0
View file @
2d8aed84
diff --git a/hri_planner/hri_agent.c b/hri_planner/hri_agent.c
index 8b088c0..819ad93 100644
--- hri_planner/hri_agent.c
+++ hri_planner/hri_agent.c
@@ -259,12 +259,12 @@
HRI_PERSP * hri_create_agent_perspective(HRI_AGENT * agent, p3d_env *env)
persp->point_tolerance = 20;
break;
case HRI_JIDOKUKA:
- persp->camjoint = agent->robotPt->joints[15];
+ persp->camjoint = agent->robotPt->joints[30];
persp->fov = 60;
persp->foa = 60;
persp->tilt_jnt_idx = 3;
persp->pan_jnt_idx = 2;
- persp->pointjoint = agent->robotPt->joints[18];
+ persp->pointjoint = agent->robotPt->joints[33];
persp->point_tolerance = 20;
break;
case HRI_PR2:
@@ -560,7 +560,7 @@
int hri_create_fill_agent_default_manip_tasks(HRI_MANIP * manip, GIK_TASK ** tas
(*tasklist)[0].default_joints[0] = 2;
(*tasklist)[0].default_joints[1] = 3;
(*tasklist)[0].default_joints[2] = 16;
- (*tasklist)[0].active_joint = 16; /* active joint */
+ (*tasklist)[0].active_joint = 31; /* active joint */
(*tasklist)[0].default_joints_no = 3;
(*tasklist)[1].type = GIK_LATREACH;
@@ -571,7 +571,7 @@
int hri_create_fill_agent_default_manip_tasks(HRI_MANIP * manip, GIK_TASK ** tas
(*tasklist)[1].default_joints[4] = 9;
(*tasklist)[1].default_joints[5] = 10;
(*tasklist)[1].default_joints[6] = 11;
- (*tasklist)[1].active_joint = 18; /* active joint */
+ (*tasklist)[1].active_joint = 33; /* active joint */
(*tasklist)[1].default_joints_no = 7;
(*tasklist)[2].type = GIK_RATREACH;
@@ -582,7 +582,7 @@
int hri_create_fill_agent_default_manip_tasks(HRI_MANIP * manip, GIK_TASK ** tas
(*tasklist)[2].default_joints[4] = 9;
(*tasklist)[2].default_joints[5] = 10;
(*tasklist)[2].default_joints[6] = 11;
- (*tasklist)[2].active_joint = 18; /* active joint */
+ (*tasklist)[2].active_joint = 33; /* active joint */
(*tasklist)[2].default_joints_no = 7;
(*tasklist)[3].type = GIK_RAPOINT;
@@ -593,7 +593,7 @@
int hri_create_fill_agent_default_manip_tasks(HRI_MANIP * manip, GIK_TASK ** tas
(*tasklist)[3].default_joints[4] = 9;
(*tasklist)[3].default_joints[5] = 10;
(*tasklist)[3].default_joints[6] = 11;
- (*tasklist)[3].active_joint = 17; /* active joint */
+ (*tasklist)[3].active_joint = 32; /* active joint */
(*tasklist)[3].default_joints_no = 7;
(*tasklist)[4].type = GIK_LAPOINT;
@@ -604,7 +604,7 @@
int hri_create_fill_agent_default_manip_tasks(HRI_MANIP * manip, GIK_TASK ** tas
(*tasklist)[4].default_joints[4] = 9;
(*tasklist)[4].default_joints[5] = 10;
(*tasklist)[4].default_joints[6] = 11;
- (*tasklist)[4].active_joint = 17; /* active joint */
+ (*tasklist)[4].active_joint = 32; /* active joint */
(*tasklist)[4].default_joints_no = 7;
return TRUE;
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