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

Merge pull request #7 from d-udd/master 

FoE: Slave doesn't need to be in boot state.
pull/11/head
Mikael Heden 2015-11-18 11:17:36 +01:00
parent 0af6609fcc 81b83b4324
commit c9c6f8f097
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
soes/esc_foe.c
View File

@ -251,7 +251,7 @@ void FOE_abort (uint32_t code)
}
/* Nothing we can do if we can't get an outbound mailbox. */
}
DPRINT("FOE_abort\n");
DPRINT("FOE_abort: 0x%X\n", code);
FOE_init ();
}
@ -475,7 +475,7 @@ void FOE_data ()
if (packet != FOEvar.foepacket)
{
DPRINT("FOE_data packet error,packet: %d foeheaader.packet: %d\n",packet,FOEvar.foepacket);
DPRINT("FOE_data packet error,packet: %d foeheader.packet: %d\n",packet,FOEvar.foepacket);
FOE_abort (FOE_ERR_PACKETNO);
}
else if (data_len == 0)
@ -604,10 +604,6 @@ void ESC_foeprocess (void)
{
FOE_abort (MBXERR_SIZETOOSHORT);
}
else if (ESCvar.ALstatus != ESCboot)
{
FOE_abort (FOE_ERR_BOOTSTRAPONLY);
}
else
{
switch (foembx->foeheader.opcode)