minor change

This commit is contained in:
cvs
2000-05-16 14:32:37 +00:00
parent 24ae65783a
commit 9053ae4e2d

View File

@ -586,13 +586,15 @@ int PeriodicTask(void) {
str_copy(cryo.device, buf1+1); str_copy(cryo.device, buf1+1);
cryo.manual=1; cryo.manual=1;
} else { } else {
str_copy(cryo.device, buf1); if (cryo.code!=0) str_copy(cryo.device, buf1);
cryo.manual=0;
} }
if (buf2[0]=='*') { if (buf2[0]=='*') {
str_copy(samp.device, buf2+1); str_copy(samp.device, buf2+1);
samp.manual=1; samp.manual=1;
} else { } else {
str_copy(samp.device, buf2); if (samp.code!=0) str_copy(samp.device, buf2);
samp.manual=0;
} }
concatDevice(); concatDevice();
if (cryo.manual || cryo.code!=0) { cryo.dirty=1; } if (cryo.manual || cryo.code!=0) { cryo.dirty=1; }
@ -860,8 +862,8 @@ int ExecuteRequest(void) {
t=strchr(device, '/'); t=strchr(device, '/');
if (t==NULL) { if (t==NULL) {
if (0==strcmp(device, "0") || 0==strcasecmp(device, "auto")) { if (0==strcmp(device, "0") || 0==strcasecmp(device, "auto")) {
cryo.manual=0; cryo.dirty=1; cryo.manual=0; cryo.dirty=1; cryo.device[0]='\0';
samp.manual=0; samp.dirty=1; samp.manual=0; samp.dirty=1; samp.device[0]='\0';
} else { } else {
str_copy(cryo.device, device); str_copy(cryo.device, device);
str_copy(samp.device, device); str_copy(samp.device, device);