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

Enhanced the MS/TP packet sniffer to allow configurable baud rate.

Browse Source
This commit is contained in:
skarg
2008-01-27 19:57:04 +00:00
parent b72da0bc4a
commit 004ffdc11d
3 changed files with 24 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/win32/rx_fsm.c
+7 -3
View File
@@ -155,7 +155,8 @@ int main(
int rc = 0; int rc = 0;
unsigned long hThread = 0; unsigned long hThread = 0;
uint32_t arg_value = 0; uint32_t arg_value = 0;
int my_mac = 127; long my_mac = 127;
long my_baud = 38400;
/* mimic our pointer in the state machine */ /* mimic our pointer in the state machine */
mstp_port = &MSTP_Port; mstp_port = &MSTP_Port;
@@ -164,13 +165,16 @@ int main(
Network_Interface = argv[1]; Network_Interface = argv[1];
} }
if (argc > 2) { if (argc > 2) {
my_mac = 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) if (my_mac > 127)
my_mac = 127; my_mac = 127;
} }
/* initialize our interface */ /* initialize our interface */
RS485_Set_Interface(Network_Interface); RS485_Set_Interface(Network_Interface);
RS485_Set_Baud_Rate(38400); 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);
bacnet-stack/ports/win32/rx_fsm.mak
+6 -6
View File
@@ -15,14 +15,14 @@ PRODUCT = rx_fsm
PRODUCT_EXE = $(PRODUCT).exe PRODUCT_EXE = $(PRODUCT).exe
# Choose the Data Link Layer to Enable # Choose the Data Link Layer to Enable
DEFINES = -DBACDL_MSTP DEFINES = -DBACDL_MSTP -DBACAPP_ALL -DPRINT_ENABLED=1 -DPRINT_ENABLED_RECEIVE_DATA=1
SRCS = rs485.c \ SRCS = rs485.c \
rx_fsm.c \ rx_fsm.c \
..\..\mstp.c \ ..\..\src\mstp.c \
..\..\mstptext.c \ ..\..\src\mstptext.c \
..\..\indtext.c \ ..\..\src\indtext.c \
..\..\crc.c ..\..\src\crc.c
OBJS = $(SRCS:.c=.obj) OBJS = $(SRCS:.c=.obj)
@@ -38,7 +38,7 @@ TLIB = $(BORLAND_DIR)\bin\tlib
# Include directories # Include directories
# #
CC_DIR = $(BORLAND_DIR)\BIN CC_DIR = $(BORLAND_DIR)\BIN
BACNET_INCL = ..\..\;..\..\demo\handler\;..\..\demo\object\;. BACNET_INCL = ..\..\include;.
INCL_DIRS = -I$(BORLAND_DIR)\include;$(BACNET_INCL) INCL_DIRS = -I$(BORLAND_DIR)\include;$(BACNET_INCL)
CFLAGS = $(INCL_DIRS) $(CS_FLAGS) $(DEFINES) CFLAGS = $(INCL_DIRS) $(CS_FLAGS) $(DEFINES)
bacnet-stack/src/mstp.c
+11 -34
View File
@@ -56,43 +56,20 @@
#include "mstptext.h" #include "mstptext.h"
#endif #endif
/* debug print statements */ #if !defined(PRINT_ENABLED_RECEIVE)
#if PRINT_ENABLED
#define PRINT_ENABLED_RECEIVE 0 #define PRINT_ENABLED_RECEIVE 0
#define PRINT_ENABLED_RECEIVE_DATA 0
#define PRINT_ENABLED_RECEIVE_ERRORS 1
#define PRINT_ENABLED_MASTER 0
#else
#define PRINT_ENABLED_RECEIVE 0
#define PRINT_ENABLED_RECEIVE_DATA 0
#define PRINT_ENABLED_MASTER 0
#endif #endif
#if PRINT_ENABLED #if !defined(PRINT_ENABLED_RECEIVE_DATA)
#define PRINT_DEBUG(x) \ #define PRINT_ENABLED_RECEIVE_DATA 0
fprintf(stderr,x) #endif
#define PRINT_DEBUG1(fmt,v1) \
fprintf(stderr,fmt,v1) #if !defined(PRINT_ENABLED_RECEIVE_ERRORS)
#define PRINT_DEBUG2(fmt,v1,v2) \ #define PRINT_ENABLED_RECEIVE_ERRORS 0
fprintf(stderr,fmt,v1,v2) #endif
#define PRINT_DEBUG3(fmt,v1,v2,v3) \
fprintf(stderr,fmt,v1,v2,v3) #if !defined(PRINT_ENABLED_MASTER)
#define PRINT_DEBUG4(fmt,v1,v2,v3,v4) \ #define PRINT_ENABLED_MASTER 0
fprintf(stderr,fmt,v1,v2,v3,v4)
#define PRINT_DEBUG5(fmt,v1,v2,v3,v4,v5) \
fprintf(stderr,fmt,v1,v2,v3,v4,v5)
#define PRINT_DEBUG6(fmt,v1,v2,v3,v4,v5,v6) \
fprintf(stderr,fmt,v1,v2,v3,v4,v5,v6)
#define PRINT_DEBUG7(fmt,v1,v2,v3,v4,v5,v6,v7) \
fprintf(stderr,fmt,v1,v2,v3,v4,v5,v6,v7)
#else
#define PRINT_DEBUG(x)
#define PRINT_DEBUG1(fmt,v1)
#define PRINT_DEBUG2(fmt,v1,v2)
#define PRINT_DEBUG3(fmt,v1,v2,v3)
#define PRINT_DEBUG4(fmt,v1,v2,v3,v4)
#define PRINT_DEBUG5(fmt,v1,v2,v3,v4,v5)
#define PRINT_DEBUG6(fmt,v1,v2,v3,v4,v5,v6)
#endif #endif
/* MS/TP Frame Format */ /* MS/TP Frame Format */