Skip to content
Snippets Groups Projects
Commit da68c176 authored by Markus Grotz's avatar Markus Grotz
Browse files

soft emergency stop can now be deactivated with gamepad controller

parent d1fc7b6d
No related branches found
No related tags found
No related merge requests found
......@@ -76,6 +76,11 @@ namespace armarx
if (data.leftTrigger > 0)
{
emergencyStop->setEmergencyStopState(EmergencyStopState::eEmergencyStopActive);
return;
}
else if (data.startButton)
{
emergencyStop->setEmergencyStopState(EmergencyStopState::eEmergencyStopInactive);
}
//scales are for the robot axis
if (data.rightTrigger > 0)
......
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