linse/sicspsi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates for SeaServer

Browse Source
This commit is contained in:
zolliker
2007-04-26 14:47:42 +00:00
parent a24f56e7fb
commit 768c674aa8
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ease.h
View File

@ -40,7 +40,7 @@ typedef struct {
EaseState state; EaseState state;
time_t cmdtime; time_t cmdtime;
int syntax; /* not used in ease, may be used by the driver. used by oxinst.c */ int syntax; /* not used in ease, may be used by the driver. used by oxinst.c */
char cmd[32]; char cmd[64];
char ans[64]; char ans[64];
char version[64]; char version[64];
char msg[256]; char msg[256];

2
ipsdriv.c
View File

@ -403,7 +403,7 @@ static long IpsChangeField(long pc, void *object) {
EaseWrite(eab, "R9"); /* read back ramp rate (may be sweep limited) */ EaseWrite(eab, "R9"); /* read back ramp rate (may be sweep limited) */
return __LINE__; case __LINE__: /**********************************/ return __LINE__; case __LINE__: /**********************************/
ramp=OxiGet(eab, 3, NULL, drv->ramp); ramp=OxiGet(eab, 3, NULL, drv->ramp);
step=ramp/20; /* step = ramp * 3sec */ step=ramp/6; /* step = ramp * 10 sec */
if (step < 0.001) step=0.001; if (step < 0.001) step=0.001;
if (drv->d.targetValue > drv->current + step) { if (drv->d.targetValue > drv->current + step) {
fld=drv->current + step; fld=drv->current + step;

7
lsc370driv.c
View File

@ -35,6 +35,7 @@ typedef struct {
float t; float t;
float htr; float htr;
float set; float set;
float res;
} Lsc370; } Lsc370;
static ParClass lsc370Class = { "LSC370", sizeof(Lsc370) }; static ParClass lsc370Class = { "LSC370", sizeof(Lsc370) };
@ -53,6 +54,9 @@ static void Lsc370ParDef(void *object) {
ParName("htr"); ParTail("%"); ParName("htr"); ParTail("%");
ParFloat(&drv->htr, PAR_NAN); ParFloat(&drv->htr, PAR_NAN);
ParName("res"); ParTail("Ohm");
ParFloat(&drv->res, PAR_NAN);
EaseBasePar(drv); EaseBasePar(drv);
EaseSendPar(drv); EaseSendPar(drv);
EaseDrivPar(drv, "%.5g", "K"); EaseDrivPar(drv, "%.5g", "K");
@ -68,6 +72,9 @@ static long Lsc370Read(long pc, void *object) {
EaseWrite(eab, "RDGK?1"); EaseWrite(eab, "RDGK?1");
return __LINE__; case __LINE__: /**********************************/ return __LINE__; case __LINE__: /**********************************/
drv->t = atof(eab->ans); drv->t = atof(eab->ans);
EaseWrite(eab, "RDGR?1");
return __LINE__; case __LINE__: /**********************************/
drv->res = atof(eab->ans);
EaseWrite(eab, "HTR?"); EaseWrite(eab, "HTR?");
return __LINE__; case __LINE__: /**********************************/ return __LINE__; case __LINE__: /**********************************/
drv->htr = atof(eab->ans); drv->htr = atof(eab->ans);