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

Integrated ReadPropertyMultiple with the demo/server application. Compiles, but untested.

Browse Source
This commit is contained in:
skarg
2007-07-19 00:21:38 +00:00
parent a8555ef196
commit 5b07b5b920
30 changed files with 1047 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/server/Makefile
+7 -5
View File
@@ -19,7 +19,7 @@ BACNET_PORT = ../../ports/linux
BACNET_OBJECT = ../object
BACNET_HANDLER = ../handler
BACNET_ROOT = ../..
INCLUDES = -I$(BACNET_ROOT) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER)
INCLUDES = -I$(BACNET_ROOT) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER)
CFLAGS = -Wall -g $(INCLUDES) $(DEFINES)
@@ -38,6 +38,7 @@ SRCS = main.c \
$(BACNET_HANDLER)/noserv.c \
$(BACNET_HANDLER)/h_whois.c \
$(BACNET_HANDLER)/h_rp.c \
$(BACNET_HANDLER)/h_rpm.c \
$(BACNET_HANDLER)/h_wp.c \
$(BACNET_HANDLER)/h_arf.c \
$(BACNET_HANDLER)/h_awf.c \
@@ -71,6 +72,7 @@ SRCS = main.c \
$(BACNET_ROOT)/whohas.c \
$(BACNET_ROOT)/ihave.c \
$(BACNET_ROOT)/rp.c \
$(BACNET_ROOT)/rpm.c \
$(BACNET_ROOT)/wp.c \
$(BACNET_ROOT)/arf.c \
$(BACNET_ROOT)/awf.c \
@@ -86,17 +88,17 @@ SRCS = main.c \
OBJS = ${SRCS:.c=.o}
all: ${TARGET}
${TARGET}: ${OBJS}
${CC} -pthread -o $@ ${OBJS}
${CC} -pthread -o $@ ${OBJS}
.c.o:
${CC} -c ${CFLAGS} $*.c -o $@
depend:
rm -f .depend
${CC} -MM ${CFLAGS} *.c >> .depend
clean:
rm -rf core ${TARGET} $(OBJS) *.bak ports/linux/*.bak *.1 *.ini
bacnet-stack/demo/server/bacserv.cbp
+12 -9
View File
@@ -14,11 +14,6 @@
<Compiler>
<Add option="-Wall" />
<Add option="-g" />
<Add option="-DBACDL_BIP=1" />
<Add option="-DBIP_DEBUG=1" />
<Add option="-DUSE_INADDR=1" />
<Add option="-DPRINT_ENABLED=1" />
<Add option="-DBIG_ENDIAN=0" />
<Add directory="." />
<Add directory="..\handler" />
<Add directory="..\object" />
@@ -54,7 +49,7 @@
<Add option="-O" />
<Add option="-Wall" />
<Add option="-fexceptions" />
<Add option="-DBACDL_MSTP=1" />
<Add option="-DBACDL_BIP=1" />
<Add option="-DBIP_DEBUG=1" />
<Add option="-DUSE_INADDR=1" />
<Add option="-DPRINT_ENABLED=1" />
@@ -138,6 +133,9 @@
<Unit filename="..\handler\h_rp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\handler\h_rpm.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\handler\h_ts.c">
<Option compilerVar="CC" />
</Unit>
@@ -150,6 +148,7 @@
<Unit filename="..\handler\h_wp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\handler\handlers.h" />
<Unit filename="..\handler\noserv.c">
<Option compilerVar="CC" />
</Unit>
@@ -218,6 +217,9 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\indtext.h" />
<Unit filename="..\..\mstp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\npdu.c">
<Option compilerVar="CC" />
</Unit>
@@ -228,9 +230,6 @@
<Unit filename="..\..\ports\win32\dlmstp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\ports\win32\mstp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\ports\win32\mstp.h" />
<Unit filename="..\..\ports\win32\net.h" />
<Unit filename="..\..\ports\win32\rs485.c">
@@ -249,6 +248,10 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\rp.h" />
<Unit filename="..\..\rpm.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\rpm.h" />
<Unit filename="..\..\timesync.c">
<Option compilerVar="CC" />
</Unit>
bacnet-stack/demo/server/main.c
+2
View File
@@ -67,6 +67,8 @@ static void Init_Service_Handlers(void)
/* We must implement read property - it's required! */
apdu_set_confirmed_handler(SERVICE_CONFIRMED_READ_PROPERTY,
handler_read_property);
apdu_set_confirmed_handler(SERVICE_CONFIRMED_READ_PROPERTY_MULTIPLE,
handler_read_property_multiple);
apdu_set_confirmed_handler(SERVICE_CONFIRMED_WRITE_PROPERTY,
handler_write_property);
apdu_set_confirmed_handler(SERVICE_CONFIRMED_ATOMIC_READ_FILE,
bacnet-stack/demo/server/makefile.b32
+4 -2
View File
@@ -32,6 +32,7 @@ SRCS = main.c \
..\..\demo\handler\noserv.c \
..\..\demo\handler\h_whois.c \
..\..\demo\handler\h_rp.c \
..\..\demo\handler\h_rpm.c \
..\..\demo\handler\h_wp.c \
..\..\demo\handler\h_arf.c \
..\..\demo\handler\h_awf.c \
@@ -52,6 +53,7 @@ SRCS = main.c \
..\..\whohas.c \
..\..\ihave.c \
..\..\rp.c \
..\..\rpm.c \
..\..\wp.c \
..\..\arf.c \
..\..\awf.c \
@@ -153,8 +155,8 @@ clean :
# Compiler configuration file
$(BCC_CFG) :
Copy &&|
$(CFLAGS)
-c
$(CFLAGS)
-c
-y #include line numbers in OBJ's
-v #include debug info
-w+ #turn on all warnings