Skip to content

Commit b028110

Browse files
ssmethurstssmethurst
authored
Merge pull request #10 from chipkin/issue/35-37
Updated Windows SDK version, preprocessor macro, and project files for CASBACnetStack.
2 parents 4077d80 + 852b231 commit b028110

4 files changed

Lines changed: 48 additions & 9 deletions

File tree

‎BACnetClientExample/BACnetClientExample.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ uint8_t invokeId;
6161

6262
// Constants
6363
// =======================================
64-
const std::string APPLICATION_VERSION = "0.0.7"; // See CHANGELOG.md for a full list of changes.
64+
const std::string APPLICATION_VERSION = "0.0.8"; // See CHANGELOG.md for a full list of changes.
6565
const uint32_t MAX_XML_RENDER_BUFFER_LENGTH = 1024 * 20;
6666

6767
// Settings

‎BACnetClientExample/BACnetClientExample.vcxproj‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,26 @@
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3030
<ConfigurationType>Application</ConfigurationType>
3131
<UseDebugLibraries>true</UseDebugLibraries>
32-
<PlatformToolset>v142</PlatformToolset>
32+
<PlatformToolset>v143</PlatformToolset>
3333
<CharacterSet>Unicode</CharacterSet>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3636
<ConfigurationType>Application</ConfigurationType>
3737
<UseDebugLibraries>false</UseDebugLibraries>
38-
<PlatformToolset>v142</PlatformToolset>
38+
<PlatformToolset>v143</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
4040
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>Application</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v142</PlatformToolset>
45+
<PlatformToolset>v143</PlatformToolset>
4646
<CharacterSet>Unicode</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>Application</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
51-
<PlatformToolset>v142</PlatformToolset>
51+
<PlatformToolset>v143</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
5353
<CharacterSet>Unicode</CharacterSet>
5454
</PropertyGroup>
@@ -96,7 +96,7 @@
9696
</PrecompiledHeader>
9797
<WarningLevel>Level3</WarningLevel>
9898
<SDLCheck>true</SDLCheck>
99-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_DEBUG</PreprocessorDefinitions>
99+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_DEBUG;ENABLE_DATA_LINK_LAYER_IPV4</PreprocessorDefinitions>
100100
<ConformanceMode>true</ConformanceMode>
101101
<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>
102102
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -114,7 +114,7 @@
114114
</PrecompiledHeader>
115115
<WarningLevel>Level3</WarningLevel>
116116
<SDLCheck>true</SDLCheck>
117-
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_DEBUG</PreprocessorDefinitions>
117+
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_DEBUG;ENABLE_DATA_LINK_LAYER_IPV4</PreprocessorDefinitions>
118118
<ConformanceMode>true</ConformanceMode>
119119
<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>
120120
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -134,7 +134,7 @@
134134
<FunctionLevelLinking>true</FunctionLevelLinking>
135135
<IntrinsicFunctions>true</IntrinsicFunctions>
136136
<SDLCheck>true</SDLCheck>
137-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;CAS_BACNET_STACK_LIB_TYPE_LIB</PreprocessorDefinitions>
137+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;CAS_BACNET_STACK_LIB_TYPE_LIB;ENABLE_DATA_LINK_LAYER_IPV4</PreprocessorDefinitions>
138138
<ConformanceMode>true</ConformanceMode>
139139
<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>
140140
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -156,7 +156,7 @@
156156
<FunctionLevelLinking>true</FunctionLevelLinking>
157157
<IntrinsicFunctions>true</IntrinsicFunctions>
158158
<SDLCheck>true</SDLCheck>
159-
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;CAS_BACNET_STACK_LIB_TYPE_LIB</PreprocessorDefinitions>
159+
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;CAS_BACNET_STACK_LIB_TYPE_LIB;ENABLE_DATA_LINK_LAYER_IPV4</PreprocessorDefinitions>
160160
<ConformanceMode>true</ConformanceMode>
161161
<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>
162162
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -469,6 +469,7 @@
469469
<ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSecurityPolicy.cpp" />
470470
<ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSegmentation.cpp" />
471471
<ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSequenceOf.cpp" />
472+
<ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSequenceOfPropertyValue.cpp" />
472473
<ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetShedState.cpp" />
473474
<ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSilencedState.cpp" />
474475
<ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSimpleAckPDU.cpp" />
@@ -551,6 +552,7 @@
551552
<ClCompile Include="..\submodules\cas-bacnet-stack\source\CASBACnetStackDLL.cpp" />
552553
<ClCompile Include="..\submodules\cas-bacnet-stack\source\CErrorContainer.cpp" />
553554
<ClCompile Include="..\submodules\cas-bacnet-stack\source\IRenderable.cpp" />
555+
<ClCompile Include="..\submodules\cas-bacnet-stack\source\MSTP.c" />
554556
<ClCompile Include="..\submodules\cas-bacnet-stack\source\XMLRenderer.cpp" />
555557
<ClCompile Include="..\submodules\cas-bacnet-stack\submodules\cas-common\source\ChipkinConvert.cpp" />
556558
<ClCompile Include="..\submodules\cas-bacnet-stack\submodules\cas-common\source\ChipkinEndianness.cpp" />
@@ -864,6 +866,7 @@
864866
<ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSecurityPolicy.h" />
865867
<ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSegmentation.h" />
866868
<ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSequenceOf.h" />
869+
<ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSequenceOfPropertyValue.h" />
867870
<ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetServicesSupported.h" />
868871
<ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetShedState.h" />
869872
<ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSilencedState.h" />
@@ -952,10 +955,14 @@
952955
<ClInclude Include="..\submodules\cas-bacnet-stack\source\CASBACnetStackOptions.h" />
953956
<ClInclude Include="..\submodules\cas-bacnet-stack\source\CErrorContainer.h" />
954957
<ClInclude Include="..\submodules\cas-bacnet-stack\source\ChipkinRenderer.h" />
958+
<ClInclude Include="..\submodules\cas-bacnet-stack\source\CIBuildSettings.h" />
955959
<ClInclude Include="..\submodules\cas-bacnet-stack\source\datatypes.h" />
956960
<ClInclude Include="..\submodules\cas-bacnet-stack\source\endianness.h" />
957961
<ClInclude Include="..\submodules\cas-bacnet-stack\source\ICodable.h" />
958962
<ClInclude Include="..\submodules\cas-bacnet-stack\source\IRenderable.h" />
963+
<ClInclude Include="..\submodules\cas-bacnet-stack\source\licensee.h" />
964+
<ClInclude Include="..\submodules\cas-bacnet-stack\source\MSTP.h" />
965+
<ClInclude Include="..\submodules\cas-bacnet-stack\source\stdafx.h" />
959966
<ClInclude Include="..\submodules\cas-bacnet-stack\source\version.h" />
960967
<ClInclude Include="..\submodules\cas-bacnet-stack\source\XMLRenderer.h" />
961968
<ClInclude Include="..\submodules\cas-bacnet-stack\submodules\cas-common\source\ChipkinConvert.h" />
@@ -968,6 +975,7 @@
968975
<ItemGroup>
969976
<None Include="..\CHANGELOG.md" />
970977
<None Include="..\README.md" />
978+
<None Include="..\submodules\cas-bacnet-stack\source\readme.md" />
971979
</ItemGroup>
972980
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
973981
<ImportGroup Label="ExtensionTargets">

