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

Merge branch 'master' into rhel7

Browse Source
This commit is contained in:
koennecke
2017-04-03 11:40:34 +02:00
parent d53b2c108a ec94ba7e43
commit 3abcb4fb1c
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
epicsadapter.c
View File

@ -124,7 +124,11 @@ static void epicsDataCallback(struct event_handler_args args)
switch(priv->node->value.dataType){ switch(priv->node->value.dataType){
case HIPTEXT: case HIPTEXT:
free(priv->node->value.v.text); free(priv->node->value.v.text);
priv->node->value.v.text = strdup((char *)args.dbr); if(args.type == DBR_STRING){
priv->node->value.v.text = strdup((char *)args.dbr);
} else if(args.type == DBR_CHAR) {
priv->node->value.v.text = strndup((char *)args.dbr,args.count);
}
break; break;
case HIPINT: case HIPINT:
priv->node->value.v.intValue = *(int *)args.dbr; priv->node->value.v.intValue = *(int *)args.dbr;
@ -163,7 +167,11 @@ static int epicsSubscribePV(void *message, void *userData)
priv = (pEpicsPriv)message; priv = (pEpicsPriv)message;
switch(priv->node->value.dataType){ switch(priv->node->value.dataType){
case HIPTEXT: case HIPTEXT:
subType = DBR_STRING; if(ca_field_type(priv->pvchid) == DBR_CHAR){
subType = DBR_CHAR;
} else {
subType = DBR_STRING;
}
break; break;
case HIPINT: case HIPINT:
case HIPINTAR: case HIPINTAR:

5
tasscan.c
View File

@ -272,6 +272,11 @@ static int TASHeader(pScanData self)
pTAS->tasPar[BX]->fVal, pTAS->tasPar[BY]->fVal, pTAS->tasPar[BX]->fVal, pTAS->tasPar[BY]->fVal,
pTAS->tasPar[BZ]->fVal); pTAS->tasPar[BZ]->fVal);
sVar = FindCommandData(pServ->pSics, "ProposalID", "SicsVariable");
if (sVar != NULL) {
fprintf(self->fd,"PARAM: ProposalID=%s\n",sVar->text);
}
/* /*
* write mupad stuff if available * write mupad stuff if available
*/ */