dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature/add basic structured view object (#641)

Browse Source 
* Added basic structured view object and unit test. Added example structured view into server example.

* Removed creation of objects from basic device object into the server example
This commit is contained in:
Steve Karg
2024-05-14 14:51:45 -05:00
committed by GitHub
parent c21c99fef3
commit affb358139
19 changed files with 1337 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/bacenum.h
+61 -12
View File
@@ -2048,9 +2048,58 @@ typedef enum BACnetNodeType {
BACNET_NODE_COLLECTION = 8,
BACNET_NODE_PROPERTY = 9,
BACNET_NODE_FUNCTIONAL = 10,
BACNET_NODE_OTHER = 11
BACNET_NODE_OTHER = 11,
BACNET_NODE_SUBSYSTEM = 12,
BACNET_NODE_BUILDING = 13,
BACNET_NODE_FLOOR = 14,
BACNET_NODE_SECTION = 15,
BACNET_NODE_MODULE = 16,
BACNET_NODE_TREE = 17,
BACNET_NODE_MEMBER = 18,
BACNET_NODE_PROTOCOL = 19,
BACNET_NODE_ROOM = 20,
BACNET_NODE_ZONE = 21
} BACNET_NODE_TYPE;
typedef enum BACnetRelationship {
BACNET_RELATIONSHIP_UNKNOWN = 0,
BACNET_RELATIONSHIP_DEFAULT = 1,
BACNET_RELATIONSHIP_CONTAINS = 2,
BACNET_RELATIONSHIP_CONTAINED_BY = 3,
BACNET_RELATIONSHIP_USES = 4,
BACNET_RELATIONSHIP_USED_BY = 5,
BACNET_RELATIONSHIP_COMMANDS = 6,
BACNET_RELATIONSHIP_COMMANDED_BY = 7,
BACNET_RELATIONSHIP_ADJUSTS = 8,
BACNET_RELATIONSHIP_ADJUSTED_BY = 9,
BACNET_RELATIONSHIP_INGRESS = 10,
BACNET_RELATIONSHIP_EGRESS = 11,
BACNET_RELATIONSHIP_SUPPLIES_AIR = 12,
BACNET_RELATIONSHIP_RECEIVES_AIR = 13,
BACNET_RELATIONSHIP_SUPPLIES_HOT_AIR = 14,
BACNET_RELATIONSHIP_RECEIVES_HOT_AIR = 15,
BACNET_RELATIONSHIP_SUPPLIES_COOL_AIR = 16,
BACNET_RELATIONSHIP_RECEIVES_COOL_AIR = 17,
BACNET_RELATIONSHIP_SUPPLIES_POWER = 18,
BACNET_RELATIONSHIP_RECEIVES_POWER = 19,
BACNET_RELATIONSHIP_SUPPLIES_GAS = 20,
BACNET_RELATIONSHIP_RECEIVES_GAS = 21,
BACNET_RELATIONSHIP_SUPPLIES_WATER = 22,
BACNET_RELATIONSHIP_RECEIVES_WATER = 23,
BACNET_RELATIONSHIP_SUPPLIES_HOT_WATER = 24,
BACNET_RELATIONSHIP_RECEIVES_HOT_WATER = 25,
BACNET_RELATIONSHIP_SUPPLIES_COOL_WATER = 26,
BACNET_RELATIONSHIP_RECEIVES_COOL_WATER = 27,
BACNET_RELATIONSHIP_SUPPLIES_STEAM = 28,
BACNET_RELATIONSHIP_RECEIVES_STEAM = 29,
BACNET_RELATIONSHIP_RESERVED_MAX = 1023,
BACNET_RELATIONSHIP_PROPRIETARY_MIN = 1024,
BACNET_RELATIONSHIP_PROPRIETARY_MAX = 65535
/* Enumerated values 0-1023 are reserved for definition by ASHRAE.
Enumerated values 1024-65535 may be used by others subject
to the procedures and constraints described in Clause 23. */
} BACNET_RELATIONSHIP;
typedef enum BACnetShedState {
BACNET_SHED_INACTIVE = 0,
BACNET_SHED_REQUEST_PENDING = 1,
@@ -2107,8 +2156,8 @@ typedef enum BACnetBinaryLightingPV {
BINARY_LIGHTING_PV_WARN_RELINQUISH = 4,
BINARY_LIGHTING_PV_STOP = 5,
BINARY_LIGHTING_PV_MAX = 6,
/* -- Enumerated values 0-63 are reserved for definition by ASHRAE.
-- Enumerated values 64-255 may be used by others
/* -- Enumerated values 0-63 are reserved for definition by ASHRAE.
-- Enumerated values 64-255 may be used by others
-- subject to the procedures and constraints described in Clause 23. */
BINARY_LIGHTING_PV_PROPRIETARY_MIN = 64,
BINARY_LIGHTING_PV_PROPRIETARY_MAX = 255
@@ -2315,8 +2364,8 @@ typedef enum BACnetAccessZoneOccupancyState {
ACCESS_ZONE_OCCUPANCY_STATE_ABOVE_UPPER_LIMIT = 4,
ACCESS_ZONE_OCCUPANCY_STATE_DISABLED = 5,
ACCESS_ZONE_OCCUPANCY_STATE_NOT_SUPPORTED = 6,
/* Enumerated values 0-63 are reserved for definition by ASHRAE.
Enumerated values 64-65535 may be used by others subject
/* Enumerated values 0-63 are reserved for definition by ASHRAE.
Enumerated values 64-65535 may be used by others subject
to the procedures and constraints described in Clause 23. */
ACCESS_ZONE_OCCUPANCY_STATE_PROPRIETARY_MIN = 64,
ACCESS_ZONE_OCCUPANCY_STATE_PROPRIETARY_MAX = 65535
@@ -2624,18 +2673,18 @@ typedef enum BACnetEscalatorFault {
ESCALATOR_FAULT_PROPRIETARY_MAX = 65535
} BACNET_ESCALATOR_FAULT;
typedef enum BACnetEscalatorMode {
typedef enum BACnetEscalatorMode {
ESCALATOR_MODE_UNKNOWN = 0,
ESCALATOR_MODE_STOP = 1,
ESCALATOR_MODE_UP = 2,
ESCALATOR_MODE_STOP = 1,
ESCALATOR_MODE_UP = 2,
ESCALATOR_MODE_DOWN = 3,
ESCALATOR_MODE_INSPECTION = 4,
ESCALATOR_MODE_INSPECTION = 4,
ESCALATOR_MODE_OUT_OF_SERVICE = 5,
/* Enumerated values 0-1023 are reserved for definition by ASHRAE.
Enumerated values 1024-65535 may be used by others subject to
the procedures and constraints described in Clause 23. */
ESCALATOR_MODE_PROPRIETARY_MIN = 1024,
ESCALATOR_MODE_PROPRIETARY_MAX = 65535
ESCALATOR_MODE_PROPRIETARY_MAX = 65535
} BACNET_ESCALATOR_MODE;
typedef enum BACnetEscalatorOperationDirection {
@@ -2779,8 +2828,8 @@ typedef enum BACnetAuditOperation {
/* Enumerated values 0-31 are reserved for definition by ASHRAE.
Enumerated values 32-63 may be used by others subject to
the procedures and constraints described in Clause 23.
The enumerated values match the bit positions in
The enumerated values match the bit positions in
BACnetAuditOperationFlags. */
AUDIT_OPERATION_PROPRIETARY_MIN = 32,
AUDIT_OPERATION_PROPRIETARY_MAX = 63