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

- Removed slit 5 from amorset.c

Browse Source 
- poldizug now sends all codes all the time
- polterwrite writes the filename again
- sanswave has been modifed to support the new second generation velocity
  selector
- sinqhttprot has been mdified to copy data to nodes, this for the second
  generation HM object
- tasscan suppressed some output
This commit is contained in:
koennecke
2009-05-15 13:24:02 +00:00
parent 5d30c7b5b9
commit caf59ef8eb
12 changed files with 225 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
polterwrite.c
View File

@ -230,6 +230,7 @@ static void PoldiStart(pPolterdi self, SConnection * pCon)
pMotor sa;
HistInt *lData = NULL;
long lVal;
pCounter pCount;
/* create filename */
self->pFile = SNXMakeFileName(pServ->pSics, pCon);
@ -255,7 +256,7 @@ static void PoldiStart(pPolterdi self, SConnection * pCon)
}
if (scancheck == 0) {
sprintf(pBueffel, "Writing %s ......", self->pFile);
SCWrite(pCon, pBueffel, eWarning);
SCWrite(pCon, pBueffel, eLog);
}
@ -406,19 +407,24 @@ static void PoldiStart(pPolterdi self, SConnection * pCon)
/*
write counting data
*/
fVal = GetHistCountTime(self->pHist, pCon);
NXDputalias(hfil, hdict, "cntime", &fVal);
lVal = GetHistMonitor(self->pHist, 1, pCon);
NXDputalias(hfil, hdict, "cnmon1", &lVal);
eMode = GetHistCountMode(self->pHist);
if (eMode == eTimer) {
strcpy(pBueffel, "timer");
pCount = (pCounter)FindCommandData(pServ->pSics,"counter","SingleCounter");
if(pCount){
fVal = GetCountTime(pCount, pCon);
NXDputalias(hfil, hdict, "cntime", &fVal);
lVal = GetMonitor(pCount, 1, pCon);
NXDputalias(hfil, hdict, "cnmon1", &lVal);
eMode = GetCounterMode(pCount);
if (eMode == eTimer) {
strcpy(pBueffel, "timer");
} else {
strcpy(pBueffel, "monitor");
}
NXDputalias(hfil, hdict, "cnmode", pBueffel);
fVal = GetCounterPreset(pCount);
NXDputalias(hfil, hdict, "cnpreset", &fVal);
} else {
strcpy(pBueffel, "monitor");
SCWrite(pCon,"ERROR: counter not found writing data file", eLogError);
}
NXDputalias(hfil, hdict, "cnmode", pBueffel);
fVal = GetHistPreset(self->pHist);
NXDputalias(hfil, hdict, "cnpreset", &fVal);
/* close everything */
NXclose(&hfil);
@ -446,6 +452,7 @@ static void PoldiUpdate(pPolterdi self, SConnection * pCon)
HistInt *lData = NULL;
long lVal;
time_t zeit;
pCounter pCount = NULL;
/* open everything again */
status = NXopen(self->pFile, NXACC_RDWR, &hfil);
@ -513,21 +520,24 @@ static void PoldiUpdate(pPolterdi self, SConnection * pCon)
/*
write counting data
*/
fVal = GetHistCountTime(self->pHist, pCon);
NXDputalias(hfil, hdict, "cntime", &fVal);
lVal = GetHistMonitor(self->pHist, 1, pCon);
NXDputalias(hfil, hdict, "cnmon1", &lVal);
lVal = GetHistMonitor(self->pHist, 4, pCon);
NXDputalias(hfil, hdict, "cnprot", &lVal);
eMode = GetHistCountMode(self->pHist);
if (eMode == eTimer) {
strcpy(pBueffel, "timer");
pCount = (pCounter)FindCommandData(pServ->pSics,"counter","SingleCounter");
if(pCount){
fVal = GetCountTime(pCount, pCon);
NXDputalias(hfil, hdict, "cntime", &fVal);
lVal = GetMonitor(pCount, 1, pCon);
NXDputalias(hfil, hdict, "cnmon1", &lVal);
eMode = GetCounterMode(pCount);
if (eMode == eTimer) {
strcpy(pBueffel, "timer");
} else {
strcpy(pBueffel, "monitor");
}
NXDputalias(hfil, hdict, "cnmode", pBueffel);
fVal = GetCounterPreset(pCount);
NXDputalias(hfil, hdict, "cnpreset", &fVal);
} else {
strcpy(pBueffel, "monitor");
SCWrite(pCon,"ERROR: counter not found writing data file", eLogError);
}
NXDputalias(hfil, hdict, "cnmode", pBueffel);
fVal = GetHistPreset(self->pHist);
NXDputalias(hfil, hdict, "cnpreset", &fVal);
/* close everything */