- Added another slit for AMOR

- Fixed timeout for pimotor
- Fixed a bug which could cause tabledrive to go into an endless loop
This commit is contained in:
koennecke
2006-12-07 14:05:35 +00:00
parent ee7592b46c
commit a91056837e
6 changed files with 39 additions and 10 deletions

View File

@ -380,6 +380,8 @@ static int amorSetSave(void *data, char *name,FILE *fd){
fprintf(fd,"%s dspar %f\n", name, self->dspar);
fprintf(fd,"%s detectoroffset %f\n", name, self->detectoroffset);
fprintf(fd,"%s verbose %d\n", name, self->verbose);
fprintf(fd,"%s targets %f %f %f\n", name, self->targetath, self->targetm2t,
self->targets2t);
saveAmorComp(fd,name,"chopper",&self->chopper);
saveAmorComp(fd,name,"mono",&self->M);
saveAmorComp(fd,name,"ds",&self->DS);
@ -619,6 +621,22 @@ int AmorSetAction(SConnection *pCon, SicsInterp *pSics, void *pData,
SCWrite(pCon,pBueffel,eValue);
return 1;
}
}else if(strcmp(argv[1],"targets") == 0){
if(argc >= 5){
if(!SCMatchRights(pCon,usMugger)){
return 0;
}
self->targetath = atof(argv[2]);
self->targetm2t = atof(argv[3]);
self->targets2t = atof(argv[4]);
SCSendOK(pCon);
return 1;
} else {
snprintf(pBueffel,131,"%s targets = %f %f %F", argv[0],
self->targetath, self->targetm2t, self->targets2t);
SCWrite(pCon,pBueffel,eValue);
return 1;
}
}else if(strcmp(argv[1],"verbose") == 0){
if(argc > 2){
if(!SCMatchRights(pCon,usMugger)){