diff --git a/sinqEPICSApp/src/pmacAxis.cpp b/sinqEPICSApp/src/pmacAxis.cpp index b2505b9..0c29be8 100644 --- a/sinqEPICSApp/src/pmacAxis.cpp +++ b/sinqEPICSApp/src/pmacAxis.cpp @@ -484,33 +484,32 @@ asynStatus pmacAxis::getAxisStatus(bool *moving) { /* code to test against too long status 5 or 6 */ - if (axStat == 5 || axStat == 6) { - if (status6Time == 0) { - status6Time = time(NULL); - statusPos = position; - } else { - if (time(NULL) > status6Time + 60) { - /* trigger error only when not moving */ - if (abs(position - statusPos) < .1) { - done = 1; - *moving = false; - setIntegerParam(pC_->motorStatusMoving_, false); - setIntegerParam(pC_->motorStatusDone_, true); - setIntegerParam(pC_->motorStatusProblem_, true); - errlogPrintf( - "Axis %d stayed in 5,6 for more then 60 seconds BROKEN\n", - axisNo_); - updateMsgTxtFromDriver( - "Axis stayed in 5,6 for more then 60 seconds: BROKEN"); - status6Time = 0; - return asynSuccess; - } else { - status6Time = time(NULL); - statusPos = position; - } - } - } - } + // if (axStat == 5 || axStat == 6) { + // if (status6Time == 0) { + // status6Time = time(NULL); + // statusPos = position; + // } else { + // if (time(NULL) > status6Time + 60) { + ///* trigger error only when not moving */ + // if (abs(position - statusPos) < .1) { + // done = 1; + //*moving = false; + // setIntegerParam(pC_->motorStatusMoving_, false); + // setIntegerParam(pC_->motorStatusDone_, true); + // setIntegerParam(pC_->motorStatusProblem_, true); + // errlogPrintf("Axis %d stayed in 5,6 for more then 60 seconds BROKEN\n", + // axisNo_); + // updateMsgTxtFromDriver("Axis stayed in 5,6 for more then 60 seconds: + // BROKEN"); + // status6Time = 0; + // return asynSuccess; + // } else { + // status6Time = time(NULL); + // statusPos = position; + // } + // } + // } + //} if (!done) { *moving = true;