zephyr
/
canopennode
mirror of https://github.com/zephyrproject-rtos/canopennode.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mergeup: merge up to upstream 09f1083 

Synchronize up to upstream commit:
09f1083ae6

This brings in bugfixes for heartbeat consumer and added NMT state set
functionality.
This commit is contained in:
Henrik Brix Andersen 2021-10-29 12:49:12 +02:00
parent f167efe85c 09f1083ae6
commit 79724e698b
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
stack/CO_HBconsumer.c
View File

@ -211,7 +211,7 @@ void CO_HBconsumer_initCallbackHeartbeatStarted(
{
CO_HBconsNode_t *monitoredNode;
if (HBcons==NULL || idx>HBcons->numberOfMonitoredNodes) {
if (HBcons==NULL || idx>=HBcons->numberOfMonitoredNodes) {
return;
}
@ -230,7 +230,7 @@ void CO_HBconsumer_initCallbackTimeout(
{
CO_HBconsNode_t *monitoredNode;
if (HBcons==NULL || idx>HBcons->numberOfMonitoredNodes) {
if (HBcons==NULL || idx>=HBcons->numberOfMonitoredNodes) {
return;
}
@ -249,7 +249,7 @@ void CO_HBconsumer_initCallbackRemoteReset(
{
CO_HBconsNode_t *monitoredNode;
if (HBcons==NULL || idx>HBcons->numberOfMonitoredNodes) {
if (HBcons==NULL || idx>=HBcons->numberOfMonitoredNodes) {
return;
}
@ -275,6 +275,7 @@ void CO_HBconsumer_process(
if(NMTisPreOrOperational){
for(i=0; i<HBcons->numberOfMonitoredNodes; i++){
uint16_t timeDifference_ms_copy = timeDifference_ms;
if(monitoredNode->time > 0){/* is node monitored */
/* Verify if received message is heartbeat or bootup */
if(IS_CANrxNew(monitoredNode->CANrxNew)){
@ -294,14 +295,14 @@ void CO_HBconsumer_process(
}
monitoredNode->HBstate = CO_HBconsumer_ACTIVE;
monitoredNode->timeoutTimer = 0; /* reset timer */
timeDifference_ms = 0;
timeDifference_ms_copy = 0;
}
CLEAR_CANrxNew(monitoredNode->CANrxNew);
}
/* Verify timeout */
if(monitoredNode->timeoutTimer < monitoredNode->time) {
monitoredNode->timeoutTimer += timeDifference_ms;
monitoredNode->timeoutTimer += timeDifference_ms_copy;
}
if(monitoredNode->HBstate!=CO_HBconsumer_UNCONFIGURED &&
monitoredNode->HBstate!=CO_HBconsumer_UNKNOWN) {
@ -389,7 +390,7 @@ CO_HBconsumer_state_t CO_HBconsumer_getState(
{
CO_HBconsNode_t *monitoredNode;
if (HBcons==NULL || idx>HBcons->numberOfMonitoredNodes) {
if (HBcons==NULL || idx>=HBcons->numberOfMonitoredNodes) {
return CO_HBconsumer_UNCONFIGURED;
}
@ -405,7 +406,7 @@ int8_t CO_HBconsumer_getNmtState(
{
CO_HBconsNode_t *monitoredNode;
if (HBcons==NULL || nmtState==NULL || idx>HBcons->numberOfMonitoredNodes) {
if (HBcons==NULL || nmtState==NULL || idx>=HBcons->numberOfMonitoredNodes) {
return -1;
}
*nmtState = CO_NMT_INITIALIZING;

6
stack/CO_NMT_Heartbeat.c
View File

@ -351,3 +351,9 @@ CO_NMT_internalState_t CO_NMT_getInternalState(
return CO_NMT_INITIALIZING;
}
void CO_NMT_setInternalState(
CO_NMT_t *NMT,
CO_NMT_internalState_t state)
{
NMT->operatingState = state;
}

11
stack/CO_NMT_Heartbeat.h
View File

@ -252,6 +252,17 @@ CO_NMT_reset_cmd_t CO_NMT_process(
CO_NMT_internalState_t CO_NMT_getInternalState(
CO_NMT_t *NMT);
/**
* Set current NMT state
*
* @param NMT This object.
* @param CO_NMT_internalState_t State to set
*
*/
void CO_NMT_setInternalState(
CO_NMT_t *NMT,
CO_NMT_internalState_t state);
#ifdef __cplusplus
}