Skip to content

Commit 4077d80

Browse files
authored
Merge pull request #9 from chipkin/update_stack_to_v4
Updating CASBACnet to v4.1.5
2 parents d2fdcd2 + aa93dd7 commit 4077d80

7 files changed

Lines changed: 1812 additions & 1096 deletions

File tree

BACnetClientExample/BACnetClientExample.cpp

Lines changed: 3 additions & 3 deletions
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.6"; // See CHANGELOG.md for a full list of changes.
64+
const std::string APPLICATION_VERSION = "0.0.7"; // See CHANGELOG.md for a full list of changes.
6565
const uint32_t MAX_XML_RENDER_BUFFER_LENGTH = 1024 * 20;
6666

6767
// Settings
@@ -509,7 +509,7 @@ uint16_t CallbackReceiveMessage(uint8_t* message, const uint16_t maxMessageLengt
509509

510510
// Process the message as XML
511511
static char xmlRenderBuffer[MAX_XML_RENDER_BUFFER_LENGTH];
512-
if (fpDecodeAsXML((char*)message, bytesRead, xmlRenderBuffer, MAX_XML_RENDER_BUFFER_LENGTH) > 0) {
512+
if (fpDecodeAsXML((char*)message, bytesRead, xmlRenderBuffer, MAX_XML_RENDER_BUFFER_LENGTH, CASBACnetStackExampleConstants::NETWORK_TYPE_IP) > 0) {
513513
std::cout << xmlRenderBuffer << std::endl << std::endl;
514514
memset(xmlRenderBuffer, 0, MAX_XML_RENDER_BUFFER_LENGTH);
515515

@@ -568,7 +568,7 @@ uint16_t CallbackSendMessage(const uint8_t* message, const uint16_t messageLengt
568568

569569
// Get the XML rendered version of the just sent message
570570
static char xmlRenderBuffer[MAX_XML_RENDER_BUFFER_LENGTH];
571-
if (fpDecodeAsXML((char*)message, messageLength, xmlRenderBuffer, MAX_XML_RENDER_BUFFER_LENGTH) > 0) {
571+
if (fpDecodeAsXML((char*)message, messageLength, xmlRenderBuffer, MAX_XML_RENDER_BUFFER_LENGTH, networkType) > 0) {
572572
std::cout << xmlRenderBuffer << std::endl << std::endl;
573573
memset(xmlRenderBuffer, 0, MAX_XML_RENDER_BUFFER_LENGTH);
574574
}

BACnetClientExample/BACnetClientExample.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29806.167
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.1.32319.34
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BACnetClientExample", "BACnetClientExample.vcxproj", "{A355BC21-CFE4-4AB9-A5C6-1286CCFC0ECB}"
77
EndProject

BACnetClientExample/BACnetClientExample.vcxproj

Lines changed: 173 additions & 0 deletions
Large diffs are not rendered by default.

BACnetClientExample/BACnetClientExample.vcxproj.filters

Lines changed: 1625 additions & 1090 deletions
Large diffs are not rendered by default.

CHANGELOG.md

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

33
## Version 0.0.x
44

5+
### 0.0.7 (2022-Aug-11)
6+
7+
- Updated to CAS BACnet Stack version 4.1.5
8+
59
### 0.0.6 (2021-Jul-15)
610

711
- Added confirmed text message request example service

README.md

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

33
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.
44

5+
## Supported CAS BACnet Stack Version
6+
7+
This example project uses version 4.1.5 of the CAS BACnet Stack
8+
59
## Releases
610

711
Build versions of this example can be downloaded from the releases page:

submodules/cas-bacnet-stack

Submodule cas-bacnet-stack updated from 2f5373d to a4f5f2d

0 commit comments

Comments
 (0)