- Modified collective drive operations to run motors in individual tasks
- Added a processnode methos to scriptcontext. processnode waits for the scriptchain of a node to finish. - Fixed a bug in sicsget - Made histmemsec dim and rank manager privilege. To allow chnage at runtime. Is required for SANS - Fixed some issues with multicountersec, mostly relating to passing things through in a sensible way. - Updated motorsec.c to work with a client based driver SKIPPED: psi/polterwrite.c psi/tabledrive.c psi/tabledrive.h
This commit is contained in:
15
sicsget.c
15
sicsget.c
@ -81,7 +81,7 @@ static int SICSGetCommand(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
if(status){
|
||||
data = formatValue(v,NULL);
|
||||
if(data != NULL){
|
||||
SCPrintf(pCon,eValue,"%s",GetCharArray(data));
|
||||
SCPrintf(pCon,eValue,"%s",trim(GetCharArray(data)));
|
||||
DeleteDynString(data);
|
||||
} else {
|
||||
SCPrintf(pCon,eError,"ERROR: formatting value for %s failed", argv[1]);
|
||||
@ -176,7 +176,7 @@ static int SplitOffEqual(void *ms, void *userData)
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static int isNumber(char *txt)
|
||||
{
|
||||
if(*txt == '\0'){
|
||||
if(*txt == '\0' || *txt == ' '){
|
||||
return 1;
|
||||
}
|
||||
if(isalpha(*txt)){
|
||||
@ -189,12 +189,14 @@ static int isNumber(char *txt)
|
||||
static int countWords(char *txt)
|
||||
{
|
||||
char number[80];
|
||||
int count = 0;
|
||||
char *pPtr = txt;
|
||||
|
||||
if(txt == NULL || strlen(txt) < 1){
|
||||
return 0;
|
||||
} else {
|
||||
return 1 + countWords(stptok(txt,number,sizeof(number)," "));
|
||||
while(pPtr != NULL){
|
||||
count++;
|
||||
pPtr = stptok(pPtr,number,sizeof(number)," ");
|
||||
}
|
||||
return count;
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
static hdbValue makeArray(char *txt, int type, int count)
|
||||
@ -216,6 +218,7 @@ static hdbValue makeArray(char *txt, int type, int count)
|
||||
} else {
|
||||
ar.v.floatArray[i] = atof(number);
|
||||
}
|
||||
i++;
|
||||
}
|
||||
return ar;
|
||||
}
|
||||
|
Reference in New Issue
Block a user