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

Moved include files for demo objects into demo/object, and updated makefiles to accommodate the move. This allows developers to create and maintain their own objects and the interfaces to them.

Browse Source
This commit is contained in:
skarg
2011-03-22 20:53:13 +00:00
parent 6407f098ba
commit e095715cec
37 changed files with 131 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/Makefile
+3 -1
View File
@@ -33,7 +33,9 @@ BACNET_CORE = ../src
BACNET_INCLUDE = ../include BACNET_INCLUDE = ../include
# compiler configuration # compiler configuration
#STANDARDS = -std=c99 #STANDARDS = -std=c99
INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) INCLUDE1 = -I$(BACNET_PORT_DIR) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER)
INCLUDE2 = -I$(BACNET_INCLUDE)
INCLUDES = $(INCLUDE1) $(INCLUDE2)
OPTIMIZATION = -Os OPTIMIZATION = -Os
DEBUGGING = DEBUGGING =
WARNINGS = -Wall -Wmissing-prototypes WARNINGS = -Wall -Wmissing-prototypes
bacnet-stack/demo/Makefile
+5 -1
View File
@@ -11,12 +11,16 @@
BACNET_PORT = linux BACNET_PORT = linux
BACNET_PORT_DIR = ../../ports/${BACNET_PORT} BACNET_PORT_DIR = ../../ports/${BACNET_PORT}
BACNET_INCLUDE = ../../include BACNET_INCLUDE = ../../include
BACNET_OBJECT = ../../demo/object
BACNET_HANDLER = ../../demo/handler
# BACnet Library # BACnet Library
BACNET_LIB_DIR = ../../lib BACNET_LIB_DIR = ../../lib
BACNET_LIB_NAME = bacnet BACNET_LIB_NAME = bacnet
BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a
# Compiler Setup # Compiler Setup
INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR) INCLUDE1 = -I$(BACNET_PORT_DIR) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER)
INCLUDE2 = -I$(BACNET_INCLUDE)
INCLUDES = $(INCLUDE1) $(INCLUDE2)
ifeq (${BACNET_PORT},linux) ifeq (${BACNET_PORT},linux)
PFLAGS = -pthread PFLAGS = -pthread
TARGET_EXT = TARGET_EXT =
bacnet-stack/demo/dcc/makefile.b32
+4
View File
@@ -27,9 +27,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
# directories # directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/demo/epics/makefile.b32
+4
View File
@@ -27,9 +27,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
BACNET_SOURCE = ..\..\src BACNET_SOURCE = ..\..\src
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/demo/gateway/makefile.b32
+4
View File
@@ -29,9 +29,13 @@ BACNET_DEMO_DIR = ..\demo\gateway
# directories # directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/demo/iamrouter/makefile.b32
+4
View File
@@ -27,9 +27,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
# directories # directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/demo/initrouter/makefile.b32
+4
View File
@@ -27,9 +27,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
# directories # directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/demo/mstpcap/makefile.b32
+4
View File
@@ -27,9 +27,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
# directories # directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/include/ai.h → bacnet-stack/demo/object/ai.h
View File
bacnet-stack/include/ao.h → bacnet-stack/demo/object/ao.h
View File
bacnet-stack/include/av.h → bacnet-stack/demo/object/av.h
View File
bacnet-stack/include/bi.h → bacnet-stack/demo/object/bi.h
View File
bacnet-stack/include/bo.h → bacnet-stack/demo/object/bo.h
View File
bacnet-stack/include/bv.h → bacnet-stack/demo/object/bv.h
View File
bacnet-stack/include/device.h → bacnet-stack/demo/object/device.h
View File
bacnet-stack/demo/object/lc.c
+2
View File
@@ -1095,6 +1095,8 @@ static void Load_Control_WriteProperty_Request_Shed_Percent(
wp_data.array_index = BACNET_ARRAY_ALL; wp_data.array_index = BACNET_ARRAY_ALL;
wp_data.priority = BACNET_NO_PRIORITY; wp_data.priority = BACNET_NO_PRIORITY;
wp_data.object_property = PROP_REQUESTED_SHED_LEVEL; wp_data.object_property = PROP_REQUESTED_SHED_LEVEL;
wp_data.error_class = ERROR_CLASS_PROPERTY;
wp_data.error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
value.context_specific = true; value.context_specific = true;
value.context_tag = 0; value.context_tag = 0;
value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT; value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
bacnet-stack/include/lc.h → bacnet-stack/demo/object/lc.h
View File
bacnet-stack/include/lo.h → bacnet-stack/demo/object/lo.h
View File
bacnet-stack/include/lso.h → bacnet-stack/demo/object/lso.h
View File
bacnet-stack/include/lsp.h → bacnet-stack/demo/object/lsp.h
View File
bacnet-stack/include/ms-input.h → bacnet-stack/demo/object/ms-input.h
View File
bacnet-stack/include/mso.h → bacnet-stack/demo/object/mso.h
View File
bacnet-stack/include/trendlog.h → bacnet-stack/demo/object/trendlog.h
View File
bacnet-stack/demo/ptransfer/makefile.b32
+4
View File
@@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
# directories # directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/demo/readfile/makefile.b32
+4
View File
@@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
# directories # directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/demo/readprop/makefile.b32
+4
View File
@@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
# directories # directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/demo/readpropm/makefile.b32
+4
View File
@@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
# directories # directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/demo/reinit/makefile.b32
+4
View File
@@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
# directories # directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/demo/server/makefile.b32
+4
View File
@@ -29,9 +29,13 @@ BACNET_DEMO_DIR = ..\demo\server
# directories # directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/demo/timesync/makefile.b32
+4
View File
@@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
# directories # directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/demo/ucov/makefile.b32
+4
View File
@@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
# directories # directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/demo/whohas/makefile.b32
+4
View File
@@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
# directories # directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/demo/whois/makefile.b32
+4
View File
@@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
# directories # directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/demo/whoisrouter/makefile.b32
+4
View File
@@ -27,9 +27,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
# directories # directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/demo/writefile/makefile.b32
+4
View File
@@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
# directories # directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/demo/writeprop/makefile.b32
+4
View File
@@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
# directories # directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\object
BACNET_HANDLER = ..\handler
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include
# #
bacnet-stack/ports/win32/MAKEFILE.MAK
+4
View File
@@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib
# directories # directories
BACNET_PORT = . BACNET_PORT = .
BACNET_INCLUDE = ..\..\include BACNET_INCLUDE = ..\..\include
BACNET_OBJECT = ..\..\demo\object
BACNET_HANDLER = ..\..\demo\handler
BACNET_CORE = ..\..\src BACNET_CORE = ..\..\src
INCLUDES = \ INCLUDES = \
-I$(BACNET_INCLUDE) \ -I$(BACNET_INCLUDE) \
-I$(BACNET_OBJECT) \
-I$(BACNET_HANDLER) \
-I$(BACNET_PORT) \ -I$(BACNET_PORT) \
-I$(BORLAND_DIR)\include -I$(BORLAND_DIR)\include