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

Merge pull request #109 from OpenEtherCATsociety/fix/download_segmented_completeaccess 

Fix errornous segmented download CompleteAccess
pull/116/head
Hans-Erik Floryd 2021-12-16 14:06:50 +01:00 committed by GitHub
parent 311977e47a df0d169eef
commit 3c5af65be6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
soes/esc_coe.c
View File

@ -1027,32 +1027,42 @@ static void SDO_downloadsegment (void)
if (coesdo->command & COE_COMMAND_LASTSEGMENTBIT)
{
/* last segment */
ESCvar.segmented = 0;
if(ESCvar.flags == COMPLETE_ACCESS_FLAG)
{
int16_t nidx;
int16_t nidx, nsub;
if(ESCvar.frags > ESCvar.fragsleft + size)
{
set_state_idle (0, ESCvar.index, ESCvar.subindex, ABORT_TYPEMISMATCH);
return;
}
nidx = SDO_findobject(ESCvar.index);
if (nidx < 0)
nsub = SDO_findsubindex (nidx, ESCvar.subindex);
if ((nidx < 0) || (nsub < 0))
{
set_state_idle (0, ESCvar.index, ESCvar.subindex, ABORT_NOOBJECT);
return;
}
/* copy download data to subindexes */
const _objd *objd = SDOobjects[nidx].objdesc;
complete_access_subindex_loop(objd,
ESCvar.index,
ESCvar.subindex,
(uint8_t *)ESCvar.data,
nidx,
nsub,
(uint8_t *)ESCvar.mbxdata,
DOWNLOAD,
ESCvar.frags);
}
/* external object write handler */
uint32_t abort = ESC_download_post_objecthandler
(ESCvar.index, ESCvar.subindex, ESCvar.flags);
/* last segment */
ESCvar.segmented = 0;
ESCvar.frags = 0;
ESCvar.fragsleft = 0;
/* external object write handler */
uint32_t abort = ESC_download_post_objecthandler
(ESCvar.index, ESCvar.subindex, ESCvar.flags);
if (abort != 0)
{
set_state_idle (MBXout, ESCvar.index, ESCvar.subindex, abort);
@ -1063,6 +1073,8 @@ static void SDO_downloadsegment (void)
{
/* more segmented transfer needed: increase offset */
ESCvar.data += size;
/* number of bytes done */
ESCvar.fragsleft += size;
}
MBXcontrol[MBXout].state = MBXstate_outreq;