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

Switch to uint16. Always set state, even when requesting INIT

pull/189/head
Jesper Smith 2018-07-27 18:25:46 +02:00
parent a119467c51
commit 1176f3c44d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
soem/ethercatconfig.c
View File

@ -309,7 +309,7 @@ static int ecx_lookup_prev_sii(ecx_contextt *context, uint16 slave)
* @param[in] state = Desired state after init. Valid options are EC_STATE_INIT, EC_STATE_BOOT or EC_STATE_PRE_OP
* @return Workcounter of slave discover datagram = number of slaves found
*/
int ecx_config_init_to_state(ecx_contextt *context, uint8 usetable, ec_state state)
int ecx_config_init_to_state(ecx_contextt *context, uint8 usetable, uint16 state)
{
uint16 slave, ADPh, configadr, ssigen;
uint16 topology, estat;
@ -592,9 +592,9 @@ int ecx_config_init_to_state(ecx_contextt *context, uint8 usetable, ec_state sta
{
/* some slaves need eeprom available to PDI in init->preop or init->boot transition */
ecx_eeprom2pdi(context, slave);
/* request pre_op for slave */
ecx_FPWRw(context->port, configadr, ECT_REG_ALCTL, htoes(state | EC_STATE_ACK) , EC_TIMEOUTRET3); /* set desired status */
}
/* request desired state for slave */
ecx_FPWRw(context->port, configadr, ECT_REG_ALCTL, htoes(state | EC_STATE_ACK) , EC_TIMEOUTRET3); /* set desired status */
}
}
return wkc;

2
soem/ethercatconfig.h
View File

@ -32,7 +32,7 @@ int ec_reconfig_slave(uint16 slave, int timeout);
#endif
int ecx_config_init(ecx_contextt *context, uint8 usetable);
int ecx_config_init_to_state(ecx_contextt *context, uint8 usetable, ec_state state);
int ecx_config_init_to_state(ecx_contextt *context, uint8 usetable, uint16 state);
int ecx_config_map_group(ecx_contextt *context, void *pIOmap, uint8 group);
int ecx_config_overlap_map_group(ecx_contextt *context, void *pIOmap, uint8 group);
int ecx_recover_slave(ecx_contextt *context, uint16 slave, int timeout);