Skip to content
Snippets Groups Projects
Commit 1700259b authored by Fabian Reister's avatar Fabian Reister
Browse files

Merge branch 'master' of gitlab.com:ArmarX/RobotAPI

parents d18c1253 25d1fd8c
No related branches found
No related tags found
No related merge requests found
......@@ -62,7 +62,10 @@ namespace armarx
{
pid.reset();
opid.reset();
*const_cast<bool*>(&rtGetControlStruct().newTargetSet) = false;
getWriterControlStruct().newTargetSet = false;
writeControlStruct();
isAborted = false;
}
if (isAborted)
......
......@@ -61,7 +61,8 @@ namespace armarx
startPosition = currentPosition;
startOrientation = currentOrientation;
pid.reset();
*const_cast<bool*>(&rtGetControlStruct().newTargetSet) = false;
getWriterControlStruct().newTargetSet = false;
writeControlStruct();
}
//position pid
......
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