From f9d56ef4885d5486f575195627b5fa2c17e94c56 Mon Sep 17 00:00:00 2001
From: Alex Fontaine <afontaine@chipkin.com>
Date: Tue, 29 Oct 2024 16:16:46 -0700
Subject: [PATCH 1/4] Updated stack to 5.1.2 and cleaned up project

---
 .gitlab-ci.yml                                |  106 -
 .gitmodules                                   |    3 -
 BACnetClientExample/BACnetClientExample.cpp   |   39 +-
 .../BACnetClientExample.vcxproj               |   80 +-
 .../BACnetClientExample.vcxproj.filters       | 2767 ++++++++---------
 README.md                                     |    2 +-
 submodules/readme.md                          |   12 +
 7 files changed, 1454 insertions(+), 1555 deletions(-)
 delete mode 100644 .gitlab-ci.yml
 delete mode 100644 .gitmodules
 create mode 100644 submodules/readme.md

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index e666296..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-variables:
-  GIT_SUBMODULE_STRATEGY: recursive
-  
-stages:
-  - download
-  - build
-  - ZipUp
-
-#
-# Download CBACnet Stack libaries 
-# -----------------------------------------------------------------------------
-# How to download artifacts from jobs in Gitlab CI https://docs.gitlab.com/ee/api/jobs.html#download-the-artifacts-archive 
-# Note: the SETTING_PRIVATE_TOKEN parameter is a enviment variable, generated by Steven's user. 
-# 
-Download BACnet Stack Libaries:
-  stage: download
-  tags:
-    - docker
-  image: alpine:latest
-  variables:
-    GIT_SUBMODULE_STRATEGY: none
-  script:
-    # Install Zip and curl 
-    - "apk --no-cache add unzip curl"
-    - 'curl --location --output CASBACnetStackLibs.zip --header "PRIVATE-TOKEN: $SETTING_PRIVATE_TOKEN" "https://gitlab.com/api/v4/projects/7281208/jobs/artifacts/master/download?job=Windows%20Release%20Win32%20CASBACnetStack%20LIB&job_token=$CI_JOB_TOKEN"'
-    - unzip CASBACnetStackLibs.zip && rm -f CASBACnetStackLibs.zip
-    - 'curl --location --output CASBACnetStackLibs.zip --header "PRIVATE-TOKEN: $SETTING_PRIVATE_TOKEN" "https://gitlab.com/api/v4/projects/7281208/jobs/artifacts/master/download?job=Linux-Ubuntu%20Release%20x64%20CASBACnetStack&job_token=$CI_JOB_TOKEN"'
-    - unzip CASBACnetStackLibs.zip && rm -f CASBACnetStackLibs.zip
-    - ls -ls bin/ 
-  artifacts:
-    expire_in: 1 days
-    paths:
-      - bin/*.lib
-      - bin/*.a
-
-# Build the windows version 
-Windows Win32 Release:
-  stage: build
-  tags:
-    - windows
-    - msvs
-  before_script:
-    # Add MSBuild.exe to path
-    - set PATH=%PATH%;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin
-    # Update the CIBuildVersion.cs
-    - "echo const int CI_PIPELINE_IID = %CI_PIPELINE_IID% >BACnetClientExample/CIBuildSettings.h"
-    - type BACnetClientExample\CIBuildVersion.h
-  script:
-    # Create the bin directory if it does not exist
-    - cd BACnetClientExample
-    # Build and package the project in an apk for android
-    - msbuild /p:Configuration=Release /p:Platform="x86"
-    - cd ..\bin
-    - dir
-  artifacts:
-    expire_in: 1 days
-    paths:
-      - bin/BACnetClientExample_Win32_Release.exe
-  dependencies:
-    - Download BACnet Stack Libaries
-
-# Build the linux 64bit version 
-Linux 64Bit Release:
-  stage: build
-  tags:
-    - docker     
-  image: ssmethurst/ubuntudev-18_04:latest
-  before_script:
-    # Update the CIBuildVersion.cs
-    - echo -e "const int CI_PIPELINE_IID = $CI_PIPELINE_IID\n" >BACnetClientExample/CIBuildSettings.h 
-    # debug info 
-    - "gcc -v"   
-  script:
-    - "make"
-    - "make install"
-  artifacts:
-    expire_in: 1 days
-    paths:
-      - bin/BACnetClientExampleCPP_linux_x64_Release
-  dependencies:
-    - Download BACnet Stack Libaries    
-
-
-# CreateZip
-Create Zip:
-  stage: ZipUp
-  tags:
-    - docker
-  image: alpine:latest
-  variables:
-    GIT_SUBMODULE_STRATEGY: none  
-  only:
-    - master
-  dependencies:
-    - Linux 64Bit Release
-    - Windows Win32 Release
-  script:
-    # Install Zip 
-    - "apk --no-cache add zip"
-    # Remove the old zip if it exists for some reason     
-    - "rm -f BACnetClientExampleCPP_build$CIPIPELINE_IID.zip"
-    # Add all the compiled libaries from other jobs. 
-    - "zip BACnetClientExampleCPP_build$CI_PIPELINE_IID.zip -r9 bin/BACnetClientExampleCPP_linux_x64_Release bin/BACnetClientExample_Win32_Release.exe"
-  artifacts:
-    paths:
-      - BACnetClientExampleCPP_build$CI_PIPELINE_IID.zip
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 14d88e9..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "submodules/cas-bacnet-stack"]
-	path = submodules/cas-bacnet-stack
-	url = https://gitlab.com/chipkin/cas-bacnet-stack.git
diff --git a/BACnetClientExample/BACnetClientExample.cpp b/BACnetClientExample/BACnetClientExample.cpp
index bbee6f9..5fa2648 100644
--- a/BACnetClientExample/BACnetClientExample.cpp
+++ b/BACnetClientExample/BACnetClientExample.cpp
@@ -79,7 +79,7 @@ std::string downstream_Device_ip_address;
 
 // Callback Functions to Register to the DLL
 // Message Functions
-uint16_t CallbackReceiveMessage(uint8_t* message, const uint16_t maxMessageLength, uint8_t* receivedConnectionString, const uint8_t maxConnectionStringLength, uint8_t* receivedConnectionStringLength, uint8_t* networkType);
+uint16_t CallbackReceiveMessage(uint8_t* message, const uint16_t maxMessageLength, uint8_t* sourceConnectionString, uint8_t* sourceConnectionStringLength, uint8_t* destinationConnectionString, uint8_t* destinationConnectionStringLength, const uint8_t maxConnectionStringLength, uint8_t* networkType);
 uint16_t CallbackSendMessage(const uint8_t* message, const uint16_t messageLength, const uint8_t* connectionString, const uint8_t connectionStringLength, const uint8_t networkType, bool broadcast);
 
 // System Functions
@@ -126,6 +126,7 @@ void ExampleWhoIs();
 void ExampleReadProperty(); 
 void ExampleWriteProperty();
 void ExampleSubscribeCOV();
+void ExampleSubscribeCOVProperty();
 void ExampleConfirmedTextMessage();
 
 int main(int argc, char ** argv )
@@ -242,7 +243,7 @@ int main(int argc, char ** argv )
 	std::cout << "FYI: Entering main loop..." << std::endl;
 	for (;;) {
 		// Call the DLLs loop function which checks for messages and processes them.
-		fpLoop();
+		fpTick();
 
 		// Handle any user input.
 		if (!DoUserInput()) {
@@ -291,6 +292,10 @@ bool DoUserInput()
 			ExampleSubscribeCOV();
 			break;
 		}
+		case 'p': {
+			ExampleSubscribeCOVProperty();
+			break;
+		}
 		case 't': {
 			ExampleConfirmedTextMessage();
 			break;
@@ -325,7 +330,7 @@ bool DoUserInput()
 void WaitForResponse(unsigned int timeout /*=3*/) {
 	time_t expireTime = time(0) + timeout;
 	while (time(0) < expireTime) {
-		fpLoop();
+		fpTick();
 	}
 }
 
@@ -437,7 +442,7 @@ void ExampleSubscribeCOV() {
 
 	// Subscribe to the analog input and analog value objects in the server example
 
-	std::cout << "Sending Subscribe COV Request. Analog Input, INSTANCE=[0], timeToLive = " << timeToLive << ", processIdentifier = " << analogValueProcessIdentifier << std::endl;
+	std::cout << "Sending Subscribe COV Request. Analog Input, INSTANCE=[0], timeToLive = " << timeToLive << ", processIdentifier = " << analogInputProcessIdentifier << std::endl;
 	fpSendSubscribeCOV(&invokeId, analogInputProcessIdentifier, CASBACnetStackExampleConstants::OBJECT_TYPE_ANALOG_INPUT, 0, false, timeToLive, downstreamConnectionString, 6, 0, 0, NULL, 0);
 
 	WaitForResponse();
@@ -448,6 +453,18 @@ void ExampleSubscribeCOV() {
 	WaitForResponse();
 }
 
+void ExampleSubscribeCOVProperty() {
+	const uint16_t timeToLive = 60 * 5; // 5 Min subscription time 
+
+	// Local process identifier, must be unique for each subscribe COV request
+	const uint16_t analogValueProcessIdentifier = 0;
+
+	// Subscribe to the analog input and analog value objects in the server example
+
+	std::cout << "Sending Subscribe COV Property Request. Analog Value, INSTANCE=[2], timeToLive = " << timeToLive << ", processIdentifier = " << analogValueProcessIdentifier << std::endl;
+	fpSendSubscribeCOVProperty(&invokeId, analogValueProcessIdentifier, CASBACnetStackExampleConstants::OBJECT_TYPE_ANALOG_VALUE, 2, CASBACnetStackExampleConstants::PROPERTY_IDENTIFIER_PRESENT_VALUE, false, 0, true, 5.0f, false, timeToLive, downstreamConnectionString, 6, 0, 0, NULL, 0);
+}
+
 void ExampleConfirmedTextMessage() {
 	// Text message settings
 	bool useMessageClass = true; // Enable or disable message class property
@@ -471,14 +488,14 @@ void ExampleConfirmedTextMessage() {
 
 
 // Callback used by the BACnet Stack to check if there is a message to process
-uint16_t CallbackReceiveMessage(uint8_t* message, const uint16_t maxMessageLength, uint8_t* receivedConnectionString, const uint8_t maxConnectionStringLength, uint8_t* receivedConnectionStringLength, uint8_t* networkType)
+uint16_t CallbackReceiveMessage(uint8_t* message, const uint16_t maxMessageLength, uint8_t* sourceConnectionString, uint8_t* sourceConnectionStringLength, uint8_t* destinationConnectionString, uint8_t* destinationConnectionStringLength, const uint8_t maxConnectionStringLength, uint8_t* networkType)
 {
 	// Check parameters
 	if (message == NULL || maxMessageLength == 0) {
 		std::cerr << "Invalid input buffer" << std::endl;
 		return 0;
 	}
-	if (receivedConnectionString == NULL || maxConnectionStringLength == 0) {
+	if (sourceConnectionString == NULL || maxConnectionStringLength == 0) {
 		std::cerr << "Invalid connection string buffer" << std::endl;
 		return 0;
 	}
@@ -497,14 +514,14 @@ uint16_t CallbackReceiveMessage(uint8_t* message, const uint16_t maxMessageLengt
 		std::cout << "FYI: Received message from [" << ipAddress << ":" << port << "], length [" << bytesRead << "]" << std::endl;
 
 		// Convert the IP Address to the connection string
-		if (!ChipkinCommon::ChipkinConvert::IPAddressToBytes(ipAddress, receivedConnectionString, maxConnectionStringLength)) {
+		if (!ChipkinCommon::ChipkinConvert::IPAddressToBytes(ipAddress, sourceConnectionString, maxConnectionStringLength)) {
 			std::cerr << "Failed to convert the ip address into a connectionString" << std::endl;
 			return 0;
 		}
-		receivedConnectionString[4] = port / 256;
-		receivedConnectionString[5] = port % 256;
+		sourceConnectionString[4] = port / 256;
+		sourceConnectionString[5] = port % 256;
 
-		*receivedConnectionStringLength = 6;
+		*sourceConnectionStringLength = 6;
 		*networkType = CASBACnetStackExampleConstants::NETWORK_TYPE_IP;
 
 		// Process the message as XML
@@ -568,7 +585,7 @@ uint16_t CallbackSendMessage(const uint8_t* message, const uint16_t messageLengt
 
 	// Get the XML rendered version of the just sent message
 	static char xmlRenderBuffer[MAX_XML_RENDER_BUFFER_LENGTH];
-	if (fpDecodeAsXML((char*)message, messageLength, xmlRenderBuffer, MAX_XML_RENDER_BUFFER_LENGTH, networkType) > 0) {
+	if (fpDecodeAsXML((char*)message, messageLength, xmlRenderBuffer, MAX_XML_RENDER_BUFFER_LENGTH, CASBACnetStackExampleConstants::NETWORK_TYPE_IP) > 0) {
 		std::cout << xmlRenderBuffer << std::endl << std::endl;
 		memset(xmlRenderBuffer, 0, MAX_XML_RENDER_BUFFER_LENGTH);
 	}
diff --git a/BACnetClientExample/BACnetClientExample.vcxproj b/BACnetClientExample/BACnetClientExample.vcxproj
index 534a00d..abd139e 100644
--- a/BACnetClientExample/BACnetClientExample.vcxproj
+++ b/BACnetClientExample/BACnetClientExample.vcxproj
@@ -73,22 +73,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)..\bin\</OutDir>
-    <TargetName>$(ProjectName)_$(Platform)_$(Configuration)</TargetName>
+    <TargetName>$(ProjectName)CPP_win_$(Platform)_$(Configuration)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)..\bin\</OutDir>
-    <TargetName>$(ProjectName)_$(Platform)_$(Configuration)</TargetName>
+    <TargetName>$(ProjectName)CPP_win_$(Platform)_$(Configuration)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)..\bin\</OutDir>
-    <TargetName>$(ProjectName)_$(Platform)_$(Configuration)</TargetName>
+    <TargetName>$(ProjectName)CPP_win_$(Platform)_$(Configuration)</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)..\bin\</OutDir>
-    <TargetName>$(ProjectName)_$(Platform)_$(Configuration)</TargetName>
+    <TargetName>$(ProjectName)CPP_win_$(Platform)_$(Configuration)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -96,21 +96,17 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_DEBUG;ENABLE_DATA_LINK_LAYER_IPV4;ENABLE_STRING_LITERALS
-;ENABLE_DECODE_AS_JSON
-;ENABLE_DECODE_AS_XML
-;ENABLE_BACNET_API_DEBUG_LOGGING
-;ENABLE_ALL_OBJECT_TYPES
-;ENABLE_ALL_BIBBS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\submodules\cas-bacnet-stack\submodules\cas-common\source;$(SolutionDir)..\submodules\cas-bacnet-stack\source;$(SolutionDir)..\submodules\cas-bacnet-stack\adapters\cpp;$(SolutionDir)..\bin\;;$(SolutionDir)..\submodules\cas-bacnet-stack\submodules\xml2json\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\submodules\cas-bacnet-stack\source;$(SolutionDir)..\submodules\cas-bacnet-stack\adapters\cpp;$(SolutionDir)..\submodules\cas-bacnet-stack\submodules\xml2json\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\bin\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);</AdditionalDependencies>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -119,21 +115,17 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_DEBUG;ENABLE_DATA_LINK_LAYER_IPV4;ENABLE_STRING_LITERALS
-;ENABLE_DECODE_AS_JSON
-;ENABLE_DECODE_AS_XML
-;ENABLE_BACNET_API_DEBUG_LOGGING
-;ENABLE_ALL_OBJECT_TYPES
-;ENABLE_ALL_BIBBS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\submodules\cas-bacnet-stack\submodules\cas-common\source;$(SolutionDir)..\submodules\cas-bacnet-stack\source;$(SolutionDir)..\submodules\cas-bacnet-stack\adapters\cpp;$(SolutionDir)..\bin\;;$(SolutionDir)..\submodules\cas-bacnet-stack\submodules\xml2json\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\submodules\cas-bacnet-stack\source;$(SolutionDir)..\submodules\cas-bacnet-stack\adapters\cpp;$(SolutionDir)..\submodules\cas-bacnet-stack\submodules\xml2json\include</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\bin\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);</AdditionalDependencies>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -144,14 +136,9 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;CAS_BACNET_STACK_LIB_TYPE_LIB;ENABLE_DATA_LINK_LAYER_IPV4;ENABLE_STRING_LITERALS
-;ENABLE_DECODE_AS_JSON
-;ENABLE_DECODE_AS_XML
-;ENABLE_BACNET_API_DEBUG_LOGGING
-;ENABLE_ALL_OBJECT_TYPES
-;ENABLE_ALL_BIBBS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\submodules\cas-bacnet-stack\submodules\cas-common\source;$(SolutionDir)..\submodules\cas-bacnet-stack\source;$(SolutionDir)..\submodules\cas-bacnet-stack\adapters\cpp;$(SolutionDir)..\bin\;;$(SolutionDir)..\submodules\cas-bacnet-stack\submodules\xml2json\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\submodules\cas-bacnet-stack\source;$(SolutionDir)..\submodules\cas-bacnet-stack\adapters\cpp;$(SolutionDir)..\submodules\cas-bacnet-stack\submodules\xml2json\include</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -159,8 +146,9 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\bin\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);CASBACnetStack_$(Platform)_$(Configuration).lib;</AdditionalDependencies>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -171,14 +159,9 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;CAS_BACNET_STACK_LIB_TYPE_LIB;ENABLE_DATA_LINK_LAYER_IPV4;ENABLE_STRING_LITERALS
-;ENABLE_DECODE_AS_JSON
-;ENABLE_DECODE_AS_XML
-;ENABLE_BACNET_API_DEBUG_LOGGING
-;ENABLE_ALL_OBJECT_TYPES
-;ENABLE_ALL_BIBBS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\submodules\cas-bacnet-stack\submodules\xml2json\include;$(SolutionDir)..\submodules\cas-bacnet-stack\submodules\cas-common\source;$(SolutionDir)..\submodules\cas-bacnet-stack\source;$(SolutionDir)..\submodules\cas-bacnet-stack\adapters\cpp;$(SolutionDir)..\bin\;$(SolutionDir)..\submodules\cas-bacnet-stack\submodules\xml2json\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\submodules\cas-bacnet-stack\submodules\xml2json\include;$(SolutionDir)..\submodules\cas-bacnet-stack\source;$(SolutionDir)..\submodules\cas-bacnet-stack\adapters\cpp</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -186,8 +169,9 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\bin\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);CASBACnetStack_$(Platform)_$(Configuration).lib;</AdditionalDependencies>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -571,12 +555,12 @@
     <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetWriteStatus.cpp" />
     <ClCompile Include="..\submodules\cas-bacnet-stack\source\CASBACnetStackDLL.cpp" />
     <ClCompile Include="..\submodules\cas-bacnet-stack\source\CErrorContainer.cpp" />
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\ChipkinConvert.cpp" />
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\ChipkinEndianness.cpp" />
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\ChipkinUtilities.cpp" />
     <ClCompile Include="..\submodules\cas-bacnet-stack\source\IRenderable.cpp" />
     <ClCompile Include="..\submodules\cas-bacnet-stack\source\MSTP.c" />
     <ClCompile Include="..\submodules\cas-bacnet-stack\source\XMLRenderer.cpp" />
-    <ClCompile Include="..\submodules\cas-bacnet-stack\submodules\cas-common\source\ChipkinConvert.cpp" />
-    <ClCompile Include="..\submodules\cas-bacnet-stack\submodules\cas-common\source\ChipkinEndianness.cpp" />
-    <ClCompile Include="..\submodules\cas-bacnet-stack\submodules\cas-common\source\ChipkinUtilities.cpp" />
     <ClCompile Include="BACnetClientExample.cpp" />
     <ClCompile Include="SimpleUDP.cpp" />
   </ItemGroup>
@@ -793,6 +777,7 @@
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetObjectPropertyReference.h" />
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetObjectSpecifier.h" />
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetObjectType.h" />
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetObjectTypesSupported.h" />
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetOptionalUnsigned.h" />
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetOriginalBroadcastNPDU.h" />
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetOriginalUnicastNPDU.h" />
@@ -974,20 +959,18 @@
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\CASBACnetStackDLL.h" />
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\CASBACnetStackOptions.h" />
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\CErrorContainer.h" />
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\ChipkinConvert.h" />
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\ChipkinEndianness.h" />
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\ChipkinRenderer.h" />
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\ChipkinUtilities.h" />
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\CIBuildSettings.h" />
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\datatypes.h" />
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\endianness.h" />
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\ICodable.h" />
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\IRenderable.h" />
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\licensee.h" />
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\MSTP.h" />
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\stdafx.h" />
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\version.h" />
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\XMLRenderer.h" />
-    <ClInclude Include="..\submodules\cas-bacnet-stack\submodules\cas-common\source\ChipkinConvert.h" />
-    <ClInclude Include="..\submodules\cas-bacnet-stack\submodules\cas-common\source\ChipkinEndianness.h" />
-    <ClInclude Include="..\submodules\cas-bacnet-stack\submodules\cas-common\source\ChipkinUtilities.h" />
     <ClInclude Include="CASBACnetStackExampleConstants.h" />
     <ClInclude Include="CIBuildSettings.h" />
     <ClInclude Include="SimpleUDP.h" />
@@ -995,7 +978,6 @@
   <ItemGroup>
     <None Include="..\CHANGELOG.md" />
     <None Include="..\README.md" />
-    <None Include="..\submodules\cas-bacnet-stack\source\readme.md" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/BACnetClientExample/BACnetClientExample.vcxproj.filters b/BACnetClientExample/BACnetClientExample.vcxproj.filters
index f6cf40e..ed07c95 100644
--- a/BACnetClientExample/BACnetClientExample.vcxproj.filters
+++ b/BACnetClientExample/BACnetClientExample.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -14,88 +14,91 @@
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
     <Filter Include="CASBACnetStack">
-      <UniqueIdentifier>{714ef473-5f5e-4aae-9060-f436a13d41a8}</UniqueIdentifier>
+      <UniqueIdentifier>{1c924753-92fd-474b-89bf-c6a549a1aa65}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CASBACnetStack\AlarmsAndEvents">
-      <UniqueIdentifier>{a6807b59-39ae-4790-a6d7-69460b80bf6f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="CASBACnetStack\AlarmsAndEvents\EventAlgorithms">
-      <UniqueIdentifier>{9625a9d2-2198-435e-b9e0-79c5d38938d9}</UniqueIdentifier>
+    <Filter Include="CASBACnetStack\Enumerated">
+      <UniqueIdentifier>{893c1bb9-4953-4e2b-9082-5ce147cb4a28}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CASBACnetStack\AlarmsAndEvents\FaultAlgorithms">
-      <UniqueIdentifier>{abc313ba-8bf7-4a55-a9d2-707c48a54340}</UniqueIdentifier>
+    <Filter Include="CASBACnetStack\Bitstrings">
+      <UniqueIdentifier>{1b825e28-98eb-48dc-b1f9-dc8181447bee}</UniqueIdentifier>
     </Filter>
     <Filter Include="CASBACnetStack\APDU">
-      <UniqueIdentifier>{932c987a-42bd-48d5-9964-0666d581bbbc}</UniqueIdentifier>
+      <UniqueIdentifier>{5efe85bd-1c16-4ad7-a7e1-d8164c3f482d}</UniqueIdentifier>
     </Filter>
     <Filter Include="CASBACnetStack\APDU\Primitives">
-      <UniqueIdentifier>{f922ae1a-ebe0-4603-aae5-fdf2878e42a1}</UniqueIdentifier>
+      <UniqueIdentifier>{7001ec39-cd56-4c1c-aec0-474272504cf4}</UniqueIdentifier>
     </Filter>
     <Filter Include="CASBACnetStack\APDU\Error Productions">
-      <UniqueIdentifier>{ca281001-2f37-42c4-adb1-5e2dfdc855d8}</UniqueIdentifier>
+      <UniqueIdentifier>{5b3ac646-94c6-4104-b7b6-d04071518be1}</UniqueIdentifier>
     </Filter>
     <Filter Include="CASBACnetStack\APDU\Base Types">
-      <UniqueIdentifier>{f64188d0-8163-4301-9bb8-becaafc183a4}</UniqueIdentifier>
+      <UniqueIdentifier>{193763e8-5be7-4054-8ff8-301b0e0132e6}</UniqueIdentifier>
     </Filter>
     <Filter Include="CASBACnetStack\APDU\Unconfirmed Service Productions">
-      <UniqueIdentifier>{237d0de0-379d-4fbb-87bf-7303a59265bd}</UniqueIdentifier>
+      <UniqueIdentifier>{156584bf-8730-4a2a-bb39-f5aa06c7ddbd}</UniqueIdentifier>
     </Filter>
     <Filter Include="CASBACnetStack\APDU\Confirmed Service Productions">
-      <UniqueIdentifier>{13403760-d5d0-48f1-9032-9b6a4398bece}</UniqueIdentifier>
+      <UniqueIdentifier>{d61373ab-6b59-4c58-aaeb-b624ebe413a2}</UniqueIdentifier>
     </Filter>
     <Filter Include="CASBACnetStack\APDU\Custom Types">
-      <UniqueIdentifier>{1c537008-17e7-4d71-a1b3-39da8b102b68}</UniqueIdentifier>
+      <UniqueIdentifier>{dbfb745a-c515-4ff3-a631-f37f284b44ab}</UniqueIdentifier>
     </Filter>
     <Filter Include="CASBACnetStack\APDU\Notification Parameters">
-      <UniqueIdentifier>{d7fbf3ce-d34f-48a6-932f-7a7bf73acfdc}</UniqueIdentifier>
+      <UniqueIdentifier>{07a97ea3-07ad-4afa-bd65-b2fc0facf16f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CASBACnetStack\BACnetSC">
-      <UniqueIdentifier>{b7baca11-c154-4992-9e96-e758ee83cdfd}</UniqueIdentifier>
+    <Filter Include="CASBACnetStack\PDU">
+      <UniqueIdentifier>{7c2dd322-7c00-4639-900d-103347ffc69b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CASBACnetStack\BACnetSC\BACnetSCBVLL">
-      <UniqueIdentifier>{5469939b-5c7a-4967-b1c2-c5827099dea2}</UniqueIdentifier>
+    <Filter Include="CASBACnetStack\Interfaces">
+      <UniqueIdentifier>{3a630d0b-50a1-4561-bc48-e65d19e703bf}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CASBACnetStack\Bitstrings">
-      <UniqueIdentifier>{0c32997c-68e9-4574-bc06-98afabfb99f0}</UniqueIdentifier>
+    <Filter Include="CASBACnetStack\NPDU">
+      <UniqueIdentifier>{ad95983b-a7ab-46d1-918e-a0476af2dad5}</UniqueIdentifier>
     </Filter>
     <Filter Include="CASBACnetStack\BVLL">
-      <UniqueIdentifier>{e3e4b153-9028-4467-86e9-645e44e15ea1}</UniqueIdentifier>
+      <UniqueIdentifier>{7a0ce0a6-86ff-42dc-a119-4ec7c238c4fd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CASBACnetStack\Packet">
+      <UniqueIdentifier>{1a4e817b-79ce-4f7a-a107-f79f32597887}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CASBACnetStack\Renderer">
+      <UniqueIdentifier>{6338a0ae-2749-4c77-b3fb-6aad2ff37c5e}</UniqueIdentifier>
     </Filter>
     <Filter Include="CASBACnetStack\Database">
-      <UniqueIdentifier>{98d0cd31-dba5-4ee6-9996-d5e42aa266a2}</UniqueIdentifier>
+      <UniqueIdentifier>{86b1939f-0edd-4a7f-b4da-cdd7a5a6c351}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CASBACnetStack\DataLink">
-      <UniqueIdentifier>{6a6848d3-a0cf-4fd4-9153-3d78e9c24785}</UniqueIdentifier>
+    <Filter Include="CASBACnetStack\Processors">
+      <UniqueIdentifier>{5070aff8-136c-42ee-ad3b-7e8ebd6aef2c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CASBACnetStack\Enumerated">
-      <UniqueIdentifier>{b30933f7-32c1-478d-be87-7bba7696b957}</UniqueIdentifier>
+    <Filter Include="CASBACnetStack\MessageGenerators">
+      <UniqueIdentifier>{03d1c286-8b6c-4765-a664-a930db7d975b}</UniqueIdentifier>
     </Filter>
     <Filter Include="CASBACnetStack\Helper">
-      <UniqueIdentifier>{349fdfdb-2585-41de-ae28-5d7f88541c7f}</UniqueIdentifier>
+      <UniqueIdentifier>{73c54dfc-b7fa-4d09-a4da-933f88f4f94d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CASBACnetStack\Interfaces">
-      <UniqueIdentifier>{7ff9d6ba-43d7-4ea3-90e4-284e4f6a237f}</UniqueIdentifier>
+    <Filter Include="CASBACnetStack\AlarmsAndEvents">
+      <UniqueIdentifier>{f638bb29-1dc2-48f1-892d-dbdb24b3a288}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CASBACnetStack\MessageGenerators">
-      <UniqueIdentifier>{8d064da2-911a-458f-ae03-0fc27c286759}</UniqueIdentifier>
+    <Filter Include="CASBACnetStack\AlarmsAndEvents\EventAlgorithms">
+      <UniqueIdentifier>{df640366-f0e3-4139-9a2e-7a43a091b3e4}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CASBACnetStack\NetworkLayer">
-      <UniqueIdentifier>{92a720ce-b3f3-415e-aeaf-f3ee4af4fe7b}</UniqueIdentifier>
+    <Filter Include="CASBACnetStack\AlarmsAndEvents\FaultAlgorithms">
+      <UniqueIdentifier>{6f25b809-59f9-4c29-9e1c-8a0831301c1e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CASBACnetStack\NPDU">
-      <UniqueIdentifier>{e0cce8e3-3c85-4a3c-9f1a-59a7fc5a1452}</UniqueIdentifier>
+    <Filter Include="CASBACnetStack\DataLink">
+      <UniqueIdentifier>{bcc163ef-6fdf-487e-88e6-ea52961989e9}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CASBACnetStack\Packet">
-      <UniqueIdentifier>{47598618-9cb5-458e-9cc1-66e5d990cbe7}</UniqueIdentifier>
+    <Filter Include="CASBACnetStack\NetworkLayer">
+      <UniqueIdentifier>{a29a3a22-189b-4bf4-86d4-6ee92a2e3627}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CASBACnetStack\PDU">
-      <UniqueIdentifier>{196ca4e8-35b1-4b8e-b94e-a1b3cc654e83}</UniqueIdentifier>
+    <Filter Include="CASBACnetStack\BACnetSC">
+      <UniqueIdentifier>{250603df-477e-49a8-b98a-d206ca4fb1c1}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CASBACnetStack\Processors">
-      <UniqueIdentifier>{6227ee3a-d602-4d45-b560-9871f0300b85}</UniqueIdentifier>
+    <Filter Include="CASBACnetStack\BACnetSC\BACnetSCBVLL">
+      <UniqueIdentifier>{730b838a-4eb9-4ac8-85af-8c40167e2034}</UniqueIdentifier>
     </Filter>
-    <Filter Include="CASBACnetStack\Renderer">
-      <UniqueIdentifier>{5d8fb162-5624-4c62-b502-1a91cd2f09ba}</UniqueIdentifier>
+    <Filter Include="ChipkinCommon">
+      <UniqueIdentifier>{1995b52a-54f8-454a-ae25-793adc21d068}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -105,173 +108,413 @@
     <ClCompile Include="SimpleUDP.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\submodules\cas-common\source\ChipkinConvert.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetStackCommon.cpp">
+      <Filter>CASBACnetStack</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\submodules\cas-common\source\ChipkinEndianness.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetBusinessLogic.cpp">
+      <Filter>CASBACnetStack</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\submodules\cas-common\source\ChipkinUtilities.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCallbackInterface.cpp">
+      <Filter>CASBACnetStack</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\adapters\cpp\CASBACnetStackAdapter.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkParameters.cpp">
+      <Filter>CASBACnetStack</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\CASBACnetStackDLL.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetInterface.cpp">
+      <Filter>CASBACnetStack</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetStackEventNotificationParameters.cpp">
-      <Filter>CASBACnetStack\AlarmsAndEvents</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRouter.cpp">
+      <Filter>CASBACnetStack</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetChangeOfStateEventAlgorithm.cpp">
-      <Filter>CASBACnetStack\AlarmsAndEvents\EventAlgorithms</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetStackDebug.cpp">
+      <Filter>CASBACnetStack</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEventAlgorithm.cpp">
-      <Filter>CASBACnetStack\AlarmsAndEvents\EventAlgorithms</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetTag.cpp">
+      <Filter>CASBACnetStack</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetOufOfRangeEventAlgorithm.cpp">
-      <Filter>CASBACnetStack\AlarmsAndEvents\EventAlgorithms</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\CErrorContainer.cpp">
+      <Filter>CASBACnetStack</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetFaultAlgorithm.cpp">
-      <Filter>CASBACnetStack\AlarmsAndEvents\FaultAlgorithms</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\MSTP.c">
+      <Filter>CASBACnetStack</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetListedFaultAlgorithm.cpp">
-      <Filter>CASBACnetStack\AlarmsAndEvents\FaultAlgorithms</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAbortReason.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetOutOfRangeFaultAlgorithm.cpp">
-      <Filter>CASBACnetStack\AlarmsAndEvents\FaultAlgorithms</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAccessAuthenticationFactorDisable.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetObjectBase.cpp">
-      <Filter>CASBACnetStack\APDU</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAccessCredentialDisable.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAbstractSyntaxType.cpp">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAccessCredentialDisableReason.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveBase.cpp">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAccessEvent.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveBitSTRING.cpp">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAccessPassbackMode.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveBOOL.cpp">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAccessUserType.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveCharSTRING.cpp">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAccessZoneOccupancyState.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveDATE.cpp">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAccumulatorStatus.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveDOUBLE.cpp">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAcknowledgementFilter.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveENUM.cpp">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAction.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveINT.cpp">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEnableDisable.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveNULL.cpp">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEventStateFilter.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveObjectIdentifier.cpp">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetMessagePriority.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveOctSTRING.cpp">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetReinitializedStateOfDevice.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveREAL.cpp">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAuthenticationFactorType.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveTIME.cpp">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAuthenticationStatus.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveUINT.cpp">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAuthorizationExemption.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetChangeListError.cpp">
-      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAuthorizationMode.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedPrivateTransferError.cpp">
-      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetBackupState.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCreateObjectError.cpp">
-      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetBinaryLightingPV.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetError.cpp">
-      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetBinaryPV.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetErrorBase.cpp">
-      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedServiceChoice.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetFirstFailedSubscription.cpp">
-      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDeviceStatus.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVPropertyMultipleError.cpp">
-      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDoorAlarmState.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetVTCloseError.cpp">
-      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDoorSecuredStatus.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetWritePropertyMultipleError.cpp">
-      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDoorStatus.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAddress.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDoorValue.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAddressBinding.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEngineeringUnits.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAlarmSummary.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetErrorClass.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAssignedLandingCalls.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetErrorCode.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAuthenticationFactor.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEscalatorFault.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetBDTEntry.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEscalatorMode.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetClientCOV.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEscalatorOperationDirection.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCOVMultipleSubscription.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEventState.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCovNotification.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEventType.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCOVNotificationMultipleRequest.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetFaultType.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCovReference.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetFileAccessMethod.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCovSubscriptionSpecification.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetIPMode.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCovValue.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLifeSafetyMode.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDateRange.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLifeSafetyOperation.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDestination.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLifeSafetyState.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDeviceObjectPropertyReference.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLiftCarDirection.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDeviceObjectReference.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLiftCarDoorCommand.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEnrollmentSummary.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLiftCarDriveStatus.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEventNotificationRequest.cpp">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLiftCarMode.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLiftFault.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLiftGroupMode.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLightingInProgress.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLightingOperation.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLightingTransition.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLocationSpecifier.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLockStatus.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLoggingType.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetMaintenance.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkNumberQuality.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkPortCommand.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkType.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNodeType.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNotifyType.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetObjectType.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPolarity.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetProgramError.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetProgramRequest.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetProgramState.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPropertyIdentifier.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetProtocolLevel.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRejectReason.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRelationship.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetReliability.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRestartReason.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSecurityLevel.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSecurityPolicy.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSegmentation.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetShedState.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSilencedState.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetTimeRangeSpecifier.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetTimerState.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetTimerTransition.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedServiceChoice.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetVTClass.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetWriteStatus.cpp">
+      <Filter>CASBACnetStack\Enumerated</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetObjectBase.cpp">
+      <Filter>CASBACnetStack\APDU</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAbstractSyntaxType.cpp">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveBase.cpp">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveBitSTRING.cpp">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveBOOL.cpp">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveCharSTRING.cpp">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveDATE.cpp">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveDOUBLE.cpp">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveENUM.cpp">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveINT.cpp">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveNULL.cpp">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveObjectIdentifier.cpp">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveOctSTRING.cpp">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveREAL.cpp">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveTIME.cpp">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveUINT.cpp">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetChangeListError.cpp">
+      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedPrivateTransferError.cpp">
+      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCreateObjectError.cpp">
+      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetError.cpp">
+      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetErrorBase.cpp">
+      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetFirstFailedSubscription.cpp">
+      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVPropertyMultipleError.cpp">
+      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetVTCloseError.cpp">
+      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetWritePropertyMultipleError.cpp">
+      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAddress.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAddressBinding.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAlarmSummary.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAssignedLandingCalls.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAuthenticationFactor.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetBDTEntry.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetClientCOV.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCOVMultipleSubscription.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCovNotification.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCOVNotificationMultipleRequest.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCovReference.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCovSubscriptionSpecification.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCovValue.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDateRange.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDestination.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDeviceObjectPropertyReference.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDeviceObjectReference.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEnrollmentSummary.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEventNotificationRequest.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClCompile>
     <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEventSummary.cpp">
       <Filter>CASBACnetStack\APDU\Base Types</Filter>
@@ -339,6 +582,9 @@
     <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPropertyStates.cpp">
       <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSequenceOfPropertyValue.cpp">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    </ClCompile>
     <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSingleLogData.cpp">
       <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClCompile>
@@ -582,59 +828,74 @@
     <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersUnsignedRange.cpp">
       <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCCommon.cpp">
-      <Filter>CASBACnetStack\BACnetSC</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAbortPDU.cpp">
+      <Filter>CASBACnetStack\PDU</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCHubConnector.cpp">
-      <Filter>CASBACnetStack\BACnetSC</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetComplexAckPDU.cpp">
+      <Filter>CASBACnetStack\PDU</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCWebsocket.cpp">
-      <Filter>CASBACnetStack\BACnetSC</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedRequestPDU.cpp">
+      <Filter>CASBACnetStack\PDU</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCAddressResolution.cpp">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetErrorPDU.cpp">
+      <Filter>CASBACnetStack\PDU</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCAddressResolutionACK.cpp">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPDU.cpp">
+      <Filter>CASBACnetStack\PDU</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCAdvertisement.cpp">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRejectPDU.cpp">
+      <Filter>CASBACnetStack\PDU</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCAdvertisementSolicitation.cpp">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSimpleAckPDU.cpp">
+      <Filter>CASBACnetStack\PDU</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCBVLCResult.cpp">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedRequestPDU.cpp">
+      <Filter>CASBACnetStack\PDU</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCBVLL.cpp">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\IRenderable.cpp">
+      <Filter>CASBACnetStack\Interfaces</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCConnectAccept.cpp">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetIAmRouterToNetwork.cpp">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCConnectRequest.cpp">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetICouldBeRouterToNetwork.cpp">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCDisconnectACK.cpp">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetInitializeRoutingTable.cpp">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCDisconnectRequest.cpp">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetInitializeRoutingTableAck.cpp">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCEncapsulatedNPDU.cpp">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkLayerProtocolMessage.cpp">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCHeaderOption.cpp">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkNumberIs.cpp">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCHeartbeatACK.cpp">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRejectMessageToNetwork.cpp">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCHeartbeatRequest.cpp">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRouterAvailableToNetwork.cpp">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCProprietaryMessage.cpp">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRouterBusyToNetwork.cpp">
+      <Filter>CASBACnetStack\NPDU</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRoutingTableEntry.cpp">
+      <Filter>CASBACnetStack\NPDU</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNPDU.cpp">
+      <Filter>CASBACnetStack\NPDU</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkLayerVendorProprietaryMessage.cpp">
+      <Filter>CASBACnetStack\NPDU</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetWhatIsNetworkNumber.cpp">
+      <Filter>CASBACnetStack\NPDU</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetWhoIsRouterToNetwork.cpp">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClCompile>
     <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetBVLLBDTEntry.cpp">
       <Filter>CASBACnetStack\BVLL</Filter>
@@ -684,6 +945,21 @@
     <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetReadForeignDeviceTableAck.cpp">
       <Filter>CASBACnetStack\BVLL</Filter>
     </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetMSTPPacket.cpp">
+      <Filter>CASBACnetStack\Packet</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCPacket.cpp">
+      <Filter>CASBACnetStack\Packet</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetIPPacket.cpp">
+      <Filter>CASBACnetStack\Packet</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPacket.cpp">
+      <Filter>CASBACnetStack\Packet</Filter>
+    </ClCompile>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\XMLRenderer.cpp">
+      <Filter>CASBACnetStack\Renderer</Filter>
+    </ClCompile>
     <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDBPropertyOptions.cpp">
       <Filter>CASBACnetStack\Database</Filter>
     </ClCompile>
@@ -765,284 +1041,155 @@
     <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetStackTrendLogMultiple.cpp">
       <Filter>CASBACnetStack\Database</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetBBMD.cpp">
-      <Filter>CASBACnetStack\DataLink</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDataLink.cpp">
-      <Filter>CASBACnetStack\DataLink</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAbortProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDataLinkIPv4.cpp">
-      <Filter>CASBACnetStack\DataLink</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAcknowledgeAlarmProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDataLinkLayer.cpp">
-      <Filter>CASBACnetStack\DataLink</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCOVNotificationProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDataLinkMSTP.cpp">
-      <Filter>CASBACnetStack\DataLink</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCreateObjectProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDataLinkSC.cpp">
-      <Filter>CASBACnetStack\DataLink</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDeleteObjectProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAbortReason.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDeviceCommunicationControlProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAccessAuthenticationFactorDisable.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetGetEventInformationProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAccessCredentialDisable.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetReadRangeProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAccessCredentialDisableReason.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetReinitializeDeviceProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAccessEvent.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetComplexAckProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAccessPassbackMode.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedRequestProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAccessUserType.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetErrorProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAccessZoneOccupancyState.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetIAmProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAccumulatorStatus.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetIHaveProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAcknowledgementFilter.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetReadPropertyAckProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAction.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetReadPropertyMultipleAckProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEnableDisable.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetReadPropertyMultipleProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEventStateFilter.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetReadPropertyProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetMessagePriority.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRejectProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetReinitializedStateOfDevice.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSimpleAckProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAuthenticationFactorType.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAuthenticationStatus.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVProcessorHelpers.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAuthorizationExemption.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVPropertyMultipleProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAuthorizationMode.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVPropertyMultipleProcessResult.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetBackupState.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVPropertyProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetBinaryLightingPV.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetTextMessageProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetBinaryPV.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetTimeSynchronizationProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedServiceChoice.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedRequestProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDeviceStatus.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetUTCTimeSynchronizationProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDoorAlarmState.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetWhoHasProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDoorSecuredStatus.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetWhoIsProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDoorStatus.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetWritePropertyMultipleProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDoorValue.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetWritePropertyProcessor.cpp">
+      <Filter>CASBACnetStack\Processors</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEngineeringUnits.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetStackMessageGenerator.cpp">
+      <Filter>CASBACnetStack\MessageGenerators</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetErrorClass.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetStackMemoryBuffer.cpp">
+      <Filter>CASBACnetStack\Helper</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetErrorCode.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetStackReadPropertyAsync.cpp">
+      <Filter>CASBACnetStack\Helper</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEscalatorFault.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetStackWritePropertyAsync.cpp">
+      <Filter>CASBACnetStack\Helper</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEscalatorMode.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetStackEventNotificationParameters.cpp">
+      <Filter>CASBACnetStack\AlarmsAndEvents</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEscalatorOperationDirection.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetChangeOfStateEventAlgorithm.cpp">
+      <Filter>CASBACnetStack\AlarmsAndEvents\EventAlgorithms</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEventState.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEventAlgorithm.cpp">
+      <Filter>CASBACnetStack\AlarmsAndEvents\EventAlgorithms</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetEventType.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetOufOfRangeEventAlgorithm.cpp">
+      <Filter>CASBACnetStack\AlarmsAndEvents\EventAlgorithms</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetFaultType.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetFileAccessMethod.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetIPMode.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLifeSafetyMode.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLifeSafetyOperation.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLifeSafetyState.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLiftCarDirection.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLiftCarDoorCommand.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLiftCarDriveStatus.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLiftCarMode.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLiftFault.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLiftGroupMode.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLightingInProgress.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLightingOperation.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLightingTransition.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLocationSpecifier.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLockStatus.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetLoggingType.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetMaintenance.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkNumberQuality.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkPortCommand.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkType.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNodeType.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNotifyType.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetObjectType.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPolarity.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetProgramError.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetProgramRequest.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetProgramState.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPropertyIdentifier.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetProtocolLevel.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRejectReason.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRelationship.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetReliability.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRestartReason.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSecurityLevel.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSecurityPolicy.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSegmentation.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetShedState.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSilencedState.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetTimeRangeSpecifier.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetTimerState.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetTimerTransition.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetFaultAlgorithm.cpp">
+      <Filter>CASBACnetStack\AlarmsAndEvents\FaultAlgorithms</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedServiceChoice.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetListedFaultAlgorithm.cpp">
+      <Filter>CASBACnetStack\AlarmsAndEvents\FaultAlgorithms</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetVTClass.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetOutOfRangeFaultAlgorithm.cpp">
+      <Filter>CASBACnetStack\AlarmsAndEvents\FaultAlgorithms</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetWriteStatus.cpp">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetBBMD.cpp">
+      <Filter>CASBACnetStack\DataLink</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetStackMemoryBuffer.cpp">
-      <Filter>CASBACnetStack\Helper</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDataLink.cpp">
+      <Filter>CASBACnetStack\DataLink</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetStackReadPropertyAsync.cpp">
-      <Filter>CASBACnetStack\Helper</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDataLinkIPv4.cpp">
+      <Filter>CASBACnetStack\DataLink</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetStackWritePropertyAsync.cpp">
-      <Filter>CASBACnetStack\Helper</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDataLinkLayer.cpp">
+      <Filter>CASBACnetStack\DataLink</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\IRenderable.cpp">
-      <Filter>CASBACnetStack\Interfaces</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDataLinkMSTP.cpp">
+      <Filter>CASBACnetStack\DataLink</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetStackMessageGenerator.cpp">
-      <Filter>CASBACnetStack\MessageGenerators</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDataLinkSC.cpp">
+      <Filter>CASBACnetStack\DataLink</Filter>
     </ClCompile>
     <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkLayer.cpp">
       <Filter>CASBACnetStack\NetworkLayer</Filter>
@@ -1050,1282 +1197,1069 @@
     <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetVirtualRouter.cpp">
       <Filter>CASBACnetStack\NetworkLayer</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetIAmRouterToNetwork.cpp">
-      <Filter>CASBACnetStack\NPDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetICouldBeRouterToNetwork.cpp">
-      <Filter>CASBACnetStack\NPDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetInitializeRoutingTable.cpp">
-      <Filter>CASBACnetStack\NPDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetInitializeRoutingTableAck.cpp">
-      <Filter>CASBACnetStack\NPDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkLayerProtocolMessage.cpp">
-      <Filter>CASBACnetStack\NPDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkNumberIs.cpp">
-      <Filter>CASBACnetStack\NPDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRejectMessageToNetwork.cpp">
-      <Filter>CASBACnetStack\NPDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRouterAvailableToNetwork.cpp">
-      <Filter>CASBACnetStack\NPDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRouterBusyToNetwork.cpp">
-      <Filter>CASBACnetStack\NPDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRoutingTableEntry.cpp">
-      <Filter>CASBACnetStack\NPDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNPDU.cpp">
-      <Filter>CASBACnetStack\NPDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkLayerVendorProprietaryMessage.cpp">
-      <Filter>CASBACnetStack\NPDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetWhatIsNetworkNumber.cpp">
-      <Filter>CASBACnetStack\NPDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetWhoIsRouterToNetwork.cpp">
-      <Filter>CASBACnetStack\NPDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetMSTPPacket.cpp">
-      <Filter>CASBACnetStack\Packet</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCPacket.cpp">
-      <Filter>CASBACnetStack\Packet</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetIPPacket.cpp">
-      <Filter>CASBACnetStack\Packet</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPacket.cpp">
-      <Filter>CASBACnetStack\Packet</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAbortPDU.cpp">
-      <Filter>CASBACnetStack\PDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetComplexAckPDU.cpp">
-      <Filter>CASBACnetStack\PDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedRequestPDU.cpp">
-      <Filter>CASBACnetStack\PDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetErrorPDU.cpp">
-      <Filter>CASBACnetStack\PDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetPDU.cpp">
-      <Filter>CASBACnetStack\PDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRejectPDU.cpp">
-      <Filter>CASBACnetStack\PDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSimpleAckPDU.cpp">
-      <Filter>CASBACnetStack\PDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedRequestPDU.cpp">
-      <Filter>CASBACnetStack\PDU</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAbortProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetAcknowledgeAlarmProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCOVNotificationProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCreateObjectProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDeleteObjectProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetDeviceCommunicationControlProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetGetEventInformationProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetReadRangeProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetReinitializeDeviceProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetComplexAckProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedRequestProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetErrorProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetIAmProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetIHaveProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetReadPropertyAckProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetReadPropertyMultipleAckProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetReadPropertyMultipleProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetReadPropertyProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRejectProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSimpleAckProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVProcessorHelpers.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
-    </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVPropertyMultipleProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCCommon.cpp">
+      <Filter>CASBACnetStack\BACnetSC</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVPropertyMultipleProcessResult.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCHubConnector.cpp">
+      <Filter>CASBACnetStack\BACnetSC</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVPropertyProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCWebsocket.cpp">
+      <Filter>CASBACnetStack\BACnetSC</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetTextMessageProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCAddressResolution.cpp">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetTimeSynchronizationProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCAddressResolutionACK.cpp">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedRequestProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCAdvertisement.cpp">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetUTCTimeSynchronizationProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCAdvertisementSolicitation.cpp">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetWhoHasProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCBVLCResult.cpp">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetWhoIsProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCBVLL.cpp">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetWritePropertyMultipleProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCConnectAccept.cpp">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetWritePropertyProcessor.cpp">
-      <Filter>CASBACnetStack\Processors</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCConnectRequest.cpp">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\XMLRenderer.cpp">
-      <Filter>CASBACnetStack\Renderer</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCDisconnectACK.cpp">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetBusinessLogic.cpp">
-      <Filter>CASBACnetStack</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCDisconnectRequest.cpp">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetCallbackInterface.cpp">
-      <Filter>CASBACnetStack</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCEncapsulatedNPDU.cpp">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetInterface.cpp">
-      <Filter>CASBACnetStack</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCHeaderOption.cpp">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkParameters.cpp">
-      <Filter>CASBACnetStack</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCHeartbeatACK.cpp">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetRouter.cpp">
-      <Filter>CASBACnetStack</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCHeartbeatRequest.cpp">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetStackCommon.cpp">
-      <Filter>CASBACnetStack</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSCProprietaryMessage.cpp">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetStackDebug.cpp">
-      <Filter>CASBACnetStack</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\ChipkinConvert.cpp">
+      <Filter>ChipkinCommon</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetTag.cpp">
-      <Filter>CASBACnetStack</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\ChipkinEndianness.cpp">
+      <Filter>ChipkinCommon</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\CErrorContainer.cpp">
-      <Filter>CASBACnetStack</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\ChipkinUtilities.cpp">
+      <Filter>ChipkinCommon</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSequenceOfPropertyValue.cpp">
-      <Filter>CASBACnetStack</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\source\CASBACnetStackDLL.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\submodules\cas-bacnet-stack\source\MSTP.c">
-      <Filter>CASBACnetStack</Filter>
+    <ClCompile Include="..\submodules\cas-bacnet-stack\adapters\cpp\CASBACnetStackAdapter.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="SimpleUDP.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\submodules\cas-common\source\ChipkinConvert.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\submodules\cas-common\source\ChipkinEndianness.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\submodules\cas-common\source\ChipkinUtilities.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="CASBACnetStackExampleConstants.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\adapters\cpp\CASBACnetStackAdapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\CASBACnetStackDLL.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="CIBuildSettings.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAlarmAndEventAlgorithmResult.h">
-      <Filter>CASBACnetStack\AlarmsAndEvents</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackEventNotificationParameters.h">
-      <Filter>CASBACnetStack\AlarmsAndEvents</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetChangeOfStateEventAlgorithm.h">
-      <Filter>CASBACnetStack\AlarmsAndEvents\EventAlgorithms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEventAlgorithm.h">
-      <Filter>CASBACnetStack\AlarmsAndEvents\EventAlgorithms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetOutOfRangeEventAlgorithm.h">
-      <Filter>CASBACnetStack\AlarmsAndEvents\EventAlgorithms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetFaultAlgorithm.h">
-      <Filter>CASBACnetStack\AlarmsAndEvents\FaultAlgorithms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetListedFaultAlgorithm.h">
-      <Filter>CASBACnetStack\AlarmsAndEvents\FaultAlgorithms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetOutOfRangeFaultAlgorithm.h">
-      <Filter>CASBACnetStack\AlarmsAndEvents\FaultAlgorithms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetObjectBase.h">
-      <Filter>CASBACnetStack\APDU</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAbstractSyntaxType.h">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveBase.h">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveBitSTRING.h">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveBOOL.h">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveCharSTRING.h">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveDATE.h">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveDOUBLE.h">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveENUM.h">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveINT.h">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
-    </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveNULL.h">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackCommon.h">
+      <Filter>CASBACnetStack</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveObjectIdentifier.h">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBusinessLogic.h">
+      <Filter>CASBACnetStack</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveOctSTRING.h">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCallbackInterface.h">
+      <Filter>CASBACnetStack</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveREAL.h">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkParameters.h">
+      <Filter>CASBACnetStack</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveTIME.h">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetInterface.h">
+      <Filter>CASBACnetStack</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveUINT.h">
-      <Filter>CASBACnetStack\APDU\Primitives</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRouter.h">
+      <Filter>CASBACnetStack</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetChangeListError.h">
-      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackConstants.h">
+      <Filter>CASBACnetStack</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedPrivateTransferError.h">
-      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackDatatypes.h">
+      <Filter>CASBACnetStack</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCreateObjectError.h">
-      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackDebug.h">
+      <Filter>CASBACnetStack</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetError.h">
-      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackListItems.h">
+      <Filter>CASBACnetStack</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetErrorBase.h">
-      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetTag.h">
+      <Filter>CASBACnetStack</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetFirstFailedSubscription.h">
-      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\CASBACnetStackOptions.h">
+      <Filter>CASBACnetStack</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVPropertyMultipleError.h">
-      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\CErrorContainer.h">
+      <Filter>CASBACnetStack</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetVTCloseError.h">
-      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\datatypes.h">
+      <Filter>CASBACnetStack</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWritePropertyMultipleError.h">
-      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\endianness.h">
+      <Filter>CASBACnetStack</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAddress.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\MSTP.h">
+      <Filter>CASBACnetStack</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAddressBinding.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\version.h">
+      <Filter>CASBACnetStack</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAlarmSummary.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAbortReason.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAssignedLandingCalls.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAccessAuthenticationFactorDisable.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAuthenticationFactor.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAccessCredentialDisable.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBDTEntry.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAccessCredentialDisableReason.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetClientCOV.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAccessEvent.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCOVMultipleSubscription.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAccessPassbackMode.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCovNotification.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAccessUserType.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCOVNotificationMultipleRequest.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAccessZoneOccupancyState.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCovReference.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAccumulatorStatus.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCovSubscriptionSpecification.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAcknowledgementFilter.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCovValue.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAction.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDateRange.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEnableDisable.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDestination.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEventStateFilter.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDeviceObjectPropertyReference.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetMessagePriority.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDeviceObjectReference.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReinitializedStateOfDevice.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEnrollmentSummary.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAuthenticationFactorType.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEventNotificationRequest.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAuthenticationStatus.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEventSummary.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAuthorizationExemption.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetFDTEntry.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAuthorizationMode.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetHostAddress.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBackupState.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetHostNPort.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBinaryLightingPV.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLandingCall.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBinaryPV.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLandingCallStatus.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedServiceChoice.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLandingDoor.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDeviceStatus.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLandingDoorStatus.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDoorAlarmState.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLiftCarCallList.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDoorSecuredStatus.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetListOfResults.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDoorStatus.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLogData.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDoorValue.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLogMultipleRecord.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEngineeringUnits.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetMessageClass.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetErrorClass.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParameters.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetErrorCode.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPriorityFilter.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEscalatorFault.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPropertyStates.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEscalatorMode.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSingleLogData.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEscalatorOperationDirection.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLogDatum.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEventState.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLogRecord.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEventType.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetObjectSpecifier.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetFaultType.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetOptionalUnsigned.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetFileAccessMethod.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPriorityArray.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetIPMode.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPriorityValue.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLifeSafetyMode.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCOVNotificationRequest.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLifeSafetyOperation.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCOVSubscription.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLifeSafetyState.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDateTime.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLiftCarDirection.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetListOfReadAccessResults.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLiftCarDoorCommand.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetListOfReadAccessSpecifications.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLiftCarDriveStatus.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetListOfWriteAccessSpecifications.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLiftCarMode.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetObjectPropertyReference.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLiftFault.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPropertyReference.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLiftGroupMode.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPropertyValue.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLightingInProgress.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadAccessResult.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLightingOperation.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadAccessSpecification.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLightingTransition.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadResult.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLocationSpecifier.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRecipient.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLockStatus.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRecipientProcess.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLoggingType.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSequenceOf.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetMaintenance.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetTimeStamp.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkNumberQuality.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetTextMessage.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkPortCommand.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWriteAccessSpecification.h">
-      <Filter>CASBACnetStack\APDU\Base Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkType.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetIAmRequest.h">
-      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNodeType.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetIHaveRequest.h">
-      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotifyType.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetTimeSynchronizationRequest.h">
-      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetObjectType.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedCOVNotificationMultipleRequest.h">
-      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPolarity.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedCOVNotificationRequest.h">
-      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetProgramError.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedEventNotificationRequest.h">
-      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetProgramRequest.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedPrivateTransferRequest.h">
-      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetProgramState.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedServiceRequest.h">
-      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPropertyIdentifier.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedTextMessageRequest.h">
-      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetProtocolLevel.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUTCTimeSynchronizationRequest.h">
-      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRejectReason.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWhoHasRequest.h">
-      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRelationship.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWhoIsRequest.h">
-      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReliability.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAcknowledgeAlarmRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRestartReason.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedCOVNotificationMultipleRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSecurityLevel.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedEventNotificationRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSecurityPolicy.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedTextMessageRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSegmentation.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCreateObjectACK.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetShedState.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCreateObjectRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSilencedState.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDeleteObjectRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetTimeRangeSpecifier.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDeviceCommunicationControlRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetTimerState.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetGetAlarmSummaryACK.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetTimerTransition.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetGetEnrollmentSummaryACK.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedServiceChoice.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetGetEnrollmentSummaryRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetVTClass.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetGetEventInformationACK.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWriteStatus.h">
+      <Filter>CASBACnetStack\Enumerated</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetGetEventInformationRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetObjectTypesSupported.h">
+      <Filter>CASBACnetStack\Bitstrings</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadRangeACK.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDaysOfWeek.h">
+      <Filter>CASBACnetStack\Bitstrings</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadRangeRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEventTransitionBits.h">
+      <Filter>CASBACnetStack\Bitstrings</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReinitializeDeviceRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLimitEnable.h">
+      <Filter>CASBACnetStack\Bitstrings</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedCOVNotificationRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLogStatus.h">
+      <Filter>CASBACnetStack\Bitstrings</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedServiceACK.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetResultFlags.h">
+      <Filter>CASBACnetStack\Bitstrings</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedServiceRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetServicesSupported.h">
+      <Filter>CASBACnetStack\Bitstrings</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadPropertyACK.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStatusFlags.h">
+      <Filter>CASBACnetStack\Bitstrings</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadPropertyMultipleACK.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetObjectBase.h">
+      <Filter>CASBACnetStack\APDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadPropertyMultipleRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAbstractSyntaxType.h">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadPropertyRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveBase.h">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVPropertyMultipleRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveBitSTRING.h">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVPropertyRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveBOOL.h">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveCharSTRING.h">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWritePropertyMultipleRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveDATE.h">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWritePropertyRequest.h">
-      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveDOUBLE.h">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackUnknownAPDU.h">
-      <Filter>CASBACnetStack\APDU\Custom Types</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveENUM.h">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersAccessEvent.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveINT.h">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersBase.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveNULL.h">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersBufferReady.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveObjectIdentifier.h">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfBitstring.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveOctSTRING.h">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfCharacterstring.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveREAL.h">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfDiscreteValue.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveTIME.h">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfDiscreteValueNewValue.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPrimitiveUINT.h">
+      <Filter>CASBACnetStack\APDU\Primitives</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfLifeSafety.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetChangeListError.h">
+      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfReliability.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedPrivateTransferError.h">
+      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfState.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCreateObjectError.h">
+      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfStatusFlags.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetError.h">
+      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfTimer.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetErrorBase.h">
+      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfValue.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetFirstFailedSubscription.h">
+      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfValueNewValue.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVPropertyMultipleError.h">
+      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersCommandFailure.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetVTCloseError.h">
+      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersDoubleOutOfRange.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWritePropertyMultipleError.h">
+      <Filter>CASBACnetStack\APDU\Error Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersFloatingLimit.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAddress.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersOutOfRange.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAddressBinding.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersSignedOutOfRange.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAlarmSummary.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersUnsignedOutOfRange.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAssignedLandingCalls.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersUnsignedRange.h">
-      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAuthenticationFactor.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCCommon.h">
-      <Filter>CASBACnetStack\BACnetSC</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBDTEntry.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCConstants.h">
-      <Filter>CASBACnetStack\BACnetSC</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetClientCOV.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCHubConnector.h">
-      <Filter>CASBACnetStack\BACnetSC</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCOVMultipleSubscription.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCWebsocket.h">
-      <Filter>CASBACnetStack\BACnetSC</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCovNotification.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCAddressResolution.h">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCOVNotificationMultipleRequest.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCAddressResolutionACK.h">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCovReference.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCAdvertisement.h">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCovSubscriptionSpecification.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCAdvertisementSolicitation.h">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCovValue.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCBVLCResult.h">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDateRange.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCBVLL.h">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDestination.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCConnectAccept.h">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDeviceObjectPropertyReference.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCConnectRequest.h">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDeviceObjectReference.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCDisconnectACK.h">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEnrollmentSummary.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCDisconnectRequest.h">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEventNotificationRequest.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCEncapsulatedNPDU.h">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEventSummary.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCHeaderOption.h">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetFDTEntry.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCHeartbeatACK.h">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetHostAddress.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCHeartbeatRequest.h">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetHostNPort.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCProprietaryMessage.h">
-      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLandingCall.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDaysOfWeek.h">
-      <Filter>CASBACnetStack\Bitstrings</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLandingCallStatus.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEventTransitionBits.h">
-      <Filter>CASBACnetStack\Bitstrings</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLandingDoor.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLimitEnable.h">
-      <Filter>CASBACnetStack\Bitstrings</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLandingDoorStatus.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLogStatus.h">
-      <Filter>CASBACnetStack\Bitstrings</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLiftCarCallList.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetResultFlags.h">
-      <Filter>CASBACnetStack\Bitstrings</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetListOfResults.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetServicesSupported.h">
-      <Filter>CASBACnetStack\Bitstrings</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLogData.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStatusFlags.h">
-      <Filter>CASBACnetStack\Bitstrings</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLogMultipleRecord.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBVLCResult.h">
-      <Filter>CASBACnetStack\BVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetMessageClass.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBVLLBase.h">
-      <Filter>CASBACnetStack\BVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParameters.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDeleteForeignDeviceTableEntry.h">
-      <Filter>CASBACnetStack\BVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPriorityFilter.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDistributeBroadcastToNetwork.h">
-      <Filter>CASBACnetStack\BVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPropertyStates.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetOriginalBroadcastNPDU.h">
-      <Filter>CASBACnetStack\BVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSequenceOfPropertyValue.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetOriginalUnicastNPDU.h">
-      <Filter>CASBACnetStack\BVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSingleLogData.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadBroadcastDistributionTable.h">
-      <Filter>CASBACnetStack\BVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLogDatum.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadBroadcastDistributionTableAck.h">
-      <Filter>CASBACnetStack\BVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLogRecord.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadForeignDeviceTable.h">
-      <Filter>CASBACnetStack\BVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetObjectSpecifier.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRegisterForeignDevice.h">
-      <Filter>CASBACnetStack\BVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetOptionalUnsigned.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBVLLBDTEntry.h">
-      <Filter>CASBACnetStack\BVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPriorityArray.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBVLLFDTEntry.h">
-      <Filter>CASBACnetStack\BVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPriorityValue.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWriteBroadcastDistributionTable.h">
-      <Filter>CASBACnetStack\BVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCOVNotificationRequest.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBVLL.h">
-      <Filter>CASBACnetStack\BVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCOVSubscription.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetForwardedNPDU.h">
-      <Filter>CASBACnetStack\BVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDateTime.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadForeignDeviceTableAck.h">
-      <Filter>CASBACnetStack\BVLL</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetListOfReadAccessResults.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDBPropertyOptions.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetListOfReadAccessSpecifications.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackActiveCOVMultipleSubscriptions.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetListOfWriteAccessSpecifications.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackAlarmAndEventObject.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetObjectPropertyReference.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDatabase.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPropertyReference.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDBDevice.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPropertyValue.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDBObject.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadAccessResult.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDBProperty.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadAccessSpecification.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDBPropertyProfile.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadResult.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDBRouter.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRecipient.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSourceAddress.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRecipientProcess.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackActiveCOVSubscriptions.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSequenceOf.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackCOVMultipleContext.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetTimeStamp.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackCOVNotificationQueue.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetTextMessage.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackCOVSubscription.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWriteAccessSpecification.h">
+      <Filter>CASBACnetStack\APDU\Base Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackInvokeIds.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetIAmRequest.h">
+      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackNetworkKey.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetIHaveRequest.h">
+      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackNetworkPortBase.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetTimeSynchronizationRequest.h">
+      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackNetworkPortIpv4.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedCOVNotificationMultipleRequest.h">
+      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackNotificationClass.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedCOVNotificationRequest.h">
+      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackObjectSettings.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedEventNotificationRequest.h">
+      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackCOVQueuedNotification.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedPrivateTransferRequest.h">
+      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackSentConfirmedRequests.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedServiceRequest.h">
+      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackSettings.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedTextMessageRequest.h">
+      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackStoredDBPropertyValues.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUTCTimeSynchronizationRequest.h">
+      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackTrendLog.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWhoHasRequest.h">
+      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackTrendLogBase.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWhoIsRequest.h">
+      <Filter>CASBACnetStack\APDU\Unconfirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackTrendLogMultiple.h">
-      <Filter>CASBACnetStack\Database</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAcknowledgeAlarmRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBBMD.h">
-      <Filter>CASBACnetStack\DataLink</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedCOVNotificationMultipleRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDataLink.h">
-      <Filter>CASBACnetStack\DataLink</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedEventNotificationRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDataLinkIPv4.h">
-      <Filter>CASBACnetStack\DataLink</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedTextMessageRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDataLinkLayer.h">
-      <Filter>CASBACnetStack\DataLink</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCreateObjectACK.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDataLinkMSTP.h">
-      <Filter>CASBACnetStack\DataLink</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCreateObjectRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDataLinkSC.h">
-      <Filter>CASBACnetStack\DataLink</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDeleteObjectRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAbortReason.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDeviceCommunicationControlRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAccessAuthenticationFactorDisable.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetGetAlarmSummaryACK.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAccessCredentialDisable.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetGetEnrollmentSummaryACK.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAccessCredentialDisableReason.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetGetEnrollmentSummaryRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAccessEvent.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetGetEventInformationACK.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAccessPassbackMode.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetGetEventInformationRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAccessUserType.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadRangeACK.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAccessZoneOccupancyState.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadRangeRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAccumulatorStatus.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReinitializeDeviceRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAcknowledgementFilter.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedCOVNotificationRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAction.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedServiceACK.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEnableDisable.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedServiceRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEventStateFilter.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadPropertyACK.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetMessagePriority.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadPropertyMultipleACK.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReinitializedStateOfDevice.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadPropertyMultipleRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAuthenticationFactorType.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadPropertyRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAuthenticationStatus.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVPropertyMultipleRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAuthorizationExemption.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVPropertyRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAuthorizationMode.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSubscribeCOVRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBackupState.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWritePropertyMultipleRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBinaryLightingPV.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWritePropertyRequest.h">
+      <Filter>CASBACnetStack\APDU\Confirmed Service Productions</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBinaryPV.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackUnknownAPDU.h">
+      <Filter>CASBACnetStack\APDU\Custom Types</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedServiceChoice.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersAccessEvent.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDeviceStatus.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersBase.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDoorAlarmState.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersBufferReady.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDoorSecuredStatus.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfBitstring.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDoorStatus.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfCharacterstring.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDoorValue.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfDiscreteValue.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEngineeringUnits.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfDiscreteValueNewValue.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetErrorClass.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfLifeSafety.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetErrorCode.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfReliability.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEscalatorFault.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfState.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEscalatorMode.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfStatusFlags.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEscalatorOperationDirection.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfTimer.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEventState.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfValue.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEventType.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersChangeOfValueNewValue.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetFaultType.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersCommandFailure.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetFileAccessMethod.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersDoubleOutOfRange.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetIPMode.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersFloatingLimit.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLifeSafetyMode.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersOutOfRange.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLifeSafetyOperation.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersSignedOutOfRange.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLifeSafetyState.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersUnsignedOutOfRange.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLiftCarDirection.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotificationParametersUnsignedRange.h">
+      <Filter>CASBACnetStack\APDU\Notification Parameters</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLiftCarDoorCommand.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAbortPDU.h">
+      <Filter>CASBACnetStack\PDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLiftCarDriveStatus.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetComplexAckPDU.h">
+      <Filter>CASBACnetStack\PDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLiftCarMode.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedRequestPDU.h">
+      <Filter>CASBACnetStack\PDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLiftFault.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetErrorPDU.h">
+      <Filter>CASBACnetStack\PDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLiftGroupMode.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPDU.h">
+      <Filter>CASBACnetStack\PDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLightingInProgress.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRejectPDU.h">
+      <Filter>CASBACnetStack\PDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLightingOperation.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSimpleAckPDU.h">
+      <Filter>CASBACnetStack\PDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLightingTransition.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedRequestPDU.h">
+      <Filter>CASBACnetStack\PDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLocationSpecifier.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\ICodable.h">
+      <Filter>CASBACnetStack\Interfaces</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLockStatus.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\IRenderable.h">
+      <Filter>CASBACnetStack\Interfaces</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetLoggingType.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetIAmRouterToNetwork.h">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetMaintenance.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetICouldBeRouterToNetwork.h">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkNumberQuality.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetInitializeRoutingTable.h">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkPortCommand.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkLayerProtocolMessage.h">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkType.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkNumberIs.h">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNodeType.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRejectMessageToNetwork.h">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNotifyType.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRouterAvailableToNetwork.h">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetObjectType.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRouterBusyToNetwork.h">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPolarity.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRoutingTableEntry.h">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetProgramError.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNPDU.h">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetProgramRequest.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkLayerVendorProprietaryMessage.h">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetProgramState.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWhatIsNetworkNumber.h">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPropertyIdentifier.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetInitializeRoutingTableAck.h">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetProtocolLevel.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWhoIsRouterToNetwork.h">
+      <Filter>CASBACnetStack\NPDU</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRejectReason.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBVLCResult.h">
+      <Filter>CASBACnetStack\BVLL</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRelationship.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBVLLBase.h">
+      <Filter>CASBACnetStack\BVLL</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReliability.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDeleteForeignDeviceTableEntry.h">
+      <Filter>CASBACnetStack\BVLL</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRestartReason.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDistributeBroadcastToNetwork.h">
+      <Filter>CASBACnetStack\BVLL</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSecurityLevel.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetOriginalBroadcastNPDU.h">
+      <Filter>CASBACnetStack\BVLL</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSecurityPolicy.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetOriginalUnicastNPDU.h">
+      <Filter>CASBACnetStack\BVLL</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSegmentation.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadBroadcastDistributionTable.h">
+      <Filter>CASBACnetStack\BVLL</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetShedState.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadBroadcastDistributionTableAck.h">
+      <Filter>CASBACnetStack\BVLL</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSilencedState.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadForeignDeviceTable.h">
+      <Filter>CASBACnetStack\BVLL</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetTimeRangeSpecifier.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRegisterForeignDevice.h">
+      <Filter>CASBACnetStack\BVLL</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetTimerState.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBVLLBDTEntry.h">
+      <Filter>CASBACnetStack\BVLL</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetTimerTransition.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBVLLFDTEntry.h">
+      <Filter>CASBACnetStack\BVLL</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedServiceChoice.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWriteBroadcastDistributionTable.h">
+      <Filter>CASBACnetStack\BVLL</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetVTClass.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBVLL.h">
+      <Filter>CASBACnetStack\BVLL</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWriteStatus.h">
-      <Filter>CASBACnetStack\Enumerated</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetForwardedNPDU.h">
+      <Filter>CASBACnetStack\BVLL</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackMemoryBuffer.h">
-      <Filter>CASBACnetStack\Helper</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetReadForeignDeviceTableAck.h">
+      <Filter>CASBACnetStack\BVLL</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackReadPropertyAsync.h">
-      <Filter>CASBACnetStack\Helper</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCPacket.h">
+      <Filter>CASBACnetStack\Packet</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackWritePropertyAsync.h">
-      <Filter>CASBACnetStack\Helper</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetMSTPPacket.h">
+      <Filter>CASBACnetStack\Packet</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\ICodable.h">
-      <Filter>CASBACnetStack\Interfaces</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetIPPacket.h">
+      <Filter>CASBACnetStack\Packet</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\IRenderable.h">
-      <Filter>CASBACnetStack\Interfaces</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPacket.h">
+      <Filter>CASBACnetStack\Packet</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackMessageGenerator.h">
-      <Filter>CASBACnetStack\MessageGenerators</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\ChipkinRenderer.h">
+      <Filter>CASBACnetStack\Renderer</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkLayer.h">
-      <Filter>CASBACnetStack\NetworkLayer</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\XMLRenderer.h">
+      <Filter>CASBACnetStack\Renderer</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetVirtualRouter.h">
-      <Filter>CASBACnetStack\NetworkLayer</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDBPropertyOptions.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetIAmRouterToNetwork.h">
-      <Filter>CASBACnetStack\NPDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackActiveCOVMultipleSubscriptions.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetICouldBeRouterToNetwork.h">
-      <Filter>CASBACnetStack\NPDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackAlarmAndEventObject.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetInitializeRoutingTable.h">
-      <Filter>CASBACnetStack\NPDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDatabase.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkLayerProtocolMessage.h">
-      <Filter>CASBACnetStack\NPDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDBDevice.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkNumberIs.h">
-      <Filter>CASBACnetStack\NPDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDBObject.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRejectMessageToNetwork.h">
-      <Filter>CASBACnetStack\NPDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDBProperty.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRouterAvailableToNetwork.h">
-      <Filter>CASBACnetStack\NPDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDBPropertyProfile.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRouterBusyToNetwork.h">
-      <Filter>CASBACnetStack\NPDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDBRouter.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRoutingTableEntry.h">
-      <Filter>CASBACnetStack\NPDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSourceAddress.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNPDU.h">
-      <Filter>CASBACnetStack\NPDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackActiveCOVSubscriptions.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkLayerVendorProprietaryMessage.h">
-      <Filter>CASBACnetStack\NPDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackCOVMultipleContext.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWhatIsNetworkNumber.h">
-      <Filter>CASBACnetStack\NPDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackCOVNotificationQueue.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetInitializeRoutingTableAck.h">
-      <Filter>CASBACnetStack\NPDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackCOVSubscription.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetWhoIsRouterToNetwork.h">
-      <Filter>CASBACnetStack\NPDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackInvokeIds.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCPacket.h">
-      <Filter>CASBACnetStack\Packet</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackNetworkKey.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetMSTPPacket.h">
-      <Filter>CASBACnetStack\Packet</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackNetworkPortBase.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetIPPacket.h">
-      <Filter>CASBACnetStack\Packet</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackNetworkPortIpv4.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPacket.h">
-      <Filter>CASBACnetStack\Packet</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackNotificationClass.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAbortPDU.h">
-      <Filter>CASBACnetStack\PDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackObjectSettings.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetComplexAckPDU.h">
-      <Filter>CASBACnetStack\PDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackCOVQueuedNotification.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetConfirmedRequestPDU.h">
-      <Filter>CASBACnetStack\PDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackSentConfirmedRequests.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetErrorPDU.h">
-      <Filter>CASBACnetStack\PDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackSettings.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetPDU.h">
-      <Filter>CASBACnetStack\PDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackStoredDBPropertyValues.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRejectPDU.h">
-      <Filter>CASBACnetStack\PDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackTrendLog.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSimpleAckPDU.h">
-      <Filter>CASBACnetStack\PDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackTrendLogBase.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedRequestPDU.h">
-      <Filter>CASBACnetStack\PDU</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackTrendLogMultiple.h">
+      <Filter>CASBACnetStack\Database</Filter>
     </ClInclude>
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAbortProcessor.h">
       <Filter>CASBACnetStack\Processors</Filter>
@@ -2426,81 +2360,144 @@
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetUnconfirmedRequestProcessor.h">
       <Filter>CASBACnetStack\Processors</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\ChipkinRenderer.h">
-      <Filter>CASBACnetStack\Renderer</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackMessageGenerator.h">
+      <Filter>CASBACnetStack\MessageGenerators</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\XMLRenderer.h">
-      <Filter>CASBACnetStack\Renderer</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackMemoryBuffer.h">
+      <Filter>CASBACnetStack\Helper</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBusinessLogic.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackReadPropertyAsync.h">
+      <Filter>CASBACnetStack\Helper</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetCallbackInterface.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackWritePropertyAsync.h">
+      <Filter>CASBACnetStack\Helper</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetInterface.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetAlarmAndEventAlgorithmResult.h">
+      <Filter>CASBACnetStack\AlarmsAndEvents</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkParameters.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackEventNotificationParameters.h">
+      <Filter>CASBACnetStack\AlarmsAndEvents</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetRouter.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetChangeOfStateEventAlgorithm.h">
+      <Filter>CASBACnetStack\AlarmsAndEvents\EventAlgorithms</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackCommon.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetEventAlgorithm.h">
+      <Filter>CASBACnetStack\AlarmsAndEvents\EventAlgorithms</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackConstants.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetOutOfRangeEventAlgorithm.h">
+      <Filter>CASBACnetStack\AlarmsAndEvents\EventAlgorithms</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackDatatypes.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetFaultAlgorithm.h">
+      <Filter>CASBACnetStack\AlarmsAndEvents\FaultAlgorithms</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackDebug.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetListedFaultAlgorithm.h">
+      <Filter>CASBACnetStack\AlarmsAndEvents\FaultAlgorithms</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetStackListItems.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetOutOfRangeFaultAlgorithm.h">
+      <Filter>CASBACnetStack\AlarmsAndEvents\FaultAlgorithms</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetTag.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetBBMD.h">
+      <Filter>CASBACnetStack\DataLink</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\CASBACnetStackOptions.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDataLink.h">
+      <Filter>CASBACnetStack\DataLink</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\CErrorContainer.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDataLinkIPv4.h">
+      <Filter>CASBACnetStack\DataLink</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\datatypes.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDataLinkLayer.h">
+      <Filter>CASBACnetStack\DataLink</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\endianness.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDataLinkMSTP.h">
+      <Filter>CASBACnetStack\DataLink</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\version.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetDataLinkSC.h">
+      <Filter>CASBACnetStack\DataLink</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSequenceOfPropertyValue.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetNetworkLayer.h">
+      <Filter>CASBACnetStack\NetworkLayer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetVirtualRouter.h">
+      <Filter>CASBACnetStack\NetworkLayer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCCommon.h">
+      <Filter>CASBACnetStack\BACnetSC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCConstants.h">
+      <Filter>CASBACnetStack\BACnetSC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCHubConnector.h">
+      <Filter>CASBACnetStack\BACnetSC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCWebsocket.h">
+      <Filter>CASBACnetStack\BACnetSC</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCAddressResolution.h">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCAddressResolutionACK.h">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCAdvertisement.h">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCAdvertisementSolicitation.h">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCBVLCResult.h">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCBVLL.h">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCConnectAccept.h">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCConnectRequest.h">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCDisconnectACK.h">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCDisconnectRequest.h">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCEncapsulatedNPDU.h">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCHeaderOption.h">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCHeartbeatACK.h">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCHeartbeatRequest.h">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSCProprietaryMessage.h">
+      <Filter>CASBACnetStack\BACnetSC\BACnetSCBVLL</Filter>
     </ClInclude>
     <ClInclude Include="..\submodules\cas-bacnet-stack\source\CIBuildSettings.h">
       <Filter>CASBACnetStack</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\licensee.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\ChipkinConvert.h">
+      <Filter>ChipkinCommon</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\MSTP.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\ChipkinEndianness.h">
+      <Filter>ChipkinCommon</Filter>
     </ClInclude>
-    <ClInclude Include="..\submodules\cas-bacnet-stack\source\stdafx.h">
-      <Filter>CASBACnetStack</Filter>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\ChipkinUtilities.h">
+      <Filter>ChipkinCommon</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\source\CASBACnetStackDLL.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\submodules\cas-bacnet-stack\adapters\cpp\CASBACnetStackAdapter.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\CHANGELOG.md" />
     <None Include="..\README.md" />
-    <None Include="..\submodules\cas-bacnet-stack\source\readme.md">
-      <Filter>CASBACnetStack</Filter>
-    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/README.md b/README.md
index defe439..a519220 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ A basic BACnet IP client example written in C++ using the [CAS BACnet Stack](htt
 
 ## Supported CAS BACnet Stack Version
 
-This example project uses version 4.1.5 of the CAS BACnet Stack
+This example project uses version 5.1.2 of the CAS BACnet Stack
 
 ## Releases
 
diff --git a/submodules/readme.md b/submodules/readme.md
new file mode 100644
index 0000000..f868ec7
--- /dev/null
+++ b/submodules/readme.md
@@ -0,0 +1,12 @@
+# CAS BACnet Stack
+
+Please contact Chipkin Automation Systems to purchase the CAS BACnet Stack
+
+More information about the CAS BACnet Stack can be found here: [CAS BACnet Stack](https://store.chipkin.com/services/stacks/bacnet-stack)
+
+# Pathing for the CAS BACnet Stack
+
+\submodules\cas-bacnet-stack
+
+## Path to adapters
+\submodules\cas-bacnet-stack\adapters
\ No newline at end of file

From 452d358a5640b7bd69e2c0fda75cdb4e39622b83 Mon Sep 17 00:00:00 2001
From: Alex Fontaine <afontaine@chipkin.com>
Date: Tue, 29 Oct 2024 16:17:05 -0700
Subject: [PATCH 2/4] Version bump to 1.0.0

---
 BACnetClientExample/BACnetClientExample.cpp | 2 +-
 CHANGELOG.md                                | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/BACnetClientExample/BACnetClientExample.cpp b/BACnetClientExample/BACnetClientExample.cpp
index 5fa2648..2b69846 100644
--- a/BACnetClientExample/BACnetClientExample.cpp
+++ b/BACnetClientExample/BACnetClientExample.cpp
@@ -61,7 +61,7 @@ uint8_t invokeId;
 
 // Constants
 // =======================================
-const std::string APPLICATION_VERSION = "0.0.9";  // See CHANGELOG.md for a full list of changes.
+const std::string APPLICATION_VERSION = "1.0.0";  // See CHANGELOG.md for a full list of changes.
 const uint32_t MAX_XML_RENDER_BUFFER_LENGTH = 1024 * 20;
 
 // Settings 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 197bed1..ba643b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## Version 1.0.x
+
+### 1.0.0 (2024-Oct-29)
+
+- Updated example to use with BACnetStack version 5.1.2.0
+
 ## Version 0.0.x
 
 ### 0.0.9 (2023-Oct-12)

From 9beb505ec27a47f8e415823d755e9d7fef4a3e00 Mon Sep 17 00:00:00 2001
From: Alex Fontaine <afontaine@chipkin.com>
Date: Thu, 31 Oct 2024 09:27:55 -0700
Subject: [PATCH 3/4] Added additional examples for TS, UTCTS, RD, and DCC

---
 BACnetClientExample/BACnetClientExample.cpp   | 94 +++++++++++++++++--
 .../CASBACnetStackExampleConstants.h          | 10 ++
 CHANGELOG.md                                  |  3 +
 3 files changed, 100 insertions(+), 7 deletions(-)

diff --git a/BACnetClientExample/BACnetClientExample.cpp b/BACnetClientExample/BACnetClientExample.cpp
index 2b69846..460aace 100644
--- a/BACnetClientExample/BACnetClientExample.cpp
+++ b/BACnetClientExample/BACnetClientExample.cpp
@@ -71,6 +71,7 @@ const uint32_t SETTING_CLIENT_DEVICE_INSTANCE = 389002;
 const uint16_t SETTING_DOWNSTREAM_DEVICE_PORT = SETTING_BACNET_IP_PORT;
 const uint32_t SETTING_DOWNSTREAM_DEVICE_INSTANCE = 389999; 
 const std::string SETTING_DEFAULT_DOWNSTREAM_DEVICE_IP_ADDRESS = "192.168.2.217";
+const std::string SETTING_DEFAULT_DEVICE_PASSWORD = "12345";
 
 // Downstream IP Initialization
 // =======================================
@@ -128,6 +129,9 @@ void ExampleWriteProperty();
 void ExampleSubscribeCOV();
 void ExampleSubscribeCOVProperty();
 void ExampleConfirmedTextMessage();
+void ExampleTimeSynchronizationMessage();
+void ExampleReinitializeDevice();
+void ExampleDeviceCommunicationControl(bool enable);
 
 int main(int argc, char ** argv )
 {
@@ -288,7 +292,7 @@ bool DoUserInput()
 			ExampleWriteProperty();
 			break; 
 		}
-		case 'c': {
+		case 's': {
 			ExampleSubscribeCOV();
 			break;
 		}
@@ -296,10 +300,27 @@ bool DoUserInput()
 			ExampleSubscribeCOVProperty();
 			break;
 		}
-		case 't': {
+		case 'm': {
 			ExampleConfirmedTextMessage();
 			break;
 		}
+		case 't': {
+			ExampleTimeSynchronizationMessage();
+			break;
+		}
+		case 'i': {
+			ExampleReinitializeDevice();
+			break;
+		}
+		case 'd': {
+			ExampleDeviceCommunicationControl(false);
+			break;
+		}
+		case 'e': {
+			ExampleDeviceCommunicationControl(true);
+			break;
+		}
+		case 'h':
 		default: {
 			// Print the Help
 			std::cout << std::endl << std::endl;
@@ -310,12 +331,18 @@ bool DoUserInput()
 			std::cout << "Example: BACnetClient 192.168.1.126" << std::endl << std::endl;
 
 			std::cout << "Help: " << std::endl;
-			std::cout << "- Q - Quit" << std::endl;
 			std::cout << "- W - Send WhoIs message" << std::endl;
-			std::cout << "- R - Send Read property messages" << std::endl;
-			std::cout << "- U - Send Write property messages" << std::endl;
-			std::cout << "- C - Send Subscribe COV Request" << std::endl;
-			std::cout << "- T - Send Confirmed Text Message Request" << std::endl;
+			std::cout << "- R - Send ReadProperty messages" << std::endl;
+			std::cout << "- U - Send WriteProperty messages" << std::endl;
+			std::cout << "- S - Send SubscribeCOV Request" << std::endl;
+			std::cout << "- P - Send SubscribeCOVProperty Request" << std::endl;
+			std::cout << "- M - Send ConfirmedTextMessage Request" << std::endl;
+			std::cout << "- T - Send TimeSynchronization Request" << std::endl;
+			std::cout << "- R - Send ReinitializedDevice Request" << std::endl;
+			std::cout << "- D - Send DeviceCommunicationControl Request to Disable" << std::endl;
+			std::cout << "- E - Send DeviceCommunicationControl Request to Enable" << std::endl;
+			std::cout << "- H - Display Help information" << std::endl;
+			std::cout << "- Q - Quit" << std::endl;
 			std::cout << std::endl;
 			break;
 		}
@@ -481,6 +508,59 @@ void ExampleConfirmedTextMessage() {
 	WaitForResponse();
 }
 
+void ExampleTimeSynchronizationMessage() {
+	// Time Synchronization Settings
+	uint8_t year = 2024 - 1900;
+	uint8_t month = 8;
+	uint8_t day = 15;
+	uint8_t weekday = 3;
+	uint8_t hour = 8;
+	uint8_t minute = 8;
+	uint8_t seconds = 8;
+	uint8_t hundrethSeconds = 0;
+
+	// Send TimeSynchronization request
+	// C++ server example configured to handle
+	std::cout << "Sending TimeSynchronization Message";
+	fpSendTimeSynchronization(year, month, day, weekday, hour, minute, seconds, hundrethSeconds, downstreamConnectionString, 6, 0, false, 0, NULL, 0);
+
+	WaitForResponse();	
+	// Note: TimeSynchronization is an unconfirmed request, which means the downstream device will not response.
+	// The WaitForResponse is called here just to wait for some cycles before continuing.
+
+	// Send UtcTimeSynchronization request
+	// C++ server example configured to handle
+	std::cout << "Sending UTCTimeSynchronization Message";
+	fpSendUTCTimeSynchronization(year, month, day, weekday, hour, minute, seconds, hundrethSeconds, downstreamConnectionString, 6, 0, false, 0, NULL, 0);
+
+	WaitForResponse();
+}
+
+void ExampleReinitializeDevice() {
+	// ReinitializeDevice Settings
+	uint8_t reinitializedState = CASBACnetStackExampleConstants::REINITIALIZED_STATE_ACTIVATE_CHANGES;
+
+	// Send ReinitializeDevice request
+	// C++ server example configured to handle
+	std::cout << "Sending ReinitializeDevice Message to activate changes";
+	fpSendReinitializeDevice(&invokeId, reinitializedState, SETTING_DEFAULT_DEVICE_PASSWORD.c_str(), SETTING_DEFAULT_DEVICE_PASSWORD.length(), downstreamConnectionString, 6, 0, 0, NULL, 0);
+}
+
+void ExampleDeviceCommunicationControl(bool enable) {
+	if (enable) {
+		// Send DeviceCommunicationControl request
+		// C++ server example configured to handle
+		std::cout << "Sending DeviceCommunicationControl Message to enable BACnet communication";
+		fpSendDeviceCommunicationControl(&invokeId, CASBACnetStackExampleConstants::ENABLEDISABLE_ENABLE, false, 0, SETTING_DEFAULT_DEVICE_PASSWORD.c_str(), SETTING_DEFAULT_DEVICE_PASSWORD.length(), downstreamConnectionString, 6, 0, 0, NULL, 0);
+	}
+	else {
+		// Send DeviceCommunicationControl request
+		// C++ server example configured to handle
+		std::cout << "Sending DeviceCommunicationControl Message to disable BACnet communication";
+		fpSendDeviceCommunicationControl(&invokeId, CASBACnetStackExampleConstants::ENABLEDISABLE_DISABLE, false, 0, SETTING_DEFAULT_DEVICE_PASSWORD.c_str(), SETTING_DEFAULT_DEVICE_PASSWORD.length(), downstreamConnectionString, 6, 0, 0, NULL, 0);
+	}
+}
+
 
 // ================================================================================================
 // Callbacks 
diff --git a/BACnetClientExample/CASBACnetStackExampleConstants.h b/BACnetClientExample/CASBACnetStackExampleConstants.h
index f71d342..070d177 100644
--- a/BACnetClientExample/CASBACnetStackExampleConstants.h
+++ b/BACnetClientExample/CASBACnetStackExampleConstants.h
@@ -166,6 +166,16 @@ class CASBACnetStackExampleConstants {
 	static const uint32_t DATA_TYPE_DATE = 10;
 	static const uint32_t DATA_TYPE_TIME = 11;
 	static const uint32_t DATA_TYPE_BACNET_OBJECT_IDENTIFIER = 12;
+
+	// Reinitialzed States (Used for ReinitializeDevice)
+	static const uint8_t REINITIALIZED_STATE_COLDSTART = 0;
+	static const uint8_t REINITIALIZED_STATE_WARMSTART = 1;
+	static const uint8_t REINITIALIZED_STATE_ACTIVATE_CHANGES = 7;
+
+	// Enable/Disable Enumerations  (Used for DeviceCommunicationControl)
+	static const uint8_t ENABLEDISABLE_ENABLE = 0;
+	static const uint8_t ENABLEDISABLE_DISABLE = 1;
+	static const uint8_t ENABLEDISABLE_DISABLE_INITIATION = 2;
 };
 
 #endif // __CASBACnetStackExampleConstants_h__
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba643b7..836df89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@
 ### 1.0.0 (2024-Oct-29)
 
 - Updated example to use with BACnetStack version 5.1.2.0
+- Added TimeSynchronization example
+- Added ReinitializeDevice example
+- Added DeviceCommunicationControl example
 
 ## Version 0.0.x
 

From 9fa039d2ba334e74edd7575251b0a5169851dcb7 Mon Sep 17 00:00:00 2001
From: Alex Fontaine <afontaine@chipkin.com>
Date: Thu, 31 Oct 2024 10:14:15 -0700
Subject: [PATCH 4/4] Updated readme and fixed the linux makefile

---
 README.md | 33 ++++++++++++++++++++++-----------
 makefile  | 15 +++++++--------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index a519220..efbe7db 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # BACnet Client Example C++
 
 A basic BACnet IP client example written in C++ using the [CAS BACnet Stack](https://store.chipkin.com/services/stacks/bacnet-stack). This client example is meant to be used with the [BACnet IP server example](https://github.com/chipkin/BACnetServerExampleCPP). Supports WhoIs, Read property, and Write property services.
+This example shows how to use some of the BACnet client functionality of the CAS BACnet Stack and can be used to test communications with the BACnetServerExampleCPP.
 
 ## Supported CAS BACnet Stack Version
 
@@ -14,21 +15,29 @@ Build versions of this example can be downloaded from the releases page:
 
 ## Installation
 
-Download the latest release zip file on the releases page.
+Download the latest release executable on the releases page.
 
 ## Usage
 
+The target device for testing with this Client example application is the [BACnetServerExampleCPP](https://github.com/chipkin/BACnetServerExampleCPP)
+
 ```txt
 Usage: BACnetClient {IPAddress}
 Example: BACnetClient 192.168.1.126
 
 Help:
-- Q - Quit
 - W - Send WhoIs message
-- R - Send Read property messages
-- U - Send Write property messages
-- C - Send Subscribe COV Request
-- T - Send Confirmed Text Message Request
+- R - Send ReadProperty messages
+- U - Send WriteProperty messages
+- S - Send SubscribeCOV Request
+- P - Send SubscribeCOVProperty Request
+- M - Send ConfirmedTextMessage Request
+- T - Send TimeSynchronization Request
+- R - Send ReinitializedDevice Request
+- D - Send DeviceCommunicationControl Request to Disable
+- E - Send DeviceCommunicationControl Request to Enable
+- H - Display Help information
+- Q - Quit
 ```
 Client expects a device with the following objects:
 
@@ -55,17 +64,19 @@ Client expects a device with the following objects:
 
 ## Build
 
-A [Visual studio 2019](https://visualstudio.microsoft.com/downloads/) project is included with this project. This project also auto built using [Gitlab CI](https://docs.gitlab.com/ee/ci/) on every commit.
+A [Visual studio 2022](https://visualstudio.microsoft.com/downloads/) project is included with this project. 
+
+The CAS BACnet Stack submodule is required for compilation. Please contact Chipkin Automation Systems to purchase the CAS BACnet Stack.
 
-The CAS BACnet Stack submodule is required for compilation.
+More information about the CAS BACnet Stack can be found here: [CAS BACnet Stack](https://store.chipkin.com/services/stacks/bacnet-stack)
 
 ## Example Output
 ```txt
-CAS BACnet Stack Server Example v0.0.2.0
-https://github.com/chipkin/BACnetServerExampleCPP
+CAS BACnet Stack Client Example v1.0.0.0
+https://github.com/chipkin/BACnetClientExampleCPP
 
 FYI: Loading CAS BACnet Stack functions... OK
-FYI: CAS BACnet Stack version: 3.16.0.0
+FYI: CAS BACnet Stack version: 5.1.2.0
 FYI: Connecting UDP Resource to port=[47808]... OK, Connected to port
 FYI: Registering the callback Functions with the CAS BACnet Stack
 Setting up client device. device.instance=[389002]
diff --git a/makefile b/makefile
index 5972382..b947dc0 100644
--- a/makefile
+++ b/makefile
@@ -6,18 +6,17 @@ NAME := BACnetClientExampleCPP_linux_x64_Release
 # -m32 for 32bit, -m64 for 64bit
 # -Wall turns on most, but not all, compiler warnings
 #
-CFLAGS := -m64 -Wall
+CFLAGS := -m64 -Wall -std=c++11
 
-DEBUGFLAGS = -O0 -g3 -DCAS_BACNET_STACK_LIB_TYPE_LIB
-RELEASEFLAGS = -O3 -DCAS_BACNET_STACK_LIB_TYPE_LIB
+DEBUGFLAGS = -O0 -g3
+RELEASEFLAGS = -O3
 OBJECTFLAGS = -c -fmessage-length=0 -fPIC -MMD -MP
 LDFLAGS = -static
 
-SOURCES = $(wildcard BACnetClientExample/*.cpp) $(wildcard submodules/cas-bacnet-stack/adapters/cpp/*.cpp)  $(wildcard submodules/cas-bacnet-stack/submodules/cas-common/source/*.cpp) 
+SOURCES = $(wildcard BACnetClientExample/*.cpp) $(wildcard submodules/cas-bacnet-stack/adapters/cpp/*.cpp) $(wildcard submodules/cas-bacnet-stack/source/*.cpp) 
 OBJECTS = $(addprefix obj/,$(notdir $(SOURCES:.cpp=.o)))
-INCLUDES = -IBACnetClientExample -Isubmodules/cas-bacnet-stack/adapters/cpp -Isubmodules/cas-bacnet-stack/source -Isubmodules/cas-bacnet-stack/submodules/cas-common/source
-LIBPATH = -Lbin 
-LIB = -ldl -lCASBACnetStack_x64_Release 
+INCLUDES = -IBACnetClientExample -Isubmodules/cas-bacnet-stack/adapters/cpp -Isubmodules/cas-bacnet-stack/source -Isubmodules/cas-bacnet-stack/submodules/xml2json/include
+LIB = -ldl
 
 # Build Target
 TARGET = $(NAME)
@@ -46,7 +45,7 @@ obj/%.o: submodules/cas-bacnet-stack/adapters/cpp/%.cpp
 	@echo 'Finished building: $<'
 	@echo ' '
 
-obj/%.o: submodules/cas-bacnet-stack/submodules/cas-common/source/%.cpp
+obj/%.o: submodules/cas-bacnet-stack/source/%.cpp
 	@mkdir -p obj
 	@echo 'Building file: $<'
 	@echo 'Invoking: GCC C++ Compiler'