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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
koennecke
2016-01-15 15:17:43 +01:00
parent a37aae2361 da542ad2ce
commit 4464373385
6 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
countersec.c
View File

@ -192,6 +192,9 @@ static int SecCtrCheckStatus(void *pData, SConnection *pCon)
The 1 below is only correct for PSI where only the first The 1 below is only correct for PSI where only the first
monitor can be the control monitor. Elsewhere this must be the monitor can be the control monitor. Elsewhere this must be the
control monitor channel control monitor channel
This may need to change with the second generation DAQ where the
count control channel can be changed.
*/ */
fControl = v.v.intArray[1]; fControl = v.v.intArray[1];
} }

2
fourmess.c
View File

@ -487,7 +487,7 @@ static int FourMessStoreIntern(pSICSOBJ self, SConnection * pCon,
} }
/* get mf */ /* get mf */
fMF = -777.77; fMF = -0.00;
pEva = (pEVControl) FindCommandData(pServ->pSics, "mf", pEva = (pEVControl) FindCommandData(pServ->pSics, "mf",
"Environment Controller"); "Environment Controller");
if (pEva == NULL) { if (pEva == NULL) {

2
interface.c
View File

@ -260,7 +260,7 @@ long StartDriveTask(void *obj, SConnection *pCon, char *name, float fTarget)
return -1; return -1;
} }
if(pDriv->CheckLimits(obj,fTarget,error,sizeof(error)) != OKOK){ if(pDriv->CheckLimits(obj,fTarget,error,sizeof(error)) != OKOK){
SCPrintf(pCon,eError,"ERROR: %s cannot reach %f, reason %s", name, SCPrintf(pCon,eLogError,"ERROR: %s cannot reach %f, reason %s", name,
fTarget, error); fTarget, error);
return -1; return -1;
} }

2
interface.h
View File

@ -64,7 +64,7 @@
int running; int running;
int (*Halt)(void *self); int (*Halt)(void *self);
void (*SetCountParameters)(void *self, float fPreset, void (*SetCountParameters)(void *self, float fPreset,
CounterMode eMode);\ CounterMode eMode);
int (*StartCount)(void *self, SConnection *pCon); int (*StartCount)(void *self, SConnection *pCon);
int (*CheckCountStatus)(void *self, SConnection *pCon); int (*CheckCountStatus)(void *self, SConnection *pCon);
int (*Pause)(void *self, SConnection *pCon); int (*Pause)(void *self, SConnection *pCon);

4
sicshipadaba.c
View File

@ -4238,7 +4238,9 @@ static hdbCallbackReturn SICSNotifyScriptCallback(pHdb node, void *userData,
return hdbContinue; return hdbContinue;
} }
copyHdbValue(mm->v, &node->value); if(mm->v != &node->value){
copyHdbValue(mm->v, &node->value);
}
status = Tcl_Eval(InterpGetTcl(pServ->pSics), script); status = Tcl_Eval(InterpGetTcl(pServ->pSics), script);
if (status != TCL_OK) { if (status != TCL_OK) {
tracePar(node->name,"ERROR: %s while evaluating updatescript %s", tracePar(node->name,"ERROR: %s while evaluating updatescript %s",

6
tasscanub.c
View File

@ -491,8 +491,8 @@ static int TASUBHeader(pScanData self)
start with the scan variables start with the scan variables
*/ */
if (pTAS->iPOL >= 0) { if (pTAS->iPOL >= 0) {
strcpy(pBueffel, "FORMT: (I4,I4,"); strcpy(pBueffel, "FORMT: (I3,1X,I3,1X,");
strcpy(pHeader, " PNT PAL"); strcpy(pHeader, " PNT PAL");
} else { } else {
strcpy(pBueffel, "FORMT: (I4,1X,"); strcpy(pBueffel, "FORMT: (I4,1X,");
strcpy(pHeader, " PNT "); strcpy(pHeader, " PNT ");
@ -587,7 +587,7 @@ static int TASUBScanPoint(pScanData self, int iPoint)
write point number write point number
*/ */
if (pTAS->iPOL >= 0) { if (pTAS->iPOL >= 0) {
snprintf(pBueffel,sizeof(pBueffel)-1, "%3d %3d", iPoint + 1, pTAS->iPOL); snprintf(pBueffel,sizeof(pBueffel)-1, "%3d %3d ", iPoint + 1, pTAS->iPOL);
} else { } else {
snprintf(pBueffel,sizeof(pBueffel)-1, "%4d ", iPoint + 1); snprintf(pBueffel,sizeof(pBueffel)-1, "%4d ", iPoint + 1);
} }