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

M.Z.

Browse Source
This commit is contained in:
cvs
2003-03-12 13:41:03 +00:00
parent 0dea907a42
commit 9f03f7cdd7
2 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tecs/tecs.c
View File

@@ -170,6 +170,7 @@ static char
alarmChannels[N_SENSORS], alarmChannels[N_SENSORS],
alarmHistory[N_SENSORS], alarmHistory[N_SENSORS],
dev[80], dev[80],
dev2[80],
devHelp[10000], devHelp[10000],
controlChannel[4]="A"; controlChannel[4]="A";
@@ -490,19 +491,25 @@ int InstalCurve(SensorT *sensor, char *dev) {
return -1; return -1;
} }
int ReadTable(void) {
char nbuf[256];
if (table!=NULL && tim>tableTime+60) { FREE(table); table=NULL; }; /* clear old table */
if (table!=NULL) return 0;
str_copy(nbuf, binDir);
str_append(nbuf, TABLE_FILE);
ERR_P(table=str_read_file(nbuf));
tableTime=tim;
return 1;
OnError: return -1;
}
int PrepInput(char *label) { int PrepInput(char *label) {
char *t, *e; char *t, *e;
char nam[16], chans[8], nbuf[256], typ; char nam[16], chans[8], typ;
int i, j, l; int i, j, l;
SensorT *s; SensorT *s;
if (table!=NULL && tim>tableTime+60) { FREE(table); table=NULL; }; /* clear old table */ ERR_I(ReadTable());
if (table==NULL) { /* read table */
str_copy(nbuf, binDir);
str_append(nbuf, TABLE_FILE);
ERR_P(table=str_read_file(nbuf));
tableTime=tim;
}
t=strstr(table, label); t=strstr(table, label);
if (t==NULL) ERR_MSG("device not found"); if (t==NULL) ERR_MSG("device not found");
e=strchr(t, '\''); e=strchr(t, '\'');
@@ -2086,17 +2093,11 @@ EndStatus:
int DevHelpHdl(int mode, void *base, int fd) { int DevHelpHdl(int mode, void *base, int fd) {
char *t, *n, *d, *en, *ed; char *t, *n, *d, *en, *ed;
char line[80], nbuf[256]; char line[80], nbuf[256];
int l; int l, iret;
static int doit=1; static int doit=1;
if (table!=NULL && tim>tableTime+60) { FREE(table); table=NULL; }; /* clear old table */ ERR_I(iret=ReadTable());
if (table==NULL) { /* read table */ if (iret) doit=1;
str_copy(nbuf, binDir);
str_append(nbuf, TABLE_FILE);
ERR_P(table=str_read_file(nbuf));
tableTime=tim;
doit=1;
}
if (doit) { if (doit) {
doit=0; doit=0;
t=table; t=table;
@@ -2338,6 +2339,7 @@ int main(int argc, char *argv[]) {
CocDefStr(pid, RD); CocHdl(PidSumHdl); CocDefStr(pid, RD); CocHdl(PidSumHdl);
CocDefStr(config, RD); CocDefStr(config, RD);
CocDefStr(dev, RD); CocDefStr(dev, RD);
CocDefStr(dev2, RD);
CocDefStr(devHelp, RD); CocHdl(DevHelpHdl); CocDefStr(devHelp, RD); CocHdl(DevHelpHdl);
CocDefInt(cod1, RD); CocDefInt(cod1, RD);

10
tecs/tecs_client.f
View File

@@ -208,15 +208,7 @@
print * print *
print *,'Ta,Tb,Tc,Td values of channels A,B,C,D' print *,'Ta,Tb,Tc,Td values of channels A,B,C,D'
print * print *
print *,'Temperature devices:' print *,'devhelp list available temperature devices'
print *
print *,'ill1, ill2, ill3 (as cryostat), ill3f (as cryofurnace),'
1 ,'ill4 (focus-cryo), ill5 (maxi), ori3'
print *,'cti1, cti2, cti3, cti4, cti5 (maxi), cti6 (focus), apd'
print *,'ccr4k (4K closed cycle), hef4c (TriCS 4circle cryo)'
print *,'fs (small furnace), ft (tantalum furnace)'
print *,'sup4t (supra.magnet 4T), ma09 (9T)'
print *,'rdr11, rdr12 (LTF dilution 1 & 2, 20kOhm)'
print * print *
elseif (cmd .eq. 'log') then elseif (cmd .eq. 'log') then
if (line(1:l) .eq. ' ') then if (line(1:l) .eq. ' ') then