- Added a protocol driver for the munich sputter machine
- Added a multicountsersec to teplace hmcontrol and multicounter - Fixed a case sensitivity bug in haddcheck - Made oscillate work with second generation motors for POLDI - Added a time stamper to trace. Now there will be time stamps in trace files which allow to correlate things from the master log with the trace. - Updated polterwrite. - Updated testprot to work with the behave test SKIPPED: psi/make_gen psi/polterwrite.c psi/psi.c psi/sputterprot.c
This commit is contained in:
@@ -243,12 +243,12 @@ pHdbCallback MakeReadOnlyCallback()
|
||||
return MakeHipadabaCallback(SICSReadOnlyCallback, NULL, NULL);
|
||||
}
|
||||
/*------------------------------------------------------------------------------------*/
|
||||
static hdbCallbackReturn SICSValueCheckCallback(pHdb node, void *userData,
|
||||
hdbCallbackReturn SICSValueCheckCallback(pHdb node, void *userData,
|
||||
pHdbMessage message)
|
||||
{
|
||||
SConnection *pCon = NULL;
|
||||
pHdbDataMessage mm = NULL;
|
||||
char values[1024], *pPtr, pToken[80];
|
||||
char values[1024], *pPtr, pToken[80], *pVal;
|
||||
int status;
|
||||
hdbValue v;
|
||||
|
||||
@@ -273,11 +273,15 @@ static hdbCallbackReturn SICSValueCheckCallback(pHdb node, void *userData,
|
||||
}
|
||||
|
||||
pPtr = values;
|
||||
pVal = strdup(v.v.text);
|
||||
strtolower(pVal);
|
||||
while((pPtr = stptok(pPtr,pToken,sizeof(pToken),",")) != NULL){
|
||||
if(strcmp(pToken,v.v.text) == 0) {
|
||||
if(strcmp(pToken,pVal) == 0) {
|
||||
free(pVal);
|
||||
return hdbContinue;
|
||||
}
|
||||
}
|
||||
free(pVal);
|
||||
|
||||
if(pCon != NULL){
|
||||
SCPrintf(pCon,eLogError,"ERROR: %s not allowed as value for %s, allowed are: %s",
|
||||
@@ -3958,7 +3962,7 @@ int InstallSICSHipadaba(SConnection * pCon, SicsInterp * pSics,
|
||||
AddCommand(pSics, "hnotify", AutoNotifyHdbNode, NULL, NULL);
|
||||
AddCommand(pSics, "hdelcb", RemoveHdbCallback, NULL, NULL);
|
||||
AddCommand(pSics, "hinfo", HdbNodeInfo, NULL, NULL);
|
||||
AddCommand(pSics, "hval", HdbNodeVal, NULL, NULL);
|
||||
/* AddCommand(pSics, "hval", HdbNodeVal, NULL, NULL);*/
|
||||
AddCommand(pSics, "hchain", ChainHdbNode, NULL, NULL);
|
||||
AddCommand(pSics, "harray", HdbArrayNode, NULL, NULL);
|
||||
AddCommand(pSics, "hsetprop", SetSICSHdbProperty, NULL, NULL);
|
||||
|
||||
Reference in New Issue
Block a user