- Fixed documentation typos
- In support of HMsec, allow the count command in countsec to run without a preset parameter. If this is missing the old, stored preset is used. - Removed a check which causes initialisation of the HM from a batch file fail for POLDI - fixed @nl@ encoding of \n problem with certain kinds of batch files generated by GTSE - Fixed a bug with summing on hitsmemsec. nxdataset now uses 64 bit int for dimensions. - Fixed motorsec to remove itself properly from a parent when linked. Please note that there is still the limitation that a second generation motor can only be linked once in a Hipadaba tree - Extended subsampling a HM for second generation HM - Added a hscriptnotify. This calls a script on the update of a node - POLDI has been rebuilt, chnages to data file writing - For testing, sinqhttopt now understands a special command, byteswapoff, which switches off byte swapping. Required when the HM ius run on an Intel box. SKIPPED: psi/polterwrite.c psi/sinqhttpopt.c
This commit is contained in:
30
countersec.c
30
countersec.c
@ -401,12 +401,21 @@ static int CountCmd(pSICSOBJ ccmd, SConnection * con,
|
||||
Hdb * cmdNode, Hdb * par[], int nPar)
|
||||
{
|
||||
float preset;
|
||||
pHdb presetNode = NULL;
|
||||
|
||||
if(nPar < 1){
|
||||
return 0;
|
||||
presetNode = GetHipadabaNode(ccmd->objectNode,"preset");
|
||||
if(presetNode != NULL){
|
||||
preset = presetNode->value.v.doubleValue;
|
||||
} else {
|
||||
/*
|
||||
This can really only happen when the counter is corrupt
|
||||
*/
|
||||
assert(0);
|
||||
}
|
||||
} else {
|
||||
preset = par[0]->value.v.doubleValue;
|
||||
}
|
||||
|
||||
preset = par[0]->value.v.doubleValue;
|
||||
return DoCount((pCounter)ccmd, preset, con, 1);
|
||||
}
|
||||
/*--------------------------------------------------------------------------*/
|
||||
@ -414,12 +423,21 @@ static int CountNBCmd(pSICSOBJ ccmd, SConnection * con,
|
||||
Hdb * cmdNode, Hdb * par[], int nPar)
|
||||
{
|
||||
float preset;
|
||||
pHdb presetNode = NULL;
|
||||
|
||||
if(nPar < 1){
|
||||
return 0;
|
||||
presetNode = GetHipadabaNode(ccmd->objectNode,"preset");
|
||||
if(presetNode != NULL){
|
||||
preset = presetNode->value.v.doubleValue;
|
||||
} else {
|
||||
/*
|
||||
This can really only happen when the counter is corrupt
|
||||
*/
|
||||
assert(0);
|
||||
}
|
||||
} else {
|
||||
preset = par[0]->value.v.doubleValue;
|
||||
}
|
||||
|
||||
preset = par[0]->value.v.doubleValue;
|
||||
return DoCount((pCounter)ccmd, preset, con, 0);
|
||||
}
|
||||
/*--------------------------------------------------------------------------*/
|
||||
|
Reference in New Issue
Block a user