ln-dotnet
/
SOES
mirror of https://github.com/OpenEtherCATsociety/SOES.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow Download Complete Access data size to be less than full size 

Change-Id: Ie27c54547c88d89bc1a8c99afc875ea1276a6d85
pull/89/head
Lars Danielsson 2020-09-23 13:01:00 +02:00
parent 9ea52dff56
commit a6f45c308f
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
soes/esc_coe.c
View File

@ -455,7 +455,8 @@ static uint32_t complete_access_subindex_loop(const _objd *objd,
int16_t nidx, int16_t nidx,
int16_t nsub, int16_t nsub,
uint8_t *mbxdata, uint8_t *mbxdata,
load_t load_type) load_t load_type,
uint16_t max_bytes)
{ {
/* Objects with dynamic entries cannot be accessed with Complete Access */ /* Objects with dynamic entries cannot be accessed with Complete Access */
if ((objd->datatype == DTYPE_VISIBLE_STRING) || if ((objd->datatype == DTYPE_VISIBLE_STRING) ||
@ -525,6 +526,11 @@ static uint32_t complete_access_subindex_loop(const _objd *objd,
/* Subindex 0 is padded to 16 bit */ /* Subindex 0 is padded to 16 bit */
size += (nsub == 0) ? 16 : bitlen; size += (nsub == 0) ? 16 : bitlen;
nsub++; nsub++;
if ((max_bytes > 0) && (BITS2BYTES(size) >= max_bytes))
{
break;
}
} }
return size; return size;
@ -576,7 +582,7 @@ static void SDO_upload_complete_access (void)
const _objd *objd = SDOobjects[nidx].objdesc; const _objd *objd = SDOobjects[nidx].objdesc;
/* loop through the subindexes to get the total size */ /* loop through the subindexes to get the total size */
uint32_t size = complete_access_subindex_loop(objd, nidx, nsub, NULL, UPLOAD); uint32_t size = complete_access_subindex_loop(objd, nidx, nsub, NULL, UPLOAD, 0);
if (size > 0xffff) if (size > 0xffff)
{ {
/* 'size' is in this case actually an abort code */ /* 'size' is in this case actually an abort code */
@ -599,7 +605,7 @@ static void SDO_upload_complete_access (void)
} }
/* copy subindex data into the preallocated buffer */ /* copy subindex data into the preallocated buffer */
complete_access_subindex_loop(objd, nidx, nsub, ESCvar.mbxdata, UPLOAD); complete_access_subindex_loop(objd, nidx, nsub, ESCvar.mbxdata, UPLOAD, 0);
_COEsdo *coeres = (_COEsdo *) &MBX[MBXout * ESC_MBXSIZE]; _COEsdo *coeres = (_COEsdo *) &MBX[MBXout * ESC_MBXSIZE];
init_coesdo(coeres, COE_SDORESPONSE, init_coesdo(coeres, COE_SDORESPONSE,
@ -900,14 +906,20 @@ static void SDO_download_complete_access (void)
const _objd *objd = SDOobjects[nidx].objdesc; const _objd *objd = SDOobjects[nidx].objdesc;
/* loop through the subindexes to get the total size */ /* loop through the subindexes to get the total size */
uint32_t size = complete_access_subindex_loop(objd, nidx, nsub, NULL, DOWNLOAD); uint32_t size = complete_access_subindex_loop(objd, nidx, nsub, NULL, DOWNLOAD, 0);
if (size > 0xffff) if (size > 0xffff)
{ {
/* 'size' is in this case actually an abort code */ /* 'size' is in this case actually an abort code */
set_state_idle (index, subindex, size); set_state_idle (index, subindex, size);
return; return;
} }
else if (bytes == BITS2BYTES(size)) /* The document ETG.1020 S (R) V1.3.0, chapter 12.2, states that
* "The SDO Download Complete Access data length shall always match
* the full current object size (defined by SubIndex0)".
* But EtherCAT Conformance Test Tool doesn't follow this rule for some test
* cases, which is the reason to here only check for 'less than or equal'.
*/
else if (bytes <= BITS2BYTES(size))
{ {
abortcode = ESC_download_pre_objecthandler(index, subindex, mbxdata, abortcode = ESC_download_pre_objecthandler(index, subindex, mbxdata,
size, objd->flags | COMPLETE_ACCESS_FLAG); size, objd->flags | COMPLETE_ACCESS_FLAG);
@ -918,7 +930,7 @@ static void SDO_download_complete_access (void)
} }
/* copy download data to subindexes */ /* copy download data to subindexes */
complete_access_subindex_loop(objd, nidx, nsub, (uint8_t *)mbxdata, DOWNLOAD); complete_access_subindex_loop(objd, nidx, nsub, (uint8_t *)mbxdata, DOWNLOAD, bytes);
abortcode = ESC_download_post_objecthandler(index, subindex, abortcode = ESC_download_post_objecthandler(index, subindex,
objd->flags | COMPLETE_ACCESS_FLAG); objd->flags | COMPLETE_ACCESS_FLAG);
@ -930,16 +942,8 @@ static void SDO_download_complete_access (void)
} }
else else
{ {
#if 0
/* The document ETG.1020 S (R) V1.3.0, chapter 12.2, states that
* "The SDO Download Complete Access data length shall always match
* the full current object size (defined by SubIndex0)".
* But EtherCAT Conformance Test Tool doesn't follow this rule for some
* test cases, which thus will fail if the correct abort code is used :(
*/
set_state_idle (index, subindex, ABORT_TYPEMISMATCH); set_state_idle (index, subindex, ABORT_TYPEMISMATCH);
return; return;
#endif
} }
uint8_t MBXout = ESC_claimbuffer (); uint8_t MBXout = ESC_claimbuffer ();