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

Fixed MS/TP that was not working in ports/win32 (#694)

Browse Source
This commit is contained in:
Nandkishor Biradar
2024-07-19 18:23:16 +05:30
committed by GitHub
parent e984a19885
commit fd2f33b522
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ports/win32/dlmstp.c
+1 -1
View File
@@ -203,7 +203,7 @@ static void dlmstp_master_fsm_task(void *pArg)
} }
if (dwMilliseconds) if (dwMilliseconds)
WaitForSingleObject(Received_Frame_Flag, dwMilliseconds); WaitForSingleObject(Received_Frame_Flag, dwMilliseconds);
MSTP_Master_Node_FSM(&MSTP_Port); while (MSTP_Master_Node_FSM(&MSTP_Port));
} }
} }
ports/win32/rs485.c
+1 -1
View File
@@ -217,7 +217,7 @@ static void RS485_Configure_Status(void)
/* configure the COM port timeout values */ /* configure the COM port timeout values */
ctNew.ReadIntervalTimeout = MAXDWORD; ctNew.ReadIntervalTimeout = MAXDWORD;
ctNew.ReadTotalTimeoutMultiplier = MAXDWORD; ctNew.ReadTotalTimeoutMultiplier = MAXDWORD;
ctNew.ReadTotalTimeoutConstant = 1000; ctNew.ReadTotalTimeoutConstant = 1;
ctNew.WriteTotalTimeoutMultiplier = 0; ctNew.WriteTotalTimeoutMultiplier = 0;
ctNew.WriteTotalTimeoutConstant = 0; ctNew.WriteTotalTimeoutConstant = 0;
if (!SetCommTimeouts(RS485_Handle, &ctNew)) { if (!SetCommTimeouts(RS485_Handle, &ctNew)) {
src/bacnet/datalink/mstp.c
+1 -1
View File
@@ -1672,7 +1672,7 @@ void MSTP_Init(struct mstp_port_struct_t *mstp_port)
if ((mstp_port->Tframe_abort < 6) || (mstp_port->Tframe_abort > 100)) { if ((mstp_port->Tframe_abort < 6) || (mstp_port->Tframe_abort > 100)) {
mstp_port->Tframe_abort = DEFAULT_Tframe_abort; mstp_port->Tframe_abort = DEFAULT_Tframe_abort;
} }
if (mstp_port->Treply_delay > 250) { if ((mstp_port->Treply_delay == 0) || mstp_port->Treply_delay > 250) {
mstp_port->Treply_delay = DEFAULT_Treply_delay; mstp_port->Treply_delay = DEFAULT_Treply_delay;
} }
if ((mstp_port->Treply_timeout < 20) || if ((mstp_port->Treply_timeout < 20) ||