Added WriteProperty support to Binary Inputs, as well as adding out-of-service. Prepping for COV.

bacnet-stack/demo/handler/h_cov.c

@@ -0,0 +1,185 @@
+/**************************************************************************
+*
+* Copyright (C) 2007 Steve Karg <skarg@users.sourceforge.net>
+*
+* Permission is hereby granted, free of charge, to any person obtaining
+* a copy of this software and associated documentation files (the
+* "Software"), to deal in the Software without restriction, including
+* without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Software, and to
+* permit persons to whom the Software is furnished to do so, subject to
+* the following conditions:
+*
+* The above copyright notice and this permission notice shall be included
+* in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*
+*********************************************************************/
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include "config.h"
+#include "txbuf.h"
+#include "bacdef.h"
+#include "bacdcode.h"
+#include "apdu.h"
+#include "npdu.h"
+#include "abort.h"
+#include "cov.h"
+/* demo objects */
+#include "device.h"
+#include "ai.h"
+#include "ao.h"
+#include "av.h"
+#include "bi.h"
+#include "bo.h"
+#include "bv.h"
+#include "lc.h"
+#include "lsp.h"
+#include "mso.h"
+#if defined(BACFILE)
+    #include "bacfile.h"
+#endif
+
+typedef struct BACnet_COV_Subscription {
+    bool valid;
+    uint32_t subscriberProcessIdentifier;
+    BACNET_OBJECT_ID monitoredObjectIdentifier;
+    bool issueConfirmedNotifications;   /* optional */
+    unsigned lifetime;          /* optional */
+    BACNET_PROPERTY_REFERENCE monitoredProperty;
+    bool covIncrementPresent;   /* true if present */
+    float covIncrement;         /* optional */
+} BACNET_COV_SUBSCRIPTION;
+
+#define MAX_COV_SUBCRIPTIONS 32
+static BACNET_COV_SUBSCRIPTION COV_Subscriptions[MAX_COV_SUBCRIPTIONS];
+
+void handler_cov_init(void)
+{
+    unsigned index = 0;
+
+    for (index = 0; index < MAX_COV_SUBCRIPTIONS; index++) {
+        COV_Subscriptions[index].valid = false;
+        COV_Subscriptions[index].subscriberProcessIdentifier = 0;
+        COV_Subscriptions[index].monitoredObjectIdentifier.type = OBJECT_ANALOG_INPUT;
+        COV_Subscriptions[index].monitoredObjectIdentifier.instance = 0;
+        COV_Subscriptions[index].issueConfirmedNotifications = false;
+        COV_Subscriptions[index].lifetime = 0;
+        COV_Subscriptions[index].monitoredProperty.propertyIdentifier = PROP_ALL;
+        COV_Subscriptions[index].monitoredProperty.propertyArrayIndex = -1;
+        COV_Subscriptions[index].covIncrementPresent = false;
+        COV_Subscriptions[index].covIncrement = 0;
+    }
+}
+
+void handler_cov_task(void)
+{
+    /* handle timeouts */
+    /* handle COV notifications */
+}
+
+static bool cov_subscribe(
+    BACNET_SUBSCRIBE_COV_DATA *cov_data,
+    BACNET_ERROR_CLASS * error_class,
+    BACNET_ERROR_CODE * error_code)
+{
+    bool status = false; /* return value */
+
+    switch (cov_data->monitoredObjectIdentifier.type) {
+        case OBJECT_BINARY_INPUT:
+            status = true;
+            break;
+        default:
+            break;
+    }
+
+    return status;
+}
+
+void handler_cov_subscribe(uint8_t * service_request,
+    uint16_t service_len,
+    BACNET_ADDRESS * src, BACNET_CONFIRMED_SERVICE_DATA * service_data)
+{
+    BACNET_SUBSCRIBE_COV_DATA cov_data;
+    int len = 0;
+    int pdu_len = 0;
+    BACNET_NPDU_DATA npdu_data;
+    bool success = false;
+    int bytes_sent = 0;
+    BACNET_ERROR_CLASS error_class = ERROR_CLASS_OBJECT;
+    BACNET_ERROR_CODE error_code = ERROR_CODE_UNKNOWN_OBJECT;
+    BACNET_ADDRESS my_address;
+
+    /* encode the NPDU portion of the packet */
+    datalink_get_my_address(&my_address);
+    npdu_encode_npdu_data(&npdu_data, false, MESSAGE_PRIORITY_NORMAL);
+    pdu_len = npdu_encode_pdu(&Handler_Transmit_Buffer[0], src,
+        &my_address, &npdu_data);
+    if (service_data->segmented_message) {
+        /* we don't support segmentation - send an abort */
+        len = abort_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
+            service_data->invoke_id,
+            ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, true);
+#if PRINT_ENABLED
+        fprintf(stderr, "SubscribeCOV: Segmented message.  Sending Abort!\n");
+#endif
+        goto COV_ABORT;
+    }
+    len = cov_subscribe_decode_service_request(service_request,
+        service_len, &cov_data);
+#if PRINT_ENABLED
+    if (len <= 0)
+        fprintf(stderr, "SubscribeCOV: Unable to decode Request!\n");
+#endif
+    if (len < 0) {
+        /* bad decoding - send an abort */
+        len = abort_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
+            service_data->invoke_id, ABORT_REASON_OTHER, true);
+#if PRINT_ENABLED
+        fprintf(stderr, "SubscribeCOV: Bad decoding.  Sending Abort!\n");
+#endif
+        goto COV_ABORT;
+    }
+    success = cov_subscribe(&cov_data, &error_class, &error_code);
+    if (success) {
+        len = encode_simple_ack(
+            &Handler_Transmit_Buffer[pdu_len],
+            service_data->invoke_id,
+            SERVICE_CONFIRMED_SUBSCRIBE_COV);
+#if PRINT_ENABLED
+        fprintf(stderr,
+            "SubscribeCOV: Sending Simple Ack!\n");
+#endif
+    } else {
+        len = bacerror_encode_apdu(
+            &Handler_Transmit_Buffer[pdu_len],
+            service_data->invoke_id,
+            SERVICE_CONFIRMED_SUBSCRIBE_COV,
+            error_class,
+            error_code);
+#if PRINT_ENABLED
+        fprintf(stderr,
+            "SubscribeCOV: Sending Error!\n");
+#endif
+    }
+COV_ABORT:
+    pdu_len += len;
+    bytes_sent = datalink_send_pdu(src, &npdu_data,
+        &Handler_Transmit_Buffer[0], pdu_len);
+#if PRINT_ENABLED
+    if (bytes_sent <= 0)
+        fprintf(stderr, "SubscribeCOV: Failed to send PDU (%s)!\n", strerror(errno));
+#endif
+
+    return;
+}

