lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

backed out seq_pv* arg changes

Browse Source
This commit is contained in:
timmmooney
2014-11-17 20:38:16 +00:00
parent 0cefe9cb8d
commit 29e0125274
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/AerotechSrc/EnsembleTrajectoryScan.st
-20
View File
@@ -876,11 +876,7 @@ static int getEpicsMotorMoving(SS_ID ssId, struct UserVar *pVar)
int result=0, mask=0x01;
for (j=0; j<pVar->numAxes; 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; j<pVar->numAxes; 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; j<pVar->numAxes; 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; k<pVar->numAxes; 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
}
}
}