5 Commits

Author SHA1 Message Date
59511616ae fix 64bit warnings 2016-02-12 15:35:30 +01:00
46bf87c99c no exit in ConfigFunc 2013-07-11 12:43:21 +00:00
9ea778a101 no exit in ConfigFunc 2013-07-11 11:52:44 +00:00
a5ed2fd234 stack size macro 2012-12-05 08:49:08 +00:00
f9b9b5192f corrected typo 2012-09-03 13:20:53 +00:00
3 changed files with 11 additions and 11 deletions

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;

View File

@ -1,7 +1,7 @@
/* $Date: 2012/06/18 12:25:19 $ */
/* $Id: drvS7plcFW.c,v 1.3 2012/06/18 12:25:19 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.3 $ */
/* $Revision: 1.6 $ */
/*
* NOTE: s7plcFWwriteThread -is not used for writting (we write direct),
@ -63,12 +63,13 @@
#include <endian.h>
#endif
#define STACK_SIZE 20000 /* io thread stack size */
/* #define STACK_SIZE 20000 */ /* io thread stack size */
#define STACK_SIZE epicsThreadGetStackSize(epicsThreadStackBig)
#define CONNECT_TIMEOUT 5.0 /* connect timeout [s] */
#define RECONNECT_DELAY 10.0 /* delay before reconnect [s] */
static char cvsid[] __attribute__((unused)) =
"$Id: drvS7plcFW.c,v 1.3 2012/06/18 12:25:19 anicic Exp $";
"$Id: drvS7plcFW.c,v 1.6 2013/07/11 12:43:21 anicic Exp $";
STATIC long s7plcFWIoReport(int level);
STATIC long s7plcFWInit();
@ -388,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 ()

View File

@ -54,6 +54,7 @@ Besides the
<li>new communication protocol (FETCH/WRITE)</li>
<li>the modified <code>s7plcFWConfigure</code> function</li>
<li>additional support for write-connection-status (see <a href="#stat"> <code>"s7plcFW&nbsp;stat2"</code> </a>)</li>
<li>when using bi and bo bits 0-7 and 8-15 are swapped (i.e. for bit 3 use 3+8=11, or for bit 13 use 13-8=5)</li>
</ol>
there should be no other differences.
<br><br>