- various small bugfixes
- added driver for the lock-in amplifier
This commit is contained in:
17
lsc370driv.c
17
lsc370driv.c
@ -46,6 +46,9 @@ static void Lsc370ParDef(void *object) {
|
||||
ParName(""); ParTail("K");
|
||||
ParFloat(&drv->t, PAR_NAN);
|
||||
|
||||
ParName("htr"); ParTail("%");
|
||||
ParFloat(&drv->htr, PAR_NAN);
|
||||
|
||||
EaseBasePar(drv);
|
||||
EaseSendPar(drv);
|
||||
EaseDrivPar(drv, "%.5g", "K");
|
||||
@ -64,7 +67,13 @@ static long Lsc370Read(long pc, void *object) {
|
||||
EaseWrite(eab, "HTR?");
|
||||
return __LINE__; case __LINE__: /**********************************/
|
||||
drv->htr = atof(eab->ans);
|
||||
|
||||
if (EaseGetUpdate(drv, EASE_RUN)) goto skipGetSet;
|
||||
EaseWrite(eab, "SET?");
|
||||
return __LINE__; case __LINE__: /**********************************/
|
||||
if (EaseGetUpdate(drv, EASE_RUN)) goto skipGetSet;
|
||||
drv->d.targetValue = atof(eab->ans);
|
||||
|
||||
skipGetSet:
|
||||
ParLog(drv);
|
||||
fsm_quit: return 0; } /* FSM END *********************************/
|
||||
}
|
||||
@ -100,12 +109,12 @@ static long Lsc370Set(long pc, void *object) {
|
||||
switch (pc) { default: /* FSM BEGIN *******************************/
|
||||
upd = EaseNextUpdate(drv);
|
||||
if (upd != EASE_RUN) goto quit;
|
||||
EaseWrite(eab, "MODE 1:MODE?"); /* remote mode */
|
||||
EaseWrite(eab, "MODE 1;MODE?"); /* remote mode */
|
||||
return __LINE__; case __LINE__: /**********************************/
|
||||
snprintf(cmd, sizeof cmd, "SETP %.5g:SETP?", drv->d.targetValue);
|
||||
snprintf(cmd, sizeof cmd, "SETP %.5g;SETP?", drv->d.targetValue);
|
||||
EaseWrite(eab, cmd);
|
||||
return __LINE__; case __LINE__: /**********************************/
|
||||
EaseWrite(eab, "MODE 0:MODE?"); /* local mode */
|
||||
EaseWrite(eab, "MODE 0;MODE?"); /* local mode */
|
||||
quit:
|
||||
return 0; } /* FSM END ********************************************/
|
||||
}
|
||||
|
Reference in New Issue
Block a user