Removed the object-table function macros from each demo object header file since it was very difficult to maintain when new functions are added. Added device-client.c file which is a small device object just for simple clients. Updated most Makefiles of client demo applications to utilize device-client.c file.

Added two device object table functions for COV support.
Corrected demo COV handler interaction with TSM, COV flags, and multiple subscriptions for the same object.

bacnet-stack/demo/dcc/Makefile

@@ -8,7 +8,8 @@ TARGET = bacdcc
 
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = main.c
+SRCS = main.c \
+	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}
 

bacnet-stack/demo/dcc/main.c

@@ -51,13 +51,6 @@
 #include "txbuf.h"
 #include "dlenv.h"
 
-/* All included BACnet objects */
-static object_functions_t Object_Table[] = {
-    {DEVICE_OBJ_FUNCTIONS},
-    {MAX_BACNET_OBJECT_TYPE, NULL, NULL, NULL,
-        NULL, NULL, NULL, NULL, NULL, NULL}
-};
-
 /* buffer used for receive */
 static uint8_t Rx_Buf[MAX_MPDU] = { 0 };
 
@@ -123,7 +116,7 @@ void MyDeviceCommunicationControlSimpleAckHandler(
 static void Init_Service_Handlers(
     void)
 {
-    Device_Init(&Object_Table[0]);
+    Device_Init(NULL);
     /* we need to handle who-is
        to support dynamic device binding to us */
     apdu_set_unconfirmed_handler(SERVICE_UNCONFIRMED_WHO_IS, handler_who_is);

bacnet-stack/demo/dcc/makefile.b32

@@ -12,7 +12,7 @@ BORLAND_DIR_Not_Defined:
 !endif
 
 # target
-PRODUCT = bacdcc
+PRODUCT = bacdcc ..\handler\device-client.c
 PRODUCT_EXE = $(PRODUCT).exe
 
 # tools
@@ -42,7 +42,8 @@ BACNET_DEFINES = -DPRINT_ENABLED=1 -DBACAPP_ALL
 BACDL_DEFINE=-DBACDL_BIP=1 -DUSE_INADDR=1
 DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
 
-SRCS = main.c
+SRCS = main.c \
+	$(BACNET_OBJECT)\device-client.c
 
 OBJS = $(SRCS:.c=.obj)