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

Compare commits

base: lin-epics-modules:S7PLCFW_1_0_0
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:1.0.6
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

9 Commits
S7PLCFW_1_ ... 1.0.6

Author SHA1 Message Date
Dirk Zimoch
644c824604 fix version tests for EPICS 7 2019-08-12 09:52:52 +02:00
Dirk Zimoch
a470205454 build for all EPICS version 2019-08-12 09:45:22 +02:00
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
anicic
a5ed2fd234 stack size macro 2012-12-05 08:49:08 +00:00
anicic
f9b9b5192f corrected typo 2012-09-03 13:20:53 +00:00
anicic
4f4d43032d linux + va_args + float/double problem - using int now as workaround 2012-06-18 12:25:19 +00:00
anicic
382c7d4184 1. New EPICS version 3.14.12 
2. Get rid of warnings because new EPICS version and new targets
 2012-03-06 10:53:08 +00:00
4 changed files with 101 additions and 90 deletions
Expand all files Collapse all files

4
Makefile
View File

@ -5,7 +5,3 @@ BUILDCLASSES+=Linux
DBDS += s7plcFWBase.dbd DBDS += s7plcFWBase.dbd
DBDS_3.14 += s7plcFWCalcout.dbd DBDS_3.14 += s7plcFWCalcout.dbd
DBDS_3.14 += s7plcFWReg.dbd DBDS_3.14 += s7plcFWReg.dbd
EPICS_VERSIONS =
EPICS_VERSIONS += 3.14.8
EPICS_VERSIONS += 3.14.12

129
devS7plcFW.c
View File