‎BACnetClientExample/BACnetClientExample.vcxproj.filters‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,6 +1257,12 @@
12571257
<ClCompile Include="..\submodules\cas-bacnet-stack\source\CErrorContainer.cpp">
12581258
<Filter>CASBACnetStack</Filter>
12591259
</ClCompile>
1260+
<ClCompile Include="..\submodules\cas-bacnet-stack\source\BACnetSequenceOfPropertyValue.cpp">
1261+
<Filter>CASBACnetStack</Filter>
1262+
</ClCompile>
1263+
<ClCompile Include="..\submodules\cas-bacnet-stack\source\MSTP.c">
1264+
<Filter>CASBACnetStack</Filter>
1265+
</ClCompile>
12601266
</ItemGroup>
12611267
<ItemGroup>
12621268
<ClInclude Include="SimpleUDP.h">
@@ -2474,9 +2480,27 @@
24742480
<ClInclude Include="..\submodules\cas-bacnet-stack\source\version.h">
24752481
<Filter>CASBACnetStack</Filter>
24762482
</ClInclude>
2483+
<ClInclude Include="..\submodules\cas-bacnet-stack\source\BACnetSequenceOfPropertyValue.h">
2484+
<Filter>CASBACnetStack</Filter>
2485+
</ClInclude>
2486+
<ClInclude Include="..\submodules\cas-bacnet-stack\source\CIBuildSettings.h">
2487+
<Filter>CASBACnetStack</Filter>
2488+
</ClInclude>
2489+
<ClInclude Include="..\submodules\cas-bacnet-stack\source\licensee.h">
2490+
<Filter>CASBACnetStack</Filter>
2491+
</ClInclude>
2492+
<ClInclude Include="..\submodules\cas-bacnet-stack\source\MSTP.h">
2493+
<Filter>CASBACnetStack</Filter>
2494+
</ClInclude>
2495+
<ClInclude Include="..\submodules\cas-bacnet-stack\source\stdafx.h">
2496+
<Filter>CASBACnetStack</Filter>
2497+
</ClInclude>
24772498
</ItemGroup>
24782499
<ItemGroup>
24792500
<None Include="..\CHANGELOG.md" />
24802501
<None Include="..\README.md" />
2502+
<None Include="..\submodules\cas-bacnet-stack\source\readme.md">
2503+
<Filter>CASBACnetStack</Filter>
2504+
</None>
24812505
</ItemGroup>
24822506
</Project>

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
## Version 0.0.x
44

5+
### 0.0.8 (2023-Sep-29)
6+
7+
- Updated preprocessor macro to include ENABLE_DATA_LINK_LAYER_IPV4
8+
- Updated Windows SDK version [Issues/35](https://github.com/chipkin/BACnetServerExampleCPP/issues/35)
9+
- Updated the project files for the CASBACnetStack to the latest version [Issues/37](https://github.com/chipkin/BACnetServerExampleCPP/issues/37)
10+
- Tested using BACnetStack version 4.1.19.0
11+
512
### 0.0.7 (2022-Aug-11)
613

714
- Updated to CAS BACnet Stack version 4.1.5

0 commit comments

Comments
 (0)