- various enhancements

This commit is contained in:
zolliker
2007-02-23 12:25:36 +00:00
parent a3bcd7586b
commit 284c955411
4 changed files with 43 additions and 18 deletions

View File

@ -368,6 +368,7 @@ static long IpsChangeField(long pc, void *object) {
ParPrintf(drv, -1, "IPS: wait %d sec to open switch", delay);
start_ramp:
ParLog(drv);
FsmWait(1);
return __LINE__; case __LINE__: /**********************************/
EaseWrite(eab, "X");
@ -390,6 +391,7 @@ static long IpsChangeField(long pc, void *object) {
ParPrintf(drv, -1, "IPS: ramp to %f Tesla", drv->d.targetValue);
ramping:
ParLog(drv);
FsmWait(1);
return __LINE__; case __LINE__: /**********************************/
EaseWrite(eab, "R7"); /* read "current" in Tesla */
@ -413,7 +415,6 @@ static long IpsChangeField(long pc, void *object) {
}
OxiSet(eab, "J", fld, 3);
return __LINE__; case __LINE__: /**********************************/
ParLog(drv);
goto ramping;
target_reached:
@ -423,6 +424,7 @@ static long IpsChangeField(long pc, void *object) {
/* but we continue in the background */
drv->tim = time(NULL);
stab3:
ParLog(drv);
FsmWait(1);
return __LINE__; case __LINE__: /**********************************/
EaseWrite(eab, "X");
@ -441,6 +443,7 @@ static long IpsChangeField(long pc, void *object) {
ParPrintf(drv, -1, "IPS: wait 30 sec to close switch");
wait_closed:
ParLog(drv);
FsmWait(1);
return __LINE__; case __LINE__: /**********************************/
EaseWrite(eab, "R18"); /* read persistent field in Tesla */