Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pendant mode switch issue #568

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions motoman_driver/MotoPlus/Controller.c
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,18 @@ BOOL Ros_Controller_StatusUpdate(Controller* controller)
break;
}

case IO_ROBOTSTATUS_PLAY:
case IO_ROBOTSTATUS_TEACH:
case IO_ROBOTSTATUS_REMOTE:
case IO_ROBOTSTATUS_OPERATING:
case IO_ROBOTSTATUS_SERVO:
if ((ioStatus[IO_ROBOTSTATUS_REMOTE] != 1) ||
(ioStatus[IO_ROBOTSTATUS_PLAY] != 1) ||
(ioStatus[IO_ROBOTSTATUS_OPERATING] == 0) ||
(ioStatus[IO_ROBOTSTATUS_SERVO] == 0))
Ros_MotionServer_ClearQ_All(controller);
break;

case IO_ROBOTSTATUS_WAITING_ROS: // Job input signaling ready for external motion
{
if(ioStatus[IO_ROBOTSTATUS_WAITING_ROS] == 0) // signal turned OFF
Expand All @@ -753,6 +765,7 @@ BOOL Ros_Controller_StatusUpdate(Controller* controller)
controller->bRobotJobReady = TRUE; //job is ready (even if other factors will prevent motion)
break;
}

#if (YRC1000||YRC1000u)
case IO_ROBOTSTATUS_PFL_STOP: // PFL Stop
case IO_ROBOTSTATUS_PFL_ESCAPE: // PFL Escaping
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.