ln-dotnet
/
SOEM
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13 from jassarsson/fix_incorrect_wkc_when_no_frames_received 

ecx_receive_processdata_group: return EC_NOFRAME when no frames are received
pull/4/merge
Mikael Heden 2015-10-26 11:45:45 +01:00
parent 34670ceb90 eab964ca82
commit d900f423ad
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
soem/ethercatmain.c
View File

@ -1798,6 +1798,7 @@ int ecx_receive_processdata_group(ecx_contextt *context, uint8 group, int timeou
int pos, idx; int pos, idx;
int wkc = 0, wkc2; int wkc = 0, wkc2;
uint16 le_wkc = 0; uint16 le_wkc = 0;
int valid_wkc = 0;
int64 le_DCtime; int64 le_DCtime;
boolean first = FALSE; boolean first = FALSE;
@ -1832,6 +1833,7 @@ int ecx_receive_processdata_group(ecx_contextt *context, uint8 group, int timeou
memcpy(context->idxstack->data[pos], &(context->port->rxbuf[idx][EC_HEADERSIZE]), context->idxstack->length[pos]); memcpy(context->idxstack->data[pos], &(context->port->rxbuf[idx][EC_HEADERSIZE]), context->idxstack->length[pos]);
wkc += wkc2; wkc += wkc2;
} }
valid_wkc = 1;
} }
else if(context->port->rxbuf[idx][EC_CMDOFFSET]==EC_CMD_LWR) else if(context->port->rxbuf[idx][EC_CMDOFFSET]==EC_CMD_LWR)
{ {
@ -1849,6 +1851,7 @@ int ecx_receive_processdata_group(ecx_contextt *context, uint8 group, int timeou
/* output WKC counts 2 times when using LRW, emulate the same for LWR */ /* output WKC counts 2 times when using LRW, emulate the same for LWR */
wkc += wkc2 * 2; wkc += wkc2 * 2;
} }
valid_wkc = 1;
} }
} }
/* release buffer */ /* release buffer */
@ -1857,6 +1860,11 @@ int ecx_receive_processdata_group(ecx_contextt *context, uint8 group, int timeou
pos = ecx_pullindex(context); pos = ecx_pullindex(context);
} }
/* if no frames has arrived */
if (valid_wkc == 0)
{
return EC_NOFRAME;
}
return wkc; return wkc;
} }