- reintroducted MF/TEM

This commit is contained in:
zolliker
2007-09-25 06:52:27 +00:00
parent e36dc843ed
commit c7c561b723
7 changed files with 147 additions and 101 deletions

View File

@ -24,6 +24,7 @@
#include <scan.h>
#include <scan.i>
#include "tas.h"
#include "tasu.h"
extern int getSRO(SConnection *pCon, float *fVal); /* tasutil.c */
@ -31,7 +32,7 @@ extern int getSRO(SConnection *pCon, float *fVal); /* tasutil.c */
As variables may be accessed in storage order, it is necessary to
know the order of the motors
*/
char *tasMotorOrder[] = { "a1",
char *tasMotorOrder[MAXMOT+1] = { "a1",
"a2",
"a3",
"a4",
@ -63,6 +64,8 @@ char *tasMotorOrder[] = { "a1",
"i6",
"i7",
"i8",
"mf",
"tem",
NULL };
/*
In order to initialise the variable array in the TAS data structure we
@ -70,7 +73,7 @@ char *tasMotorOrder[] = { "a1",
has to match the order defined in tas.h through the defines. Otherwise
quite weird things may happen at runtime.
*/
char *tasVariableOrder[] = {
char *tasVariableOrder[MAXPAR+1] = {
"wav",
"dm",
"da",
@ -207,6 +210,8 @@ char *tasVariableOrder[] = {
"pfx",
"pfy",
"pfz",
"dmf",
"dtem",
NULL};
/*-------------------------------------------------------------------
Normally SICS does not store motor hardware limits into status files as
@ -227,6 +232,9 @@ static int TasSaveStatus(void *self, char *name, FILE *fd)
{
return 0;
}
if (strcmp(name, "dr") != 0) { /* save only once (for dr, but not for sc,fs,updateqe) */
return 1;
}
while(tasMotorOrder[i] != NULL)
{
pMot = FindMotor(pServ->pSics,tasMotorOrder[i]);