From 395f7fea18ca861b30c67c5e7b511e9cd9613f58 Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Sat, 2 Aug 2008 12:51:08 +0000
Subject: [PATCH] Updated master make to include mstpcap demo application.

---
 bacnet-stack/Makefile            | 9 +++++++--
 bacnet-stack/demo/mstpcap/main.c | 7 +------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bacnet-stack/Makefile b/bacnet-stack/Makefile
index 33c5100a..7d205bcb 100644
--- a/bacnet-stack/Makefile
+++ b/bacnet-stack/Makefile
@@ -1,5 +1,5 @@
 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"
 
 clean: lib/Makefile\
@@ -14,7 +14,8 @@ clean: lib/Makefile\
 	demo/whois/Makefile \
 	demo/ucov/Makefile \
 	demo/timesync/Makefile \
-	demo/epics/Makefile
+	demo/epics/Makefile \
+	demo/mstpcap/Makefile
 	( cd lib ; make clean )
 	( cd demo/readprop ; make clean )
 	( cd demo/writeprop ; make clean )
@@ -28,6 +29,7 @@ clean: lib/Makefile\
 	( cd demo/ucov ; make clean )
 	( cd demo/timesync ; make clean )
 	( cd demo/epics ; make clean )
+	( cd demo/mstpcap ; make clean )
 
 library: lib/Makefile
 	( cd lib ; make )
@@ -68,3 +70,6 @@ ucov: demo/ucov/Makefile
 whois: demo/whois/Makefile
 	( cd demo/whois ; make ; cp bacwi ../../bin )
 
+mstpcap: demo/mstpcap/Makefile
+	( cd demo/mstpcap ; make clean all; cp mstpcap ../../bin )
+
diff --git a/bacnet-stack/demo/mstpcap/main.c b/bacnet-stack/demo/mstpcap/main.c
index 72c3aaa3..2bf58451 100644
--- a/bacnet-stack/demo/mstpcap/main.c
+++ b/bacnet-stack/demo/mstpcap/main.c
@@ -270,18 +270,13 @@ int main(
     if (argc > 2) {
         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_Initialize();
     MSTP_Port.InputBuffer = &RxBuffer[0];
     MSTP_Port.InputBufferSize = sizeof(RxBuffer);
     MSTP_Port.OutputBuffer = &TxBuffer[0];
     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_master = 127;
     MSTP_Port.SilenceTimer = Timer_Silence;