Skip to content
Snippets Groups Projects
Commit 5db1e6ae authored by Séverin Lemaignan's avatar Séverin Lemaignan
Browse files

[wip/mhp-genom] New upstream release 3.10

Main changes since 3.9:
- Plannification with OTP for object exchange.
- Stop plannification when new plannification is launched.
- Time parameters change for trajectory smoothing.
- New request to desactivate collision check between human arm and
  robot.
parent 5d73e156
No related branches found
No related tags found
No related merge requests found
......@@ -2,7 +2,7 @@
# Created: Severin Lemaignan on Tue, 31 Aug 2010
#
DISTNAME= mhp-genom-3.9
DISTNAME= mhp-genom-3.10
CATEGORIES= path
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=mhp-genom/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_OPENROBOTS}mhp-genom
......
......@@ -33,7 +33,7 @@ SYSTEM_SEARCH.mhp-genom=\
DEPEND_USE+= mhp-genom
DEPEND_ABI.mhp-genom?=mhp-genom>=3.9
DEPEND_ABI.mhp-genom?=mhp-genom>=3.10
DEPEND_DIR.mhp-genom?=../../wip/mhp-genom
#include ../../wip/??
......
SHA1 (mhp-genom-3.9.tar.gz) = 8e32ed7e105fb4e26087ce40252154b47faaf804
RMD160 (mhp-genom-3.9.tar.gz) = e4bb7664a8e4036d4296be8683596a10de9fc391
Size (mhp-genom-3.9.tar.gz) = 38853 bytes
SHA1 (mhp-genom-3.10.tar.gz) = ef18bf5683a34136ba1cd1d77136698a703b0583
RMD160 (mhp-genom-3.10.tar.gz) = 04fed96664654bb1747ed911ea09c1649a9ab49c
Size (mhp-genom-3.10.tar.gz) = 41331 bytes
SHA1 (patch-aa) = 9bb020f2f53733edf850b5bcbc78a3d301868d3e
diff --git a/codels/mhpManipulationCodels.cc b/codels/mhpManipulationCodels.cc
index d2def26..07fb13c 100644
--- codels/mhpManipulationCodels.cc
+++ codels/mhpManipulationCodels.cc
@@ -687,7 +687,7 @@ mhpArmPlanTaskMain(STRUCT_MHP_ARM_PLAN_PARAMS *armPlanTaskParams, int *report)
}
if(smTrajs[0].convertToSM_TRAJ_STR(&(SDI_F->armTrajArray.traj[indexTraj])) != 0) {
- smTraj[0].clear();
+ smTrajs[0].clear();
smTrajs[0].convertToSM_TRAJ_STR(&(SDI_F->armTrajArray.traj[indexTraj]));
*report = S_mhp_NO_TRAJ_FOUND;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment