nikon/CANopenNode
1
0
Fork 0
Code Activity Actions

Merge pull request #265 from geoffrey-vl/master

Browse source 
BUGFIX: updating nmt internal state doesn't trigger callback function
This commit is contained in:
Janez 2021-02-25 07:36:23 +01:00 committed by GitHub
commit 2853bafd27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
301/CO_NMT_Heartbeat.c
View file

@ -328,6 +328,25 @@ CO_NMT_reset_cmd_t CO_NMT_process(
return (CO_NMT_reset_cmd_t) NMT->resetCommand; return (CO_NMT_reset_cmd_t) NMT->resetCommand;
} }
/******************************************************************************/
void CO_NMT_setInternalState(CO_NMT_t *NMT,
CO_NMT_internalState_t state)
{
if (NMT == NULL)
return;
if (NMT->operatingState == state)
return;
NMT->operatingState = state;
#if (CO_CONFIG_NMT) & CO_CONFIG_NMT_CALLBACK_CHANGE
if (NMT->pFunctNMT != NULL) {
NMT->pFunctNMT(NMT->operatingState);
}
#endif
}
#if (CO_CONFIG_NMT) & CO_CONFIG_NMT_MASTER #if (CO_CONFIG_NMT) & CO_CONFIG_NMT_MASTER
/******************************************************************************/ /******************************************************************************/

7
301/CO_NMT_Heartbeat.h
View file

@ -265,11 +265,8 @@ static inline CO_NMT_internalState_t CO_NMT_getInternalState(CO_NMT_t *NMT) {
* @param NMT This object. * @param NMT This object.
* @param state New state. * @param state New state.
*/ */
static inline void CO_NMT_setInternalState(CO_NMT_t *NMT, void CO_NMT_setInternalState(CO_NMT_t *NMT,
CO_NMT_internalState_t state) CO_NMT_internalState_t state);
{
if (NMT != NULL) NMT->operatingState = state;
}
#if ((CO_CONFIG_NMT) & CO_CONFIG_NMT_MASTER) || defined CO_DOXYGEN #if ((CO_CONFIG_NMT) & CO_CONFIG_NMT_MASTER) || defined CO_DOXYGEN