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

Updated pic18f6720 port project to compile with MPLAB X and MCC18 v3.43 LITE.

Browse Source
This commit is contained in:
skarg
2012-09-13 20:27:38 +00:00
parent 77ad8cf6f4
commit 8f88d5d45d
20 changed files with 1453 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/pic18f6720/mstp.c
+11 -7
View File
@@ -51,7 +51,9 @@
#endif
#include "mstp.h"
#include "bytes.h"
#include "bits.h"
#include "crc.h"
#include "bacaddr.h"
#include "rs485.h"
#if PRINT_ENABLED
#include "mstptext.h"
@@ -907,16 +909,18 @@ bool MSTP_Master_Node_FSM(
/* before passing the token. */
mstp_port->master_state = MSTP_MASTER_STATE_USE_TOKEN;
transition_now = true;
} else if ((MSTP_Flag.SoleMaster == false) &&
(Next_Station == This_Station)) {
} else if ((mstp_port->SoleMaster == false) &&
(mstp_port->Next_Station == mstp_port->This_Station)) {
/* NextStationUnknown - added in Addendum 135-2008v-1 */
/* then the next station to which the token
should be sent is unknown - so PollForMaster */
Poll_Station = next_this_station;
MSTP_Send_Frame(FRAME_TYPE_POLL_FOR_MASTER, Poll_Station,
This_Station, NULL, 0);
RetryCount = 0;
Master_State = MSTP_MASTER_STATE_POLL_FOR_MASTER;
mstp_port->Poll_Station = next_this_station;
MSTP_Create_And_Send_Frame(mstp_port,
FRAME_TYPE_POLL_FOR_MASTER,
mstp_port->Poll_Station,
mstp_port->This_Station, NULL, 0);
mstp_port->RetryCount = 0;
mstp_port->master_state = MSTP_MASTER_STATE_POLL_FOR_MASTER;
}
/* Npoll changed in Errata SSPC-135-2004 */
else if (mstp_port->TokenCount < (Npoll - 1)) {