dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed max-master timeout in NO TOKEN state as this was causing issues and didn't have any basis in the standard. Thank you, Michael Hall.

Browse Source
This commit is contained in:
skarg
2015-12-15 17:31:20 +00:00
parent 1422f00f96
commit cce0df1a7c
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/src/mstp.c
+2 -6
View File
@@ -589,7 +589,7 @@ bool MSTP_Master_Node_FSM(
uint8_t next_poll_station = 0; uint8_t next_poll_station = 0;
uint8_t next_this_station = 0; uint8_t next_this_station = 0;
uint8_t next_next_station = 0; uint8_t next_next_station = 0;
uint16_t my_timeout = 10, ns_timeout = 0, mm_timeout = 0; uint16_t my_timeout = 10, ns_timeout = 0;
/* transition immediately to the next state */ /* transition immediately to the next state */
bool transition_now = false; bool transition_now = false;
MSTP_MASTER_STATE master_state = mstp_port->master_state; MSTP_MASTER_STATE master_state = mstp_port->master_state;
@@ -950,11 +950,7 @@ bool MSTP_Master_Node_FSM(
} else { } else {
ns_timeout = ns_timeout =
Tno_token + (Tslot * (mstp_port->This_Station + 1)); Tno_token + (Tslot * (mstp_port->This_Station + 1));
mm_timeout = if (mstp_port->SilenceTimer((void *) mstp_port) < ns_timeout) {
Tno_token + (Tslot * (mstp_port->Nmax_master + 1));
if ((mstp_port->SilenceTimer((void *) mstp_port) < ns_timeout)
|| (mstp_port->SilenceTimer((void *) mstp_port) >
mm_timeout)) {
/* GenerateToken */ /* GenerateToken */
/* Assume that this node is the lowest numerical address */ /* Assume that this node is the lowest numerical address */
/* on the network and is empowered to create a token. */ /* on the network and is empowered to create a token. */