@ -1,8 +1,8 @@
/* $Author: anicic $ */ /* $Author: anicic $ */
/* $Date: 2010/09/22 13:44:37 $ */ /* $Date: 2012/03/06 10:53:08 $ */
/* $Id: devS7plcFW.c,v 1.1 2010/09/22 13:44:37 anicic Exp $ */ /* $Id: devS7plcFW.c,v 1.2 2012/03/06 10:53:08 anicic Exp $ */
/* $Name: $ */ /* $Name: $ */
/* $Revision: 1.1 $ */ /* $Revision: 1.2 $ */
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
@ -34,22 +34,31 @@
#include <stringoutRecord.h> #include <stringoutRecord.h>
#include <waveformRecord.h> #include <waveformRecord.h>
#if ((EPICS_VERSION==3 && EPICS_REVISION>=14) || EPICS_VERSION>3) #ifdef BASE_VERSION
/* R3.14 */ #define EPICS_3_13
#include "compat3_13.h"
#else
#include <postfix.h> #include <postfix.h>
#include <calcoutRecord.h> #include <calcoutRecord.h>
#include <cantProceed.h> #include <cantProceed.h>
#include <epicsExport.h> #include <epicsExport.h>
#else
/* R3.13 */
#include "compat3_13.h"
#endif #endif
/* suppress compiler warning concerning long long with __extension__ */ /* suppress compiler warning concerning long long with __extension__ */
#ifndef __GNUC__ #if (!defined __GNUC__) || (__GNUC__ < 2) || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
#define __extension__ #define __extension__
#endif #endif
#ifndef epicsUInt64
#if (LONG_MAX > 2147483647L)
#define epicsUInt64 unsigned long
#define CONV64 "%016lx"
#else
#define epicsUInt64 unsigned long long
#define CONV64 "%016llx"
#endif
#endif
#define S7MEM_TIME 100 #define S7MEM_TIME 100
typedef struct { /* Private structure to save IO arguments */ typedef struct { /* Private structure to save IO arguments */
@ -63,7 +72,7 @@ typedef struct { /* Private structure to save IO arguments */
} S7memPrivate_t; } S7memPrivate_t;
static char cvsid_devS7plcFW[] = static char cvsid_devS7plcFW[] =
"$Id: devS7plcFW.c,v 1.1 2010/09/22 13:44:37 anicic Exp $"; "$Id: devS7plcFW.c,v 1.2 2012/03/06 10:53:08 anicic Exp $";
STATIC long s7plcFWReport(); STATIC long s7plcFWReport();
@ -351,7 +360,7 @@ struct devsup s7plcFWWaveform =
epicsExportAddress(dset, s7plcFWWaveform); epicsExportAddress(dset, s7plcFWWaveform);
/* calcout **********************************************************/ /* calcout **********************************************************/
#if ((EPICS_VERSION==3 && EPICS_REVISION>=14) || EPICS_VERSION>3) #ifndef EPICS_3_13
STATIC long s7plcFWInitRecordCalcout(calcoutRecord *); STATIC long s7plcFWInitRecordCalcout(calcoutRecord *);
STATIC long s7plcFWWriteCalcout(calcoutRecord *); STATIC long s7plcFWWriteCalcout(calcoutRecord *);
@ -1686,8 +1695,8 @@ STATIC long s7plcFWReadAi(aiRecord *record)
epicsUInt16 uval16; epicsUInt16 uval16;
epicsInt32 sval32; epicsInt32 sval32;
epicsUInt32 uval32; epicsUInt32 uval32;
epicsFloat32 val32; union {epicsFloat32 f; epicsUInt32 i; } val32;
epicsFloat64 val64; __extension__ union {epicsFloat64 f; epicsUInt64 i; } val64;
if (!priv) if (!priv)
{ {
@ -1744,15 +1753,15 @@ STATIC long s7plcFWReadAi(aiRecord *record)
status = s7plcFWRead(priv->station, priv->offs, status = s7plcFWRead(priv->station, priv->offs,
4, &val32); 4, &val32);
s7plcFWDebugLog(3, "ai %s: read 32bit %04x = %g\n", s7plcFWDebugLog(3, "ai %s: read 32bit %04x = %g\n",
record->name, *(unsigned int*) &val32, val32); record->name, val32.i, val32.f);
val64 = val32; val64.f = val32.f;
floatval = TRUE; floatval = TRUE;
break; break;
case epicsFloat64T: case epicsFloat64T:
status = s7plcFWRead(priv->station, priv->offs, status = s7plcFWRead(priv->station, priv->offs,
8, &val64); 8, &val64);
__extension__ s7plcFWDebugLog(3, "ai %s: read 64bit %08Lx = %g\n", __extension__ s7plcFWDebugLog(3, "ai %s: read 64bit " CONV64 " = %g\n",
record->name, *(long long*) &val64, val64); record->name, val64.i, val64.f);
floatval = TRUE; floatval = TRUE;
break; break;
default: default:
@ -1777,14 +1786,14 @@ STATIC long s7plcFWReadAi(aiRecord *record)
if (floatval) if (floatval)
{ {
/* emulate scaling */ /* emulate scaling */
if (record->aslo != 0.0) val64 *= record->aslo; if (record->aslo != 0.0) val64.f *= record->aslo;
val64 += record->aoff; val64.f += record->aoff;
if (record->udf) if (record->udf)
record->val = val64; record->val = val64.f;
else else
/* emulate smoothing */ /* emulate smoothing */
record->val = record->val * record->smoo + record->val = record->val * record->smoo +
val64 * (1.0 - record->smoo); val64.f * (1.0 - record->smoo);
record->udf = FALSE; record->udf = FALSE;
return 2; return 2;
} }
@ -1858,8 +1867,8 @@ STATIC long s7plcFWWriteAo(aoRecord *record)
epicsUInt8 rval8; epicsUInt8 rval8;
epicsUInt16 rval16; epicsUInt16 rval16;
epicsUInt32 rval32; epicsUInt32 rval32;
epicsFloat32 val32; union {epicsFloat32 f; epicsUInt32 i; } val32;
epicsFloat64 val64; __extension__ union {epicsFloat64 f; epicsUInt64 i; } val64;
if (!priv) if (!priv)
{ {
@ -1926,21 +1935,21 @@ STATIC long s7plcFWWriteAo(aoRecord *record)
break; break;
case epicsFloat32T: case epicsFloat32T:
/* emulate scaling */ /* emulate scaling */
val32 = record->oval - record->aoff; val32.f = record->oval - record->aoff;
if (record->aslo != 0) val32 /= record->aslo; if (record->aslo != 0) val32.f /= record->aslo;
s7plcFWDebugLog(2, "ao %s: write 32bit %08x\n", s7plcFWDebugLog(2, "ao %s: write 32bit %08x = %g\n",
record->name, *(epicsInt32*)&val32); record->name, val32.i, val32.f);
status = s7plcFWWrite(priv->station, priv->offs, status = s7plcFWWrite(priv->station, priv->offs,
4, &val32); 4, &val32);
break; break;
case epicsFloat64T: case epicsFloat64T:
/* emulate scaling */ /* emulate scaling */
val64 = record->oval - record->aoff; val64.f = record->oval - record->aoff;
if (record->aslo != 0) val64 /= record->aslo; if (record->aslo != 0) val64.f /= record->aslo;
__extension__ s7plcFWDebugLog(2, "ao %s: write 64bit %016Lx\n", __extension__ s7plcFWDebugLog(2, "ao %s: write 64bit " CONV64 " = %g\n",
record->name, *(long long*)&val64); record->name, val64.i, val64.f);
status = s7plcFWWrite(priv->station, priv->offs, status = s7plcFWWrite(priv->station, priv->offs,
8, &val64); 8, &val64);
break; break;
@ -2015,7 +2024,7 @@ STATIC long s7plcFWInitRecordStringin(stringinRecord *record)
{ {
errlogSevPrintf(errlogMinor, errlogSevPrintf(errlogMinor,
"%s: string size reduced from %d to %d\n", "%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); priv->dlen = sizeof(record->val);
} }
record->dpvt = priv; record->dpvt = priv;
@ -2095,7 +2104,7 @@ STATIC long s7plcFWInitRecordStringout(stringoutRecord *record)
{ {
errlogSevPrintf(errlogMinor, errlogSevPrintf(errlogMinor,
"%s: string size reduced from %d to %d\n", "%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); priv->dlen = sizeof(record->val);
} }
record->dpvt = priv; record->dpvt = priv;
@ -2358,8 +2367,8 @@ STATIC long s7plcFWReadWaveform(waveformRecord *record)
return status; return status;
} }
#if (EPICS_REVISION>=14)
/* calcout **********************************************************/ /* calcout **********************************************************/
#ifndef EPICS_3_13
STATIC long s7plcFWInitRecordCalcout(calcoutRecord *record) STATIC long s7plcFWInitRecordCalcout(calcoutRecord *record)
{ {
@ -2413,8 +2422,8 @@ STATIC long s7plcFWWriteCalcout(calcoutRecord *record)
epicsInt8 sval8; epicsInt8 sval8;
epicsInt16 sval16; epicsInt16 sval16;
epicsInt32 sval32; epicsInt32 sval32;
epicsFloat32 val32; union {epicsFloat32 f; epicsUInt32 i; } val32;
epicsFloat64 val64; __extension__ union {epicsFloat64 f; epicsUInt64 i; } val64;
if (!priv) if (!priv)
{ {
@ -2424,73 +2433,73 @@ STATIC long s7plcFWWriteCalcout(calcoutRecord *record)
return -1; return -1;
} }
assert(priv->station); assert(priv->station);
val64 = record->oval; val64.f = record->oval;
switch (priv->dtype) switch (priv->dtype)
{ {
case epicsInt8T: case epicsInt8T:
sval8 = val64; sval8 = val64.f;
if (val64 > priv->hwHigh) sval8 = priv->hwHigh; if (val64.f > priv->hwHigh) sval8 = priv->hwHigh;
if (val64 < priv->hwLow) sval8 = priv->hwLow; if (val64.f < priv->hwLow) sval8 = priv->hwLow;
s7plcFWDebugLog(2, "calcout %s: write 8bit %02x\n", s7plcFWDebugLog(2, "calcout %s: write 8bit %02x\n",
record->name, sval8 & 0xff); record->name, sval8 & 0xff);
status = s7plcFWWrite(priv->station, priv->offs, status = s7plcFWWrite(priv->station, priv->offs,
1, &sval8); 1, &sval8);
break; break;
case epicsUInt8T: case epicsUInt8T:
uval8 = val64; uval8 = val64.f;
if (val64 > priv->hwHigh) uval8 = priv->hwHigh; if (val64.f > priv->hwHigh) uval8 = priv->hwHigh;
if (val64 < priv->hwLow) uval8 = priv->hwLow; if (val64.f < priv->hwLow) uval8 = priv->hwLow;
s7plcFWDebugLog(2, "calcout %s: write 8bit %02x\n", s7plcFWDebugLog(2, "calcout %s: write 8bit %02x\n",
record->name, uval8 & 0xff); record->name, uval8 & 0xff);
status = s7plcFWWrite(priv->station, priv->offs, status = s7plcFWWrite(priv->station, priv->offs,
1, &uval8); 1, &uval8);
break; break;
case epicsInt16T: case epicsInt16T:
sval16 = val64; sval16 = val64.f;
if (val64 > priv->hwHigh) sval16 = priv->hwHigh; if (val64.f > priv->hwHigh) sval16 = priv->hwHigh;
if (val64 < priv->hwLow) sval16 = priv->hwLow; if (val64.f < priv->hwLow) sval16 = priv->hwLow;
s7plcFWDebugLog(2, "calcout %s: write 16bit %04x\n", s7plcFWDebugLog(2, "calcout %s: write 16bit %04x\n",
record->name, sval16 & 0xffff); record->name, sval16 & 0xffff);
status = s7plcFWWrite(priv->station, priv->offs, status = s7plcFWWrite(priv->station, priv->offs,
2, &sval16); 2, &sval16);
break; break;
case epicsUInt16T: case epicsUInt16T:
uval16 = val64; uval16 = val64.f;
if (val64 > priv->hwHigh) uval16 = priv->hwHigh; if (val64.f > priv->hwHigh) uval16 = priv->hwHigh;
if (val64 < priv->hwLow) uval16 = priv->hwLow; if (val64.f < priv->hwLow) uval16 = priv->hwLow;
s7plcFWDebugLog(2, "calcout %s: write 16bit %04x\n", s7plcFWDebugLog(2, "calcout %s: write 16bit %04x\n",
record->name, uval16 & 0xffff); record->name, uval16 & 0xffff);
status = s7plcFWWrite(priv->station, priv->offs, status = s7plcFWWrite(priv->station, priv->offs,
2, &uval16); 2, &uval16);
break; break;
case epicsInt32T: case epicsInt32T:
sval32 = val64; sval32 = val64.f;
if (val64 > priv->hwHigh) sval32 = priv->hwHigh; if (val64.f > priv->hwHigh) sval32 = priv->hwHigh;
if (val64 < priv->hwLow) sval32 = priv->hwLow; if (val64.f < priv->hwLow) sval32 = priv->hwLow;
s7plcFWDebugLog(2, "calcout %s: write 32bit %08x\n", s7plcFWDebugLog(2, "calcout %s: write 32bit %08x\n",
record->name, sval32); record->name, sval32);
status = s7plcFWWrite(priv->station, priv->offs, status = s7plcFWWrite(priv->station, priv->offs,
4, &sval32); 4, &sval32);
break; break;
case epicsUInt32T: case epicsUInt32T:
uval32 = val64; uval32 = val64.f;
if (val64 > priv->hwHigh) uval32 = priv->hwHigh; if (val64.f > priv->hwHigh) uval32 = priv->hwHigh;
if (val64 < priv->hwLow) uval32 = priv->hwLow; if (val64.f < priv->hwLow) uval32 = priv->hwLow;
s7plcFWDebugLog(2, "calcout %s: write 32bit %08x\n", s7plcFWDebugLog(2, "calcout %s: write 32bit %08x\n",
record->name, uval32); record->name, uval32);
status = s7plcFWWrite(priv->station, priv->offs, status = s7plcFWWrite(priv->station, priv->offs,
4, &uval32); 4, &uval32);
break; break;
case epicsFloat32T: case epicsFloat32T:
val32 = val64; val32.f = val64.f;
s7plcFWDebugLog(2, "calcout %s: write 32bit %08x\n", s7plcFWDebugLog(2, "calcout %s: write 32bit %08x = %g\n",
record->name, *(epicsInt32*)&val32); record->name, val32.i, val32.f);
status = s7plcFWWrite(priv->station, priv->offs, status = s7plcFWWrite(priv->station, priv->offs,
4, &val32); 4, &val32);
break; break;
case epicsFloat64T: case epicsFloat64T:
__extension__ s7plcFWDebugLog(2, "calcout %s: write 64bit %016Lx\n", __extension__ s7plcFWDebugLog(2, "calcout %s: write 64bit " CONV64 " = %g\n",
record->name, *(long long*)&val64); record->name, val64.i, val64.f);
status = s7plcFWWrite(priv->station, priv->offs, status = s7plcFWWrite(priv->station, priv->offs,
8, &val64); 8, &val64);
break; break;

57
drvS7plcFW.c
View File

@ -1,7 +1,7 @@
/* $Date: 2010/09/22 13:44:37 $ */ /* $Date: 2013/07/11 12:43:21 $ */
/* $Id: drvS7plcFW.c,v 1.1 2010/09/22 13:44:37 anicic Exp $ */ /* $Id: drvS7plcFW.c,v 1.6 2013/07/11 12:43:21 anicic Exp $ */
/* $Name: $ */ /* $Name: $ */
/* $Revision: 1.1 $ */ /* $Revision: 1.6 $ */
/* /*
* NOTE: s7plcFWwriteThread -is not used for writting (we write direct), * NOTE: s7plcFWwriteThread -is not used for writting (we write direct),
@ -19,14 +19,20 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#ifdef __vxworks #if defined(vxWorks) || defined(__vxworks)
#include <sockLib.h> #include <sockLib.h>
#include <taskLib.h> #include <taskLib.h>
#include <selectLib.h>
#include <taskHookLib.h> #include <taskHookLib.h>
#define in_addr_t unsigned long
#else #else
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#ifdef __rtems__
#include <sys/select.h>
#endif
#include <drvSup.h> #include <drvSup.h>
#include <devLib.h> #include <devLib.h>
#include <epicsVersion.h> #include <epicsVersion.h>
@ -57,12 +63,13 @@
#include <endian.h> #include <endian.h>
#endif #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 CONNECT_TIMEOUT 5.0 /* connect timeout [s] */
#define RECONNECT_DELAY 10.0 /* delay before reconnect [s] */ #define RECONNECT_DELAY 10.0 /* delay before reconnect [s] */
static char cvsid[] __attribute__((unused)) = static char cvsid[] __attribute__((unused)) =
"$Id: drvS7plcFW.c,v 1.1 2010/09/22 13:44:37 anicic Exp $"; "$Id: drvS7plcFW.c,v 1.6 2013/07/11 12:43:21 anicic Exp $";
STATIC long s7plcFWIoReport(int level); STATIC long s7plcFWIoReport(int level);
STATIC long s7plcFWInit(); STATIC long s7plcFWInit();
@ -180,9 +187,9 @@ STATIC long s7plcFWIoReport(int level)
"ioc:motorola <-> plc:intel" : "no (both motorola)" "ioc:motorola <-> plc:intel" : "no (both motorola)"
#endif #endif
); );
printf(" receive timeout %g sec\n", station->recvTimeout); printf(" receive timeout %d ms\n", (int)(station->recvTimeout * 1000.0));
printf(" receive delay %g sec\n", station->recvDelay); printf(" receive delay %d ms\n", (int)(station->recvDelay * 1000.0));
printf(" outIOint delay %g sec\n", station->outIOintDelay); printf(" outIOint delay %d ms\n", (int)(station->outIOintDelay * 1000.0));
} }
} }
return 0; return 0;
@ -382,11 +389,9 @@ static const iocshArg * const s7plcFWConfigureArgs[] = {
static const iocshFuncDef s7plcFWConfigureDef = { "s7plcFWConfigure", 8, s7plcFWConfigureArgs }; static const iocshFuncDef s7plcFWConfigureDef = { "s7plcFWConfigure", 8, s7plcFWConfigureArgs };
static void s7plcFWConfigureFunc (const iocshArgBuf *args) static void s7plcFWConfigureFunc (const iocshArgBuf *args)
{ {
int status = s7plcFWConfigure( (void) s7plcFWConfigure(
args[0].sval, args[1].sval, args[2].sval, args[3].sval, args[0].sval, args[1].sval, args[2].sval, args[3].sval,
args[4].ival, args[5].ival, args[6].ival, args[7].ival); args[4].ival, args[5].ival, args[6].ival, args[7].ival);
if (status) exit(1);
} }
static void s7plcFWRegister () static void s7plcFWRegister ()
@ -446,8 +451,8 @@ STATIC void s7plcFWMain ()
} }
s7plcFWDebugLog(1, "s7plcFWMain %s: Connect to %s:%d on fetch socket %d\n", station->name, station->serverIP, station->fetchPort, station->fetchSocket); s7plcFWDebugLog(1, "s7plcFWMain %s: Connect to %s:%d on fetch socket %d\n", station->name, station->serverIP, station->fetchPort, station->fetchSocket);
if (s7plcFWEstablishConnection(station, FOR_FETCH) < 0) { if (s7plcFWEstablishConnection(station, FOR_FETCH) < 0) {
s7plcFWDebugLog(1, "s7plcFWMain %s: connect(%d, %s:%d) failed for fetch: %s. Retry in %g seconds\n", s7plcFWDebugLog(1, "s7plcFWMain %s: connect(%d, %s:%d) failed for fetch: %s. Retry in %d ms\n",
station->name, station->fetchSocket, station->serverIP, station->fetchPort, strerror(errno), (double)RECONNECT_DELAY); station->name, station->fetchSocket, station->serverIP, station->fetchPort, strerror(errno), (int)(RECONNECT_DELAY * 1000.0));
if (close(station->fetchSocket) && errno != ENOTCONN) { if (close(station->fetchSocket) && errno != ENOTCONN) {
s7plcFWDebugLog(1, "s7plcFWMain %s: close(%d) failed for fetch (ignored): %s\n", station->name, station->fetchSocket, strerror(errno)); s7plcFWDebugLog(1, "s7plcFWMain %s: close(%d) failed for fetch (ignored): %s\n", station->name, station->fetchSocket, strerror(errno));
} }
@ -470,8 +475,8 @@ STATIC void s7plcFWMain ()
} }
s7plcFWDebugLog(1, "s7plcFWMain %s: Connect to %s:%d on write socket %d\n", station->name, station->serverIP, station->writePort, station->writeSocket); s7plcFWDebugLog(1, "s7plcFWMain %s: Connect to %s:%d on write socket %d\n", station->name, station->serverIP, station->writePort, station->writeSocket);
if (s7plcFWEstablishConnection(station, FOR_WRITE) < 0) { if (s7plcFWEstablishConnection(station, FOR_WRITE) < 0) {
s7plcFWDebugLog(1, "s7plcFWMain %s: connect(%d, %s:%d) failed for write: %s. Retry in %g seconds\n", s7plcFWDebugLog(1, "s7plcFWMain %s: connect(%d, %s:%d) failed for write: %s. Retry in %d ms\n",
station->name, station->writeSocket, station->serverIP, station->writePort, strerror(errno), (double)RECONNECT_DELAY); station->name, station->writeSocket, station->serverIP, station->writePort, strerror(errno), (int)(RECONNECT_DELAY * 1000.0));
if (close(station->writeSocket) && errno != ENOTCONN) { if (close(station->writeSocket) && errno != ENOTCONN) {
s7plcFWDebugLog(1, "s7plcFWMain %s: close(%d) failed for write (ignored): %s\n", station->name, station->writeSocket, strerror(errno)); s7plcFWDebugLog(1, "s7plcFWMain %s: close(%d) failed for write (ignored): %s\n", station->name, station->writeSocket, strerror(errno));
} }
@ -623,7 +628,7 @@ STATIC int s7plcFWdoFetch(s7plcFWStation *station, int org, int db, int offs, in
req[0xd] = s7len % 0x100; req[0xd] = s7len % 0x100;
epicsMutexMustLock(station->fetchIo); epicsMutexMustLock(station->fetchIo);
status = write(station->fetchSocket, req, 16); status = write(station->fetchSocket, (void *) req, 16);
epicsMutexUnlock(station->fetchIo); epicsMutexUnlock(station->fetchIo);
if (status != 16) { if (status != 16) {
s7plcFWDebugLog(3, "s7plcFWdoFetch: write 16 byte header failed, returned status = %d, errno = %d\n", status, errno); s7plcFWDebugLog(3, "s7plcFWdoFetch: write 16 byte header failed, returned status = %d, errno = %d\n", status, errno);
@ -637,7 +642,7 @@ STATIC int s7plcFWdoFetch(s7plcFWStation *station, int org, int db, int offs, in
} }
epicsMutexMustLock(station->fetchIo); epicsMutexMustLock(station->fetchIo);
status = read(station->fetchSocket, ack, 16); status = read(station->fetchSocket, (void *) ack, 16);
epicsMutexUnlock(station->fetchIo); epicsMutexUnlock(station->fetchIo);
if(status < 16) { if(status < 16) {
s7plcFWDebugLog(3, "s7plcFWdoFetch: Got too few bytes (%d) ACK from PLC!\n", status); s7plcFWDebugLog(3, "s7plcFWdoFetch: Got too few bytes (%d) ACK from PLC!\n", status);
@ -653,7 +658,7 @@ STATIC int s7plcFWdoFetch(s7plcFWStation *station, int org, int db, int offs, in
input = 0; input = 0;
while (input < size) { while (input < size) {
s7plcFWDebugLog(3, "s7plcFWdoFetch: %s: waiting for input for %g seconds\n", station->name, station->recvTimeout); s7plcFWDebugLog(3, "s7plcFWdoFetch: %s: waiting for input for %d ms\n", station->name, (int)(station->recvTimeout * 1000.0));
status = s7plcFWWaitForInput(station, FOR_FETCH, station->recvTimeout); status = s7plcFWWaitForInput(station, FOR_FETCH, station->recvTimeout);
if (status <= 0) { if (status <= 0) {
s7plcFWDebugLog(0, "s7plcFWdoFetch: %s: s7plcFWWaitForInput(%d, ..., %d, 0) failed\n", station->name, station->fetchSocket, size - input); s7plcFWDebugLog(0, "s7plcFWdoFetch: %s: s7plcFWWaitForInput(%d, ..., %d, 0) failed\n", station->name, station->fetchSocket, size - input);
@ -701,7 +706,7 @@ STATIC int s7plcFWdoWrite(s7plcFWStation *station, char *data, int offs, int len
req[0xd] = s7len % 0x100; req[0xd] = s7len % 0x100;
epicsMutexMustLock(station->writeIo); epicsMutexMustLock(station->writeIo);
status = write(station->writeSocket, req, 16); status = write(station->writeSocket, (void *) req, 16);
dstatus = write(station->writeSocket, data, len); dstatus = write(station->writeSocket, data, len);
epicsMutexUnlock(station->writeIo); epicsMutexUnlock(station->writeIo);
@ -724,7 +729,7 @@ STATIC int s7plcFWdoWrite(s7plcFWStation *station, char *data, int offs, int len
} }
epicsMutexMustLock(station->writeIo); epicsMutexMustLock(station->writeIo);
if((status = read(station->writeSocket, ack, 16)) < 16) { if((status = read(station->writeSocket, (void *) ack, 16)) < 16) {
s7plcFWDebugLog(3, "Got too few bytes (%d) ACK from PLC!\n", status); s7plcFWDebugLog(3, "Got too few bytes (%d) ACK from PLC!\n", status);
/* printf("AD84: s7plcFWdoWrite: read too few bytes (%d) ACK from PLC!\n", status); */ /* printf("AD84: s7plcFWdoWrite: read too few bytes (%d) ACK from PLC!\n", status); */
epicsMutexUnlock(station->writeIo); epicsMutexUnlock(station->writeIo);
@ -905,12 +910,12 @@ STATIC int s7plcFWWaitForInput(s7plcFWStation* station, int which, double timeou
errno = 0; errno = 0;
while ((iSelect=select(socket+1, &socklist, 0, 0, &to)) < 0) { while ((iSelect=select(socket+1, &socklist, 0, 0, &to)) < 0) {
if (errno != EINTR) { if (errno != EINTR) {
s7plcFWDebugLog(0, "s7plcFWWaitForInput %s: select(%d, %f sec) failed: %s\n", station->name, socket, timeout, strerror(errno)); s7plcFWDebugLog(0, "s7plcFWWaitForInput %s: select(%d, %d ms) failed: %s\n", station->name, socket, (int)(timeout * 1000.0), strerror(errno));
return -1; return -1;
} }
} }
if (iSelect==0 && timeout > 0) { /* timed out */ if (iSelect==0 && timeout > 0) { /* timed out */
s7plcFWDebugLog(0, "s7plcFWWaitForInput %s: select(%d, %f sec) timed out\n", station->name, socket, timeout); s7plcFWDebugLog(0, "s7plcFWWaitForInput %s: select(%d, %d ms) timed out\n", station->name, socket, (int)(timeout * 1000.0));
errno = ETIMEDOUT; errno = ETIMEDOUT;
} }
return iSelect; return iSelect;
@ -949,7 +954,7 @@ STATIC int s7plcFWEstablishConnection(s7plcFWStation* station, int which)
to.tv_usec=(int)(CONNECT_TIMEOUT-to.tv_sec)*1000000; to.tv_usec=(int)(CONNECT_TIMEOUT-to.tv_sec)*1000000;
#ifdef __vxworks #ifdef __vxworks
if (connectWithTimeout(socket, (struct sockaddr *) &serverAddr, sizeof (serverAddr), &to) < 0) { if (connectWithTimeout(socket, (struct sockaddr *) &serverAddr, sizeof (serverAddr), &to) < 0) {
s7plcFWDebugLog(0, "s7plcFWEstablishConnection %s: connectWithTimeout(%d,...,%g sec) failed: %s\n", station->name, socket, CONNECT_TIMEOUT, strerror(errno)); s7plcFWDebugLog(0, "s7plcFWEstablishConnection %s: connectWithTimeout(%d,...,%d ms) failed: %s\n", station->name, socket, (int)(CONNECT_TIMEOUT * 1000.0), strerror(errno));
return -1; return -1;
} }
#else #else
@ -975,12 +980,12 @@ STATIC int s7plcFWEstablishConnection(s7plcFWStation* station, int which)
/* wait for connection */ /* wait for connection */
while ((status = select(socket+1, NULL, &fdset, NULL, &to)) < 0) { while ((status = select(socket+1, NULL, &fdset, NULL, &to)) < 0) {
if (errno != EINTR) { if (errno != EINTR) {
s7plcFWDebugLog(0, "s7plcFWEstablishConnection %s: select(%d, %f sec) failed: %s\n", station->name, socket, CONNECT_TIMEOUT, strerror(errno)); s7plcFWDebugLog(0, "s7plcFWEstablishConnection %s: select(%d, %d ms) failed: %s\n", station->name, socket, (int)(CONNECT_TIMEOUT * 1000.0), strerror(errno));
return -1; return -1;
} }
} }
if (status == 0) { if (status == 0) {
s7plcFWDebugLog(0, "s7plcFWEstablishConnection %s: select(%d, %f sec) timed out\n", station->name, socket, CONNECT_TIMEOUT); s7plcFWDebugLog(0, "s7plcFWEstablishConnection %s: select(%d, %d ms) timed out\n", station->name, socket, (int)(CONNECT_TIMEOUT * 1000.0));
errno = ETIMEDOUT; errno = ETIMEDOUT;
return -1; return -1;
} }

1
s7plcFW.html
View File

@ -54,6 +54,7 @@ Besides the
<li>new communication protocol (FETCH/WRITE)</li> <li>new communication protocol (FETCH/WRITE)</li>
<li>the modified <code>s7plcFWConfigure</code> function</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>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> </ol>
there should be no other differences. there should be no other differences.
<br><br> <br><br>