bacnet-stack/demo/handler/h_wp.c

@@ -122,8 +122,26 @@ void handler_write_property(
 #endif
             }
             break;
-        case OBJECT_ANALOG_INPUT:
         case OBJECT_BINARY_INPUT:
+            if (Binary_Input_Write_Property(&wp_data, &error_class,
+                    &error_code)) {
+                len =
+                    encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
+#if PRINT_ENABLED
+                fprintf(stderr, "WP: Sending Simple Ack for BI!\n");
+#endif
+            } else {
+                len =
+                    bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY,
+                    error_class, error_code);
+#if PRINT_ENABLED
+                fprintf(stderr, "WP: Sending Write Access Error for BI!\n");
+#endif
+            }
+            break;
+        case OBJECT_ANALOG_INPUT:
             error_class = ERROR_CLASS_PROPERTY;
             error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
             len =

bacnet-stack/demo/object/bi.c

@@ -31,11 +31,15 @@
 #include "bacdef.h"
 #include "bacdcode.h"
 #include "bacenum.h"
+#include "wp.h"
 #include "config.h"     /* the custom stuff */
 
 #define MAX_BINARY_INPUTS 5
 
+/* stores the current value */
 static BACNET_BINARY_PV Present_Value[MAX_BINARY_INPUTS];
+/* out of service decouples physical input from Present_Value */
+static bool Out_Of_Service[MAX_BINARY_INPUTS];
 
 /* These three arrays are used by the ReadPropertyMultiple handler */
 static const int Binary_Input_Properties_Required[] = {
@@ -150,6 +154,46 @@ static BACNET_BINARY_PV Binary_Input_Present_Value(
     return value;
 }
 
+static bool Binary_Input_Out_Of_Service(
+    uint32_t object_instance)
+{
+    bool value = false;
+    unsigned index = 0;
+
+    Binary_Input_Init();
+    index = Binary_Input_Instance_To_Index(object_instance);
+    if (index < MAX_BINARY_INPUTS)
+        value = Out_Of_Service[index];
+
+    return value;
+}
+
+static void Binary_Input_Present_Value_Set(
+    uint32_t object_instance, BACNET_BINARY_PV value)
+{
+    unsigned index = 0;
+
+    Binary_Input_Init();
+    index = Binary_Input_Instance_To_Index(object_instance);
+    if (index < MAX_BINARY_INPUTS)
+        Present_Value[index] = value;
+
+    return;
+}
+
+static void Binary_Input_Out_Of_Service_Set(
+    uint32_t object_instance, bool value)
+{
+    unsigned index = 0;
+
+    Binary_Input_Init();
+    index = Binary_Input_Instance_To_Index(object_instance);
+    if (index < MAX_BINARY_INPUTS)
+        Out_Of_Service[index] = value;
+
+    return;
+}
+
 char *Binary_Input_Name(
     uint32_t object_instance)
 {
@@ -179,7 +223,6 @@ int Binary_Input_Encode_Property_APDU(
     BACNET_CHARACTER_STRING char_string;
     BACNET_POLARITY polarity = POLARITY_NORMAL;
 
-
     (void) array_index;
     Binary_Input_Init();
     switch (property) {
@@ -221,7 +264,8 @@ int Binary_Input_Encode_Property_APDU(
                 encode_application_enumerated(&apdu[0], EVENT_STATE_NORMAL);
             break;
         case PROP_OUT_OF_SERVICE:
-            apdu_len = encode_application_boolean(&apdu[0], false);
+            apdu_len = encode_application_boolean(&apdu[0],
+                Binary_Input_Out_Of_Service(object_instance));
             break;
         case PROP_POLARITY:
             apdu_len = encode_application_enumerated(&apdu[0], polarity);
@@ -236,6 +280,66 @@ int Binary_Input_Encode_Property_APDU(
     return apdu_len;
 }
 
+/* returns true if successful */
+bool Binary_Input_Write_Property(
+    BACNET_WRITE_PROPERTY_DATA * wp_data,
+    BACNET_ERROR_CLASS * error_class,
+    BACNET_ERROR_CODE * error_code)
+{
+    bool status = false;        /* return value */
+    int len = 0;
+    BACNET_APPLICATION_DATA_VALUE value;
+
+    Binary_Input_Init();
+    if (!Binary_Input_Valid_Instance(wp_data->object_instance)) {
+        *error_class = ERROR_CLASS_OBJECT;
+        *error_code = ERROR_CODE_UNKNOWN_OBJECT;
+        return false;
+    }
+    /* decode the some of the request */
+    len =
+        bacapp_decode_application_data(wp_data->application_data,
+        wp_data->application_data_len, &value);
+    /* FIXME: len < application_data_len: more data? */
+    /* FIXME: len == 0: unable to decode? */
+    switch (wp_data->object_property) {
+        case PROP_PRESENT_VALUE:
+            if (value.tag == BACNET_APPLICATION_TAG_ENUMERATED) {
+                if ((value.type.Enumerated >= MIN_BINARY_PV) &&
+                    (value.type.Enumerated <= MAX_BINARY_PV)) {
+                    Binary_Input_Present_Value_Set(
+                        wp_data->object_instance,
+                        (BACNET_BINARY_PV) value.type.Enumerated);
+                    status = true;
+                } else {
+                    *error_class = ERROR_CLASS_PROPERTY;
+                    *error_code = ERROR_CODE_VALUE_OUT_OF_RANGE;
+                }
+            } else {
+                *error_class = ERROR_CLASS_PROPERTY;
+                *error_code = ERROR_CODE_INVALID_DATA_TYPE;
+            }
+            break;
+        case PROP_OUT_OF_SERVICE:
+            if (value.tag == BACNET_APPLICATION_TAG_BOOLEAN) {
+                Binary_Input_Out_Of_Service_Set(
+                    wp_data->object_instance,
+                    value.type.Boolean);
+                status = true;
+            } else {
+                *error_class = ERROR_CLASS_PROPERTY;
+                *error_code = ERROR_CODE_INVALID_DATA_TYPE;
+            }
+            break;
+        default:
+            *error_class = ERROR_CLASS_PROPERTY;
+            *error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
+            break;
+    }
+
+    return status;
+}
+
 #ifdef TEST
 #include <assert.h>
 #include <string.h>

bacnet-stack/demo/object/device.c

@@ -874,6 +874,8 @@ int Device_Encode_Property_APDU(
                 encode_application_unsigned(&apdu[0], dlmstp_max_master());
             break;
 #endif
+        case PROP_ACTIVE_COV_SUBSCRIPTIONS:
+            break;
         default:
             *error_class = ERROR_CLASS_PROPERTY;
             *error_code = ERROR_CODE_UNKNOWN_PROPERTY;

bacnet-stack/demo/server/bacserv.cbp

@@ -44,234 +44,21 @@
 			<Add option="-O" />
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
-			<Add option="-DBACDL_BIP=1" />
-			<Add option="-DBIP_DEBUG=1" />
-			<Add option="-DUSE_INADDR=1" />
+			<Add option="-DBACDL_BIP" />
 			<Add option="-DPRINT_ENABLED=1" />
-			<Add option="-DBIG_ENDIAN=0" />
-			<Add option="-DMAX_TSM_TRANSACTIONS=0" />
-			<Add directory="." />
+			<Add option="-DBACAPP_ALL" />
+			<Add directory="..\..\include" />
 			<Add directory="..\handler" />
 			<Add directory="..\object" />
-			<Add directory="..\..\..\bacnet-stack" />
 			<Add directory="..\..\ports\win32" />
 		</Compiler>
 		<Linker>
+			<Add library="..\..\lib\libbacnet.a" />
 			<Add library="ws2_32" />
 		</Linker>
-		<Unit filename="..\..\abort.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\abort.h" />
-		<Unit filename="..\..\apdu.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\apdu.h" />
-		<Unit filename="..\..\arf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\arf.h" />
-		<Unit filename="..\..\awf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\awf.h" />
-		<Unit filename="..\..\bacapp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\bacapp.h" />
-		<Unit filename="..\..\bacdcode.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\bacdcode.h" />
-		<Unit filename="..\..\bacdef.h" />
-		<Unit filename="..\..\bacenum.h" />
-		<Unit filename="..\..\bacerror.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\bacerror.h" />
-		<Unit filename="..\..\bacint.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\bacint.h" />
-		<Unit filename="..\..\bacstr.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\bacstr.h" />
-		<Unit filename="..\..\bactext.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\bactext.h" />
-		<Unit filename="..\..\bip.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\bip.h" />
-		<Unit filename="..\..\crc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\crc.h" />
-		<Unit filename="..\..\datalink.h" />
-		<Unit filename="..\..\datetime.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\datetime.h" />
-		<Unit filename="..\..\dcc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\dcc.h" />
-		<Unit filename="..\handler\h_arf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\handler\h_awf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\handler\h_dcc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\handler\h_rd.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<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>
-		<Unit filename="..\handler\h_whohas.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\handler\h_whois.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\handler\h_wp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\handler\handlers.h" />
-		<Unit filename="..\handler\noserv.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\handler\s_ihave.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\handler\txbuf.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\object\ai.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\object\ai.h" />
-		<Unit filename="..\object\ao.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\object\ao.h" />
-		<Unit filename="..\object\av.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\object\av.h" />
-		<Unit filename="..\object\bacfile.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\object\bacfile.h" />
-		<Unit filename="..\object\bi.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\object\bi.h" />
-		<Unit filename="..\object\bo.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\object\bo.h" />
-		<Unit filename="..\object\bv.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\object\bv.h" />
-		<Unit filename="..\object\device.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\object\device.h" />
-		<Unit filename="..\object\lc.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\object\lc.h" />
-		<Unit filename="..\object\lsp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\object\lsp.h" />
-		<Unit filename="..\object\mso.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\object\mso.h" />
 		<Unit filename="main.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\iam.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\iam.h" />
-		<Unit filename="..\..\ihave.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\ihave.h" />
-		<Unit filename="..\..\indtext.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\indtext.h" />
-		<Unit filename="..\..\mstp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\npdu.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\npdu.h" />
-		<Unit filename="..\..\ports\win32\bip-init.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\ports\win32\dlmstp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\ports\win32\mstp.h" />
-		<Unit filename="..\..\ports\win32\net.h" />
-		<Unit filename="..\..\ports\win32\rs485.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\ports\win32\rs485.h" />
-		<Unit filename="..\..\rd.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\rd.h" />
-		<Unit filename="..\..\reject.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\reject.h" />
-		<Unit filename="..\..\rp.c">
-			<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>
-		<Unit filename="..\..\timesync.h" />
-		<Unit filename="..\..\version.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\version.h" />
-		<Unit filename="..\..\whohas.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\whohas.h" />
-		<Unit filename="..\..\whois.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\whois.h" />
-		<Unit filename="..\..\wp.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="..\..\wp.h" />
 		<Extensions>
 			<code_completion />
 			<envvars />

bacnet-stack/include/bi.h

@@ -54,6 +54,12 @@ extern "C" {
         BACNET_ERROR_CLASS * error_class,
         BACNET_ERROR_CODE * error_code);
 
+    bool Binary_Input_Write_Property(
+        BACNET_WRITE_PROPERTY_DATA * wp_data,
+        BACNET_ERROR_CLASS * error_class,
+        BACNET_ERROR_CODE * error_code);
+
+
 #ifdef TEST
 #include "ctest.h"
     void testBinaryInput(

bacnet-stack/lib/bacnet.cbp

@@ -45,7 +45,6 @@
 		<Linker>
 			<Add library="ws2_32" />
 		</Linker>
-		<Unit filename="..\demo\handler\client.h" />
 		<Unit filename="..\demo\handler\h_arf.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -91,7 +90,6 @@
 		<Unit filename="..\demo\handler\h_wp.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\demo\handler\handlers.h" />
 		<Unit filename="..\demo\handler\noserv.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -131,51 +129,44 @@
 		<Unit filename="..\demo\object\ai.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\demo\object\ai.h" />
 		<Unit filename="..\demo\object\ao.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\demo\object\ao.h" />
 		<Unit filename="..\demo\object\av.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\demo\object\av.h" />
 		<Unit filename="..\demo\object\bacfile.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\demo\object\bacfile.h" />
 		<Unit filename="..\demo\object\bi.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\demo\object\bi.h" />
 		<Unit filename="..\demo\object\bo.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\demo\object\bo.h" />
 		<Unit filename="..\demo\object\bv.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\demo\object\bv.h" />
 		<Unit filename="..\demo\object\device.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\demo\object\device.h" />
 		<Unit filename="..\demo\object\lc.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\demo\object\lc.h" />
 		<Unit filename="..\demo\object\lsp.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\demo\object\lsp.h" />
 		<Unit filename="..\demo\object\mso.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\demo\object\mso.h" />
 		<Unit filename="..\include\abort.h" />
 		<Unit filename="..\include\address.h" />
+		<Unit filename="..\include\ai.h" />
+		<Unit filename="..\include\ao.h" />
 		<Unit filename="..\include\apdu.h" />
+		<Unit filename="..\include\arcnet.h" />
 		<Unit filename="..\include\arf.h" />
+		<Unit filename="..\include\av.h" />
 		<Unit filename="..\include\awf.h" />
 		<Unit filename="..\include\bacaddr.h" />
 		<Unit filename="..\include\bacapp.h" />
@@ -183,32 +174,54 @@
 		<Unit filename="..\include\bacdef.h" />
 		<Unit filename="..\include\bacenum.h" />
 		<Unit filename="..\include\bacerror.h" />
+		<Unit filename="..\include\bacfile.h" />
 		<Unit filename="..\include\bacint.h" />
+		<Unit filename="..\include\bacnet.h" />
 		<Unit filename="..\include\bacprop.h" />
+		<Unit filename="..\include\bacreal.h" />
 		<Unit filename="..\include\bacstr.h" />
 		<Unit filename="..\include\bactext.h" />
+		<Unit filename="..\include\bi.h" />
+		<Unit filename="..\include\bigend.h" />
 		<Unit filename="..\include\bip.h" />
 		<Unit filename="..\include\bits.h" />
+		<Unit filename="..\include\bo.h" />
+		<Unit filename="..\include\bv.h" />
+		<Unit filename="..\include\bvlc.h" />
+		<Unit filename="..\include\bytes.h" />
+		<Unit filename="..\include\client.h" />
 		<Unit filename="..\include\config.h" />
 		<Unit filename="..\include\cov.h" />
 		<Unit filename="..\include\crc.h" />
 		<Unit filename="..\include\datalink.h" />
 		<Unit filename="..\include\datetime.h" />
 		<Unit filename="..\include\dcc.h" />
+		<Unit filename="..\include\device.h" />
 		<Unit filename="..\include\dlmstp.h" />
 		<Unit filename="..\include\ethernet.h" />
 		<Unit filename="..\include\filename.h" />
+		<Unit filename="..\include\handlers.h" />
 		<Unit filename="..\include\iam.h" />
 		<Unit filename="..\include\ihave.h" />
 		<Unit filename="..\include\indtext.h" />
+		<Unit filename="..\include\key.h" />
+		<Unit filename="..\include\keylist.h" />
+		<Unit filename="..\include\lc.h" />
+		<Unit filename="..\include\lo.h" />
+		<Unit filename="..\include\lsp.h" />
+		<Unit filename="..\include\mso.h" />
 		<Unit filename="..\include\mstp.h" />
+		<Unit filename="..\include\mstptext.h" />
 		<Unit filename="..\include\npdu.h" />
 		<Unit filename="..\include\rd.h" />
 		<Unit filename="..\include\reject.h" />
+		<Unit filename="..\include\ringbuf.h" />
 		<Unit filename="..\include\rp.h" />
 		<Unit filename="..\include\rpm.h" />
+		<Unit filename="..\include\sbuf.h" />
 		<Unit filename="..\include\timesync.h" />
 		<Unit filename="..\include\tsm.h" />
+		<Unit filename="..\include\txbuf.h" />
 		<Unit filename="..\include\version.h" />
 		<Unit filename="..\include\whohas.h" />
 		<Unit filename="..\include\whois.h" />