lin-epics-modules/sinqS7plcFW
0
0
Fork 0
Code Pull Requests Activity

Compare commits

base: lin-epics-modules:S7PLCFW_1_0_3
Branches Tags
lin-epics-modules:master
lin-epics-modules:2.0.8 lin-epics-modules:1.0.8 lin-epics-modules:1.0.7 lin-epics-modules:1.0.6 lin-epics-modules:S7PLCFW_1_0_5 lin-epics-modules:S7PLCFW_1_0_4 lin-epics-modules:S7PLCFW_1_0_3 lin-epics-modules:S7PLCFW_1_0_2 lin-epics-modules:S7PLCFW_1_0_1 lin-epics-modules:S7PLCFW_1_0_0
...
compare: lin-epics-modules:S7PLCFW_1_0_5
Branches Tags
lin-epics-modules:master
lin-epics-modules:2.0.8 lin-epics-modules:1.0.8 lin-epics-modules:1.0.7 lin-epics-modules:1.0.6 lin-epics-modules:S7PLCFW_1_0_5 lin-epics-modules:S7PLCFW_1_0_4 lin-epics-modules:S7PLCFW_1_0_3 lin-epics-modules:S7PLCFW_1_0_2 lin-epics-modules:S7PLCFW_1_0_1 lin-epics-modules:S7PLCFW_1_0_0

3 Commits
S7PLCFW_1_ ... S7PLCFW_1_

Author SHA1 Message Date
Dirk Zimoch
59511616ae fix 64bit warnings 2016-02-12 15:35:30 +01:00
anicic
46bf87c99c no exit in ConfigFunc 2013-07-11 12:43:21 +00:00
anicic
9ea778a101 no exit in ConfigFunc 2013-07-11 11:52:44 +00:00
2 changed files with 8 additions and 10 deletions
Expand all files Collapse all files

6
devS7plcFW.c
View File

@ -1761,7 +1761,7 @@ STATIC long s7plcFWReadAi(aiRecord *record)
case epicsFloat64T:
status = s7plcFWRead(priv->station, priv->offs,
8, &val64);
__extension__ s7plcFWDebugLog(3, "ai %s: read 64bit %08Lx = %g\n",
__extension__ s7plcFWDebugLog(3, "ai %s: read 64bit " CONV64 " = %g\n",
record->name, val64.i, val64.f);
floatval = TRUE;
break;
@ -2025,7 +2025,7 @@ STATIC long s7plcFWInitRecordStringin(stringinRecord *record)
{
errlogSevPrintf(errlogMinor,
"%s: string size reduced from %d to %d\n",
record->name, priv->dlen, sizeof(record->val));
record->name, priv->dlen, (int)sizeof(record->val));
priv->dlen = sizeof(record->val);
}
record->dpvt = priv;
@ -2105,7 +2105,7 @@ STATIC long s7plcFWInitRecordStringout(stringoutRecord *record)
{
errlogSevPrintf(errlogMinor,
"%s: string size reduced from %d to %d\n",
record->name, priv->dlen, sizeof(record->val));
record->name, priv->dlen, (int)sizeof(record->val));
priv->dlen = sizeof(record->val);
}
record->dpvt = priv;

12
drvS7plcFW.c
View File

@ -1,7 +1,7 @@
/* $Date: 2012/12/05 08:49:08 $ */
/* $Id: drvS7plcFW.c,v 1.4 2012/12/05 08:49:08 anicic Exp $ */
/* $Date: 2013/07/11 12:43:21 $ */
/* $Id: drvS7plcFW.c,v 1.6 2013/07/11 12:43:21 anicic Exp $ */
/* $Name: $ */
/* $Revision: 1.4 $ */
/* $Revision: 1.6 $ */
/*
* NOTE: s7plcFWwriteThread -is not used for writting (we write direct),
@ -69,7 +69,7 @@
#define RECONNECT_DELAY 10.0 /* delay before reconnect [s] */
static char cvsid[] __attribute__((unused)) =
"$Id: drvS7plcFW.c,v 1.4 2012/12/05 08:49:08 anicic Exp $";
"$Id: drvS7plcFW.c,v 1.6 2013/07/11 12:43:21 anicic Exp $";
STATIC long s7plcFWIoReport(int level);
STATIC long s7plcFWInit();
@ -389,11 +389,9 @@ static const iocshArg * const s7plcFWConfigureArgs[] = {
static const iocshFuncDef s7plcFWConfigureDef = { "s7plcFWConfigure", 8, s7plcFWConfigureArgs };
static void s7plcFWConfigureFunc (const iocshArgBuf *args)
{
int status = s7plcFWConfigure(
(void) s7plcFWConfigure(
args[0].sval, args[1].sval, args[2].sval, args[3].sval,
args[4].ival, args[5].ival, args[6].ival, args[7].ival);
if (status) exit(1);
}
static void s7plcFWRegister ()