- Implemented defpos for multiple motors
- Implemented automatic backup on parameter change - Implemented silent restore - Cleaned a couple of unused flags from connection object
This commit is contained in:
@ -33,7 +33,7 @@ int GPIBread(pGPIB self, int devID, void *buffer, int bytesToRead){
|
||||
}
|
||||
/*--------------------------------------------------------------------*/
|
||||
char *GPIBreadTillTerm(pGPIB self, int devID, int terminator){
|
||||
unsigned char buchstabe[2];
|
||||
char buchstabe[2];
|
||||
Tcl_DString buffer;
|
||||
char *result = NULL;
|
||||
int status;
|
||||
@ -59,7 +59,7 @@ void GPIBclear(pGPIB self, int devID){
|
||||
}
|
||||
/*--------------------------------------------------------------------*/
|
||||
void GPIBerrorDescription(pGPIB self, int code, char *buffer, int maxBuf){
|
||||
return self->getErrorDescription(code, buffer,maxBuf);
|
||||
self->getErrorDescription(code, buffer,maxBuf);
|
||||
}
|
||||
/*-------------------------------------------------------------------
|
||||
These are void implementations of the functions for simulation
|
||||
@ -83,7 +83,7 @@ static int SIMread(int devID, void *buffer, int bytesToRead){
|
||||
}
|
||||
/*--------------------------------------------------------------------*/
|
||||
static int SIMclear(int devID){
|
||||
return;
|
||||
return 1;
|
||||
}
|
||||
/*---------------------------------------------------------------------*/
|
||||
static void SIMerror(int code, char *buffer, int maxBuf){
|
||||
@ -115,10 +115,13 @@ int GPIBAction(SConnection *pCon, SicsInterp *pSics, void *pData,
|
||||
Only managers will be allowed to wrestle directly with GPIB
|
||||
controllers.
|
||||
*/
|
||||
if(!SCMatchRights(pCon,usMugger)){
|
||||
return 0;
|
||||
if(!SCinMacro(pCon)){
|
||||
if(!SCMatchRights(pCon,usMugger)){
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if(argc > 1){
|
||||
strtolower(argv[1]);
|
||||
if(strcmp(argv[1],"attach") == 0){
|
||||
|
Reference in New Issue
Block a user