Cleaned up ANSTO code to merge with sinqdev.sics
This is our new RELEASE-4_0 branch which was taken from ansto/93d9a7c Conflicts: .gitignore SICSmain.c asynnet.c confvirtualmot.c counter.c devexec.c drive.c event.h exebuf.c exeman.c histmem.c interface.h motor.c motorlist.c motorsec.c multicounter.c napi.c napi.h napi4.c network.c nwatch.c nxscript.c nxxml.c nxxml.h ofac.c reflist.c scan.c sicshipadaba.c sicsobj.c site_ansto/docs/Copyright.txt site_ansto/instrument/lyrebird/config/tasmad/sicscommon/nxsupport.tcl site_ansto/instrument/lyrebird/config/tasmad/taspub_sics/tasscript.tcl statusfile.c tasdrive.c tasub.c tasub.h tasublib.c tasublib.h
This commit is contained in:
7
tasub.h
7
tasub.h
@ -24,20 +24,21 @@
|
||||
tasQEPosition current;
|
||||
int tasMode;
|
||||
int outOfPlaneAllowed;
|
||||
int autofocus;
|
||||
int focusfn;
|
||||
double targetEn, actualEn;
|
||||
int mustRecalculate;
|
||||
int mustDrive;
|
||||
int mustDriveQ;
|
||||
pMotor motors[12];
|
||||
char motname[12][32];
|
||||
int busy[12];
|
||||
tasReflection r1, r2;
|
||||
pIDrivable mono;
|
||||
long monoTaskID;
|
||||
void *monoData;
|
||||
int ubValid;
|
||||
int silent;
|
||||
int stopFixed; /* flag to stop multiple fixed messages in scans*/
|
||||
char *updater;
|
||||
long groupID;
|
||||
}tasUB, *ptasUB;
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user