- various small bugfixes

- added driver for the lock-in amplifier
This commit is contained in:
zolliker
2006-10-27 08:14:13 +00:00
parent 980efacf6f
commit d6198ad3a3
8 changed files with 260 additions and 5 deletions

View File

@ -317,6 +317,7 @@ static long IghRead(long pc, void *object) {
}
EaseWrite(eab, "R0");
return __LINE__; case __LINE__: /**********************************/
if (EaseGetUpdate(drv, SORBS_FLAG)) goto skip0;
drv->sorbS = OxiGet(eab, 1, NULL, drv->sorbS);
skip0:
@ -361,6 +362,7 @@ static long IghRead(long pc, void *object) {
if (EaseGetUpdate(drv, MIXP_FLAG)) goto skip4;
EaseWrite(eab, "R4");
return __LINE__; case __LINE__: /**********************************/
if (EaseGetUpdate(drv, MIXP_FLAG)) goto skip4;
drv->mixP = OxiGet(eab, 5 - drv->e, NULL, drv->mixP/10) * 10;
skip4:
@ -369,6 +371,7 @@ static long IghRead(long pc, void *object) {
if (EaseGetUpdate(drv, STILL_FLAG)) goto skip5;
EaseWrite(eab, "R5");
return __LINE__; case __LINE__: /**********************************/
if (EaseGetUpdate(drv, STILL_FLAG)) goto skip5;
drv->stillP = OxiGet(eab, 1, NULL, drv->stillP);
skip5:
@ -377,6 +380,7 @@ static long IghRead(long pc, void *object) {
if (EaseGetUpdate(drv, SORBP_FLAG)) goto skip6;
EaseWrite(eab, "R6");
return __LINE__; case __LINE__: /**********************************/
if (EaseGetUpdate(drv, SORBP_FLAG)) goto skip6;
drv->sorbP = OxiGet(eab, 3, NULL, drv->sorbP);
skip6:
@ -385,6 +389,7 @@ static long IghRead(long pc, void *object) {
if (EaseGetUpdate(drv, MOT_FLAGS+V6)) goto skip7;
EaseWrite(eab, "R7");
return __LINE__; case __LINE__: /**********************************/
if (EaseGetUpdate(drv, MOT_FLAGS+V6)) goto skip7;
drv->mv[V6] = OxiGet(eab, 1, NULL, drv->mv[V6]);
time(&now);
delta = (now - drv->v6time) / 2.64; /* speed: 1/2.64 %/sec */
@ -403,6 +408,7 @@ static long IghRead(long pc, void *object) {
if (EaseGetUpdate(drv, MOT_FLAGS+V12A)) goto skip8;
EaseWrite(eab, "R8");
return __LINE__; case __LINE__: /**********************************/
if (EaseGetUpdate(drv, MOT_FLAGS+V12A)) goto skip8;
drv->mv[V12A] = OxiGet(eab, 1, NULL, drv->mv[V12A]);
skip8:
@ -411,6 +417,7 @@ static long IghRead(long pc, void *object) {
if (EaseGetUpdate(drv, MOT_FLAGS+V1K)) goto skip9;
EaseWrite(eab, "R9");
return __LINE__; case __LINE__: /**********************************/
if (EaseGetUpdate(drv, MOT_FLAGS+V1K)) goto skip9;
drv->mv[V1K] = OxiGet(eab, 1, NULL, drv->mv[V1K]);
skip9: