linse/sicspsi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Removed napi from SICS

Browse Source 
- Added error fields to hwardware objects: motor, counter, histmem
- Optimised sinqhttpopt
- Added haddcheck which adds checks to hipadaba nodes. The current implementation
  only checks for selctions agaisnt the values property. Expand when more checks are
  required.
This commit is contained in:
koennecke
2013-08-14 09:50:31 +00:00
parent dba57e55b7
commit 5c3e3a4422
3 changed files with 64 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
polterwrite.c
View File

@ -173,10 +173,19 @@ static void writeDiaphragm2(NXhandle hfil, NXdict hdict,
SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "dia2zplus0", "d2vu");
SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "dia2z_minus", "d2vl");
SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "dia2zminus0", "d2vl");
SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "dia2z_x", "d2x");
SNXSPutMotorNull(pServ->pSics, pCon, hfil, hdict, "dia2z_x0", "d2x");
SNXSPutVariable(pServ->pSics, pCon, hfil, hdict, "dia2dist",
"dia1_dia2");
}
/*---------------------------------------------------------------------*/
static void writeCollimator(NXhandle hfil, NXdict hdict,
SConnection * pCon)
{
SNXSPutMotor(pServ->pSics, pCon, hfil, hdict, "cov", "cov");
}
/*--------------------------------------------------------------------*/
static void writeSample(NXhandle hfil, NXdict hdict, SConnection * pCon)
@ -298,6 +307,8 @@ static void PoldiStart(pPolterdi self, SConnection * pCon)
writeDiaphragm2(hfil, hdict, pCon);
writeCollimator(hfil, hdict, pCon);
writeSample(hfil, hdict, pCon);
/*
@ -426,6 +437,10 @@ static void PoldiStart(pPolterdi self, SConnection * pCon)
NXDputalias(hfil, hdict, "cntime", &fVal);
lVal = GetMonitor(pCount, 1, pCon);
NXDputalias(hfil, hdict, "cnmon1", &lVal);
lVal = GetMonitor(pCount, 2, pCon);
NXDputalias(hfil, hdict, "cnmon3", &lVal);
lVal = GetMonitor(pCount, 3, pCon);
NXDputalias(hfil, hdict, "cnmon4", &lVal);
eMode = GetCounterMode(pCount);
if (eMode == eTimer) {
strcpy(pBueffel, "timer");
@ -545,10 +560,12 @@ static void PoldiUpdate(pPolterdi self, SConnection * pCon)
NXDputalias(hfil, hdict, "cntime", &fVal);
lVal = GetMonitor(pCount, 1, pCon);
NXDputalias(hfil, hdict, "cnmon1", &lVal);
lVal = GetMonitor(pCount, 0, pCon);
lVal = GetMonitor(pCount, 4, pCon);
NXDputalias(hfil, hdict, "cnprot", &lVal);
lVal = GetMonitor(pCount, 2, pCon);
NXDputalias(hfil, hdict, "cnmon2", &lVal);
NXDputalias(hfil, hdict, "cnmon3", &lVal);
lVal = GetMonitor(pCount, 3, pCon);
NXDputalias(hfil, hdict, "cnmon4", &lVal);
eMode = GetCounterMode(pCount);
if (eMode == eTimer) {
strcpy(pBueffel, "timer");