From e410cc00305c52fee199e41c6c71eab4041e9006 Mon Sep 17 00:00:00 2001 From: timmmooney Date: Mon, 17 Nov 2014 20:39:54 +0000 Subject: [PATCH] backed out seq_pv* arg changes --- motorApp/OmsSrc/MAX_trajectoryScan.st | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/motorApp/OmsSrc/MAX_trajectoryScan.st b/motorApp/OmsSrc/MAX_trajectoryScan.st index 1228c47b..10a14d82 100644 --- a/motorApp/OmsSrc/MAX_trajectoryScan.st +++ b/motorApp/OmsSrc/MAX_trajectoryScan.st @@ -997,11 +997,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; } @@ -1020,22 +1016,14 @@ 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 } if (pVar->debugLevel >= 1) printf("waitEpicsMotors: m1=%f\n", pVar->epicsMotorPos[0]); 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); }