diff --git a/motorApp/AerotechSrc/EnsembleTrajectoryScan.st b/motorApp/AerotechSrc/EnsembleTrajectoryScan.st index 8e45686d..c506c90b 100644 --- a/motorApp/AerotechSrc/EnsembleTrajectoryScan.st +++ b/motorApp/AerotechSrc/EnsembleTrajectoryScan.st @@ -876,11 +876,7 @@ static int getEpicsMotorMoving(SS_ID ssId, struct UserVar *pVar) int result=0, mask=0x01; for (j=0; jnumAxes; j++) { -#if LT_SEQ_VERSION(2,2) seq_pvGet(ssId, pVar->epicsMotorDoneIndex[j], 0); -#else - seq_pvGet(ssId, pVar->epicsMotorDoneIndex[j], 0, DEFAULT_TIMEOUT); -#endif if (pVar->epicsMotorDone[j] == 0) result |= mask; mask = mask << 1; } @@ -899,21 +895,13 @@ static int waitEpicsMotors(SS_ID ssId, struct UserVar *pVar) /* Get the current motor positions, post them */ for (j=0; jnumAxes; j++) { pVar->motorCurrent[j] = pVar->epicsMotorPos[j]; -#if LT_SEQ_VERSION(2,2) seq_pvPut(ssId, pVar->motorCurrentIndex[j], 0); -#else - seq_pvPut(ssId, pVar->motorCurrentIndex[j], 0, DEFAULT_TIMEOUT); -#endif } epicsThreadSleep(POLL_INTERVAL); } for (j=0; jnumAxes; j++) { pVar->motorCurrent[j] = pVar->epicsMotorPos[j]; -#if LT_SEQ_VERSION(2,2) seq_pvPut(ssId, pVar->motorCurrentIndex[j], 0); -#else - seq_pvPut(ssId, pVar->motorCurrentIndex[j], 0, DEFAULT_TIMEOUT); -#endif } return(0); } @@ -1655,20 +1643,12 @@ static int loadTrajectory(SS_ID ssId, struct UserVar *pVar) { dtime = epicsTimeDiffInSeconds(&currTime, &lastPollTime); if (dtime > POLL_INTERVAL) { pVar->elapsedTime = epicsTimeDiffInSeconds(&currTime, &startTime); -#if LT_SEQ_VERSION(2,2) seq_pvPut(ssId, pVar->elapsedTimeIndex, 0); -#else - seq_pvPut(ssId, pVar->elapsedTimeIndex, 0, DEFAULT_TIMEOUT); -#endif epicsTimeGetCurrent(&lastPollTime); getMotorPositions(ssId, pVar, pVar->motorCurrent); for (k=0; knumAxes; k++) { if (pVar->moveAxis[k]) { -#if LT_SEQ_VERSION(2,2) seq_pvPut(ssId, pVar->motorCurrentIndex[k], 0); -#else - seq_pvPut(ssId, pVar->motorCurrentIndex[k], 0, DEFAULT_TIMEOUT); -#endif } } }