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

Updated master make to include mstpcap demo application.

Browse Source
This commit is contained in:
skarg
2008-08-02 12:51:08 +00:00
parent a81814147a
commit 395f7fea18
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/Makefile
+7 -2
View File
@@ -1,5 +1,5 @@
all: library readprop writeprop readfile writefile reinit server dcc \ all: library readprop writeprop readfile writefile reinit server dcc \
whohas whois ucov timesync epics whohas whois ucov timesync epics mstpcap
@echo "utilities are in the bin directory" @echo "utilities are in the bin directory"
clean: lib/Makefile\ clean: lib/Makefile\
@@ -14,7 +14,8 @@ clean: lib/Makefile\
demo/whois/Makefile \ demo/whois/Makefile \
demo/ucov/Makefile \ demo/ucov/Makefile \
demo/timesync/Makefile \ demo/timesync/Makefile \
demo/epics/Makefile demo/epics/Makefile \
demo/mstpcap/Makefile
( cd lib ; make clean ) ( cd lib ; make clean )
( cd demo/readprop ; make clean ) ( cd demo/readprop ; make clean )
( cd demo/writeprop ; make clean ) ( cd demo/writeprop ; make clean )
@@ -28,6 +29,7 @@ clean: lib/Makefile\
( cd demo/ucov ; make clean ) ( cd demo/ucov ; make clean )
( cd demo/timesync ; make clean ) ( cd demo/timesync ; make clean )
( cd demo/epics ; make clean ) ( cd demo/epics ; make clean )
( cd demo/mstpcap ; make clean )
library: lib/Makefile library: lib/Makefile
( cd lib ; make ) ( cd lib ; make )
@@ -68,3 +70,6 @@ ucov: demo/ucov/Makefile
whois: demo/whois/Makefile whois: demo/whois/Makefile
( cd demo/whois ; make ; cp bacwi ../../bin ) ( cd demo/whois ; make ; cp bacwi ../../bin )
mstpcap: demo/mstpcap/Makefile
( cd demo/mstpcap ; make clean all; cp mstpcap ../../bin )
bacnet-stack/demo/mstpcap/main.c
+1 -6
View File
@@ -270,18 +270,13 @@ int main(
if (argc > 2) { if (argc > 2) {
my_baud = strtol(argv[2], NULL, 0); my_baud = strtol(argv[2], NULL, 0);
} }
if (argc > 3) {
my_mac = strtol(argv[3], NULL, 0);
if (my_mac > 127)
my_mac = 127;
}
RS485_Set_Baud_Rate(my_baud); RS485_Set_Baud_Rate(my_baud);
RS485_Initialize(); RS485_Initialize();
MSTP_Port.InputBuffer = &RxBuffer[0]; MSTP_Port.InputBuffer = &RxBuffer[0];
MSTP_Port.InputBufferSize = sizeof(RxBuffer); MSTP_Port.InputBufferSize = sizeof(RxBuffer);
MSTP_Port.OutputBuffer = &TxBuffer[0]; MSTP_Port.OutputBuffer = &TxBuffer[0];
MSTP_Port.OutputBufferSize = sizeof(TxBuffer); MSTP_Port.OutputBufferSize = sizeof(TxBuffer);
MSTP_Port.This_Station = my_mac; MSTP_Port.This_Station = 127;
MSTP_Port.Nmax_info_frames = 1; MSTP_Port.Nmax_info_frames = 1;
MSTP_Port.Nmax_master = 127; MSTP_Port.Nmax_master = 127;
MSTP_Port.SilenceTimer = Timer_Silence; MSTP_Port.SilenceTimer = Timer_Silence;