- Changed strncpy to strlcpy, strncat to strlcat
- Added strlcpy and strlcat to SICS - Added a driver for the POLDI power supplies SKIPPED: psi/A1931.c psi/autowin.c psi/bruker.c psi/docho.c psi/dornier2.c psi/dspcode.c psi/ease.c psi/ecb.c psi/ecbcounter.c psi/ecbdriv.c psi/el734dc.c psi/el734driv.c psi/el734hp.c psi/el737driv.c psi/el737hpdriv.c psi/el737hpdrivsps.c psi/el737hpv2driv.c psi/el755driv.c psi/eurodriv.c psi/haakedriv.c psi/itc4driv.c psi/julcho.c psi/linadriv.c psi/lmd200.c psi/lscsupport.c psi/ltc11.c psi/make_gen psi/oicom.c psi/oxinst.c psi/pimotor.c psi/pipiezo.c psi/polterwrite.c psi/psi.c psi/sanscook.c psi/sanslirebin.c psi/sanswave.c psi/sinqhmdriv.c psi/sinqhttp.c psi/slsecho.c psi/slsmagnet.c psi/slsvme.c psi/sps.c psi/swmotor.c psi/swmotor2.c psi/tabledrive.c psi/tasscan.c psi/tdchm.c psi/velodorn.c psi/velodornier.c
This commit is contained in:
15
counter.c
15
counter.c
@ -578,6 +578,16 @@ float GetCounterPreset(pCounter self)
|
||||
return self->getPreset(self);
|
||||
}
|
||||
/*------------------------------------------------------------------------*/
|
||||
float GetControlValue(pCounter self)
|
||||
{
|
||||
return self->getControlValue(self);
|
||||
}
|
||||
/*------------------------------------------------------------------------*/
|
||||
static float GetControlValueImpl(pCounter self)
|
||||
{
|
||||
return self->pDriv->fLastCurrent;
|
||||
}
|
||||
/*------------------------------------------------------------------------*/
|
||||
static float GetCounterPresetImpl(pCounter self)
|
||||
{
|
||||
int i;
|
||||
@ -739,6 +749,7 @@ pCounter CreateCounter(char *name, pCounterDriver pDriv)
|
||||
pRes->getNMonitor = GetNMonitorImpl;
|
||||
pRes->setPreset = SetCounterPresetImpl;
|
||||
pRes->getPreset = GetCounterPresetImpl;
|
||||
pRes->getControlValue = GetControlValueImpl;
|
||||
pRes->getCounts = GetCountsImpl;
|
||||
pRes->getMonitor = GetMonitorImpl;
|
||||
pRes->setMonitor = SetMonitorValueImpl;
|
||||
@ -920,8 +931,8 @@ int CountAction(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
if (GetCounterMode(self) == ePreset) {
|
||||
sprintf(pBueffel, "%s.CountStatus = %d %d Beam: %ld E6",
|
||||
argv[0],
|
||||
(int) nintf(self->pDriv->fPreset),
|
||||
(int) nintf(self->pDriv->fLastCurrent),
|
||||
(int) nintf(GetCounterPreset(self)),
|
||||
(int) nintf(GetControlValue(self)),
|
||||
GetMonitor(self, 4, pCon) / 100000);
|
||||
} else {
|
||||
sprintf(pBueffel, "%s.CountStatus = %8.2f %8.2f Beam %ld E6",
|
||||
|
Reference in New Issue
Block a user