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

almost fixed component. still need to work on aron json loading

parent d13e8751
No related branches found
No related tags found
1 merge request!12Feature/open articulated objects
......@@ -92,7 +92,9 @@ namespace armarx::manipulation::components::articulated_objects_skill_provider
core::Robot::InjectedServices injectedServices{.proxies = robotProxies,
.memoryNameSystem = memoryNameSystem()};
robot = std::make_unique<core::Robot>(injectedServices, properties.robotName);
const std::string robotName = robotProxies.robotUnitPrx->getKinematicUnit()->getRobotName();
robot = std::make_unique<core::Robot>(injectedServices, robotName);
//
// Private skills
......
......@@ -113,7 +113,6 @@ namespace armarx::manipulation::components::articulated_objects_skill_provider
struct Properties
{
std::string robotName = "Armar6";
};
Properties properties;
/* Use a mutex if you access variables from different threads
......
......@@ -170,6 +170,8 @@ namespace armarx::manipulation::core
bool
Robot::synchronize(const armarx::core::time::DateTime& timestamp)
{
ARMARX_CHECK_NOT_NULL(virtualRobot);
if (robotReader.synchronizeRobot(*virtualRobot, timestamp))
{
syncTime = timestamp;
......
......@@ -100,10 +100,12 @@ namespace armarx::manipulation::skills
virtual bool initController(const ParamsT& params) {return true;};
virtual bool updateControllerTcpTarget(const core::Pose& global_T_tcp) {return true;};
private:
protected:
Context ctx;
Parameters parameters;
private:
VirtualRobot::RobotPtr object;
VirtualRobot::GraspPtr grasp;
......
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