From 0b490d54408d348c633f77d40c6d6908544246ea Mon Sep 17 00:00:00 2001 From: skarg Date: Sun, 30 Nov 2008 04:39:53 +0000 Subject: [PATCH] Updated the PIC port for MS/TP. Tested on my hardware. --- .../ports/pic18f6720/BACnet-Server.mcw | Bin 57856 -> 62464 bytes bacnet-stack/ports/pic18f6720/dlmstp.c | 25 ------------------ bacnet-stack/ports/pic18f6720/main.c | 7 ++++- bacnet-stack/ports/pic18f6720/mstp.c | 4 --- 4 files changed, 6 insertions(+), 30 deletions(-) diff --git a/bacnet-stack/ports/pic18f6720/BACnet-Server.mcw b/bacnet-stack/ports/pic18f6720/BACnet-Server.mcw index 679e31fbaa0bffa439fb6569fc15820053d127d6..e1221fac5fc4d6b78d7de4fa7e8398d995d4c9cd 100644 GIT binary patch literal 62464 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 W9YYMsP8mB+aq*|kDf0j8VE+gG)sor( literal 57856 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 VW2QkHH-+X0*A+= MSTP_Port.This_Station)) - MSTP_Port.Nmax_master = data; - else - dlmstp_set_max_master(DEFAULT_MAX_MASTER); - /* FIXME: implement your data storage */ - data = 1; - /* I2C_Read_Byte( - EEPROM_DEVICE_ADDRESS, - EEPROM_MSTP_MAX_INFO_FRAMES_ADDR); */ - if (data >= 1) - MSTP_Port.Nmax_info_frames = data; - else - dlmstp_set_max_info_frames(DEFAULT_MAX_INFO_FRAMES); } void dlmstp_cleanup( diff --git a/bacnet-stack/ports/pic18f6720/main.c b/bacnet-stack/ports/pic18f6720/main.c index 49ad0c3d..ed9ea0f5 100644 --- a/bacnet-stack/ports/pic18f6720/main.c +++ b/bacnet-stack/ports/pic18f6720/main.c @@ -231,7 +231,6 @@ void Initialize_Variables( ENABLE_TIMER4_INT(); /* interrupts must be enabled before we read our inputs */ Global_Int(INT_ENABLED); - dlmstp_init(); /* Start our time from now */ Milliseconds = 0; } @@ -259,6 +258,12 @@ void main( RCONbits.NOT_RI = 1; Hardware_Initialize(); Initialize_Variables(); + /* initialize BACnet Data Link Layer */ + dlmstp_set_my_address(42); + dlmstp_set_max_info_frames(1); + dlmstp_set_max_master(127); + RS485_Set_Baud_Rate(38400); + dlmstp_init(); /* Handle anything that needs to be done on powerup */ /* Greet the BACnet world! */ Send_I_Am(&Handler_Transmit_Buffer[0]); diff --git a/bacnet-stack/ports/pic18f6720/mstp.c b/bacnet-stack/ports/pic18f6720/mstp.c index 1509d15f..0e184c00 100644 --- a/bacnet-stack/ports/pic18f6720/mstp.c +++ b/bacnet-stack/ports/pic18f6720/mstp.c @@ -697,11 +697,7 @@ bool MSTP_Master_Node_FSM( mstp_port->FrameCount = mstp_port->Nmax_info_frames; mstp_port->master_state = MSTP_MASTER_STATE_DONE_WITH_TOKEN; transition_now = true; - } else if (mstp_port->SilenceTimer > Tusage_delay) { - /* if we missed our timing deadline, another token will be sent */ - mstp_port->master_state = MSTP_MASTER_STATE_IDLE; } else { - /* don't send it if we are too late in getting out */ uint8_t destination = mstp_port->TxBuffer[3]; RS485_Send_Frame(mstp_port, (uint8_t *) & mstp_port->TxBuffer[0], mstp_port->TxLength);