Compare commits
5 Commits
S7PLCFW_1_
...
S7PLCFW_1_
| Author | SHA1 | Date | |
|---|---|---|---|
| 46bf87c99c | |||
| 9ea778a101 | |||
| a5ed2fd234 | |||
| f9b9b5192f | |||
| 4f4d43032d |
41
drvS7plcFW.c
41
drvS7plcFW.c
@ -1,7 +1,7 @@
|
||||
/* $Date: 2012/03/06 10:53:08 $ */
|
||||
/* $Id: drvS7plcFW.c,v 1.2 2012/03/06 10:53: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.2 $ */
|
||||
/* $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.2 2012/03/06 10:53: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();
|
||||
@ -186,9 +187,9 @@ STATIC long s7plcFWIoReport(int level)
|
||||
"ioc:motorola <-> plc:intel" : "no (both motorola)"
|
||||
#endif
|
||||
);
|
||||
printf(" receive timeout %g sec\n", station->recvTimeout);
|
||||
printf(" receive delay %g sec\n", station->recvDelay);
|
||||
printf(" outIOint delay %g sec\n", station->outIOintDelay);
|
||||
printf(" receive timeout %d ms\n", (int)(station->recvTimeout * 1000.0));
|
||||
printf(" receive delay %d ms\n", (int)(station->recvDelay * 1000.0));
|
||||
printf(" outIOint delay %d ms\n", (int)(station->outIOintDelay * 1000.0));
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
@ -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 ()
|
||||
@ -452,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);
|
||||
if (s7plcFWEstablishConnection(station, FOR_FETCH) < 0) {
|
||||
s7plcFWDebugLog(1, "s7plcFWMain %s: connect(%d, %s:%d) failed for fetch: %s. Retry in %g seconds\n",
|
||||
station->name, station->fetchSocket, station->serverIP, station->fetchPort, strerror(errno), (double)RECONNECT_DELAY);
|
||||
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), (int)(RECONNECT_DELAY * 1000.0));
|
||||
if (close(station->fetchSocket) && errno != ENOTCONN) {
|
||||
s7plcFWDebugLog(1, "s7plcFWMain %s: close(%d) failed for fetch (ignored): %s\n", station->name, station->fetchSocket, strerror(errno));
|
||||
}
|
||||
@ -476,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);
|
||||
if (s7plcFWEstablishConnection(station, FOR_WRITE) < 0) {
|
||||
s7plcFWDebugLog(1, "s7plcFWMain %s: connect(%d, %s:%d) failed for write: %s. Retry in %g seconds\n",
|
||||
station->name, station->writeSocket, station->serverIP, station->writePort, strerror(errno), (double)RECONNECT_DELAY);
|
||||
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), (int)(RECONNECT_DELAY * 1000.0));
|
||||
if (close(station->writeSocket) && errno != ENOTCONN) {
|
||||
s7plcFWDebugLog(1, "s7plcFWMain %s: close(%d) failed for write (ignored): %s\n", station->name, station->writeSocket, strerror(errno));
|
||||
}
|
||||
@ -659,7 +658,7 @@ STATIC int s7plcFWdoFetch(s7plcFWStation *station, int org, int db, int offs, in
|
||||
input = 0;
|
||||
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);
|
||||
if (status <= 0) {
|
||||
s7plcFWDebugLog(0, "s7plcFWdoFetch: %s: s7plcFWWaitForInput(%d, ..., %d, 0) failed\n", station->name, station->fetchSocket, size - input);
|
||||
@ -911,12 +910,12 @@ STATIC int s7plcFWWaitForInput(s7plcFWStation* station, int which, double timeou
|
||||
errno = 0;
|
||||
while ((iSelect=select(socket+1, &socklist, 0, 0, &to)) < 0) {
|
||||
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;
|
||||
}
|
||||
}
|
||||
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;
|
||||
}
|
||||
return iSelect;
|
||||
@ -955,7 +954,7 @@ STATIC int s7plcFWEstablishConnection(s7plcFWStation* station, int which)
|
||||
to.tv_usec=(int)(CONNECT_TIMEOUT-to.tv_sec)*1000000;
|
||||
#ifdef __vxworks
|
||||
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;
|
||||
}
|
||||
#else
|
||||
@ -981,12 +980,12 @@ STATIC int s7plcFWEstablishConnection(s7plcFWStation* station, int which)
|
||||
/* wait for connection */
|
||||
while ((status = select(socket+1, NULL, &fdset, NULL, &to)) < 0) {
|
||||
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;
|
||||
}
|
||||
}
|
||||
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;
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -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 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>
|
||||
|
||||
Reference in New Issue
Block a user