new features for evcontroller Nov.2002 M.Z.

This commit is contained in:
cvs
2002-11-13 07:21:26 +00:00
parent 55eedb640b
commit 3ace74d9d7
12 changed files with 200 additions and 201 deletions

View File

@@ -104,6 +104,7 @@ static float
maxShift=2, /* maximal shift in when controlMode=2 */
tm=DATA_UNDEF, /* main temperature */
ts=DATA_UNDEF, /* sample temperature */
tx=DATA_UNDEF, /* controlled temperature */
tr=DATA_UNDEF, /* set temperature (read back) */
te=DATA_UNDEF, /* test temperature */
he=DATA_UNDEF, /* helium level value */
@@ -929,6 +930,11 @@ int ReadTemp(void) {
tm=(rdTim % 3600) * 1.0e-4;
ts=(rdTim % 60) * 60.0e-4+0.5;
}
if (controlMode==0) {
tx=tm;
} else {
tx=ts;
}
if (auxSens != NULL) {
aux=auxSens->t * auxSens->scale;
} else {
@@ -1133,7 +1139,6 @@ int PutFloat(StrBuf *buf, int prec, float f) {
int PidSumHdl(int mode, void *base, int fd) {
StrBuf buf;
readTemp=1;
StrLink(&buf, pid);
StrClear(&buf);
ERR_I(PutFloat(&buf, 5, prop));
@@ -2300,6 +2305,7 @@ int main(int argc, char *argv[]) {
CocDefFlt(tm, RD);
CocDefFlt(ts, RD);
CocDefFlt(tr, RD);
CocDefFlt(tx, RD);
CocDefFlt(te, RD);
CocDefFlt(aux, RD);
CocDefFlt(he, RD);