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

Fix ecx_pushindex, remove DCtO and DCl from ecx_context

pull/343/merge
Arthur Ketels 2019-11-13 21:03:56 +01:00
parent 9ec8635943
commit 92ff466357
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
soem/ethercatmain.c
View File

@ -110,8 +110,6 @@ ecx_contextt ecx_context = {
&ec_elist, // .elist =
&ec_idxstack, // .idxstack =
&EcatError, // .ecaterror =
0, // .DCtO =
0, // .DCl =
&ec_DCtime, // .DCtime =
&ec_SMcommtype[0], // .SMcommtype =
&ec_PDOassign[0], // .PDOassign =
@ -1641,7 +1639,7 @@ uint32 ecx_readeeprom2(ecx_contextt *context, uint16 slave, int timeout)
* @param[in] idx = Used datagram index.
* @param[in] data = Pointer to process data segment.
* @param[in] length = Length of data segment in bytes.
* @param[in] dcoffset = Offset position of DC frame.
* @param[in] DCO = Offset position of DC frame.
*/
static void ecx_pushindex(ecx_contextt *context, uint8 idx, void *data, uint16 length, uint16 DCO)
{
@ -1650,7 +1648,7 @@ static void ecx_pushindex(ecx_contextt *context, uint8 idx, void *data, uint16 l
context->idxstack->idx[context->idxstack->pushed] = idx;
context->idxstack->data[context->idxstack->pushed] = data;
context->idxstack->length[context->idxstack->pushed] = length;
context->idxstack->dcoffset[context->idxstack->pulled] = DCO;
context->idxstack->dcoffset[context->idxstack->pushed] = DCO;
context->idxstack->pushed++;
}
}

4
soem/ethercatmain.h
View File

@ -408,10 +408,6 @@ struct ecx_context
ec_idxstackT *idxstack;
/** reference to ecaterror state */
boolean *ecaterror;
/** internal, position of DC datagram in process data packet */
uint16 DCtO;
/** internal, length of DC datagram */
uint16 DCl;
/** reference to last DC time from slaves */
int64 *DCtime;
/** internal, SM buffer */