Commit 3abcb4fb authored by koennecke's avatar koennecke
Browse files

Merge branch 'master' into rhel7

parents d53b2c10 ec94ba7e
......@@ -124,7 +124,11 @@ static void epicsDataCallback(struct event_handler_args args)
switch(priv->node->value.dataType){
case HIPTEXT:
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;
case HIPINT:
priv->node->value.v.intValue = *(int *)args.dbr;
......@@ -163,7 +167,11 @@ static int epicsSubscribePV(void *message, void *userData)
priv = (pEpicsPriv)message;
switch(priv->node->value.dataType){
case HIPTEXT:
subType = DBR_STRING;
if(ca_field_type(priv->pvchid) == DBR_CHAR){
subType = DBR_CHAR;
} else {
subType = DBR_STRING;
}
break;
case HIPINT:
case HIPINTAR:
......
......@@ -272,6 +272,11 @@ static int TASHeader(pScanData self)
pTAS->tasPar[BX]->fVal, pTAS->tasPar[BY]->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
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment