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

Cleanup ugliness and fix build in bactext.c

Browse Source
This commit is contained in:
tbrennan3
2010-08-30 13:10:13 +00:00
parent c9fd7c9c19
commit a29bf3fecc
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/server/main.c
+3 -1
View File
@@ -185,4 +185,6 @@ int main(
} }
} }
/* @} *//* End group ServerDemo */ /* @} */
/* End group ServerDemo */
bacnet-stack/src/bactext.c
+3 -7
View File
@@ -792,7 +792,7 @@ INDTEXT_DATA bacnet_property_names[] = {
, ,
{PROP_ACCESS_EVENT_TIME, "access-event-time"} {PROP_ACCESS_EVENT_TIME, "access-event-time"}
, ,
{PROP_ACCESS_TRANSACTION_EVENTS, "access-transaction–events"} {PROP_ACCESS_TRANSACTION_EVENTS, "access-transaction-events"}
, ,
{PROP_ACCOMPANIMENT, "accompaniment"} {PROP_ACCOMPANIMENT, "accompaniment"}
, ,
@@ -877,7 +877,7 @@ INDTEXT_DATA bacnet_property_names[] = {
, ,
{PROP_OCCUPANCY_COUNT_ENABLE, "occupancy-count-enable"} {PROP_OCCUPANCY_COUNT_ENABLE, "occupancy-count-enable"}
, ,
{PROP_OCCUPANCY_COUNT_EXEMPTION, "occupancy-count-exemption"} {PROP_OCCUPANCY_EXEMPTION, "occupancy-exemption"}
, ,
{PROP_OCCUPANCY_LOWER_LIMIT, "occupancy-lower-limit"} {PROP_OCCUPANCY_LOWER_LIMIT, "occupancy-lower-limit"}
, ,
@@ -894,8 +894,6 @@ INDTEXT_DATA bacnet_property_names[] = {
, ,
{PROP_PASSBACK_MODE, "passback-mode"} {PROP_PASSBACK_MODE, "passback-mode"}
, ,
PROP_USER_INFORMATION_REFERENCE = 311,
{PROP_PASSBACK_TIMEOUT, "passback-timeout"} {PROP_PASSBACK_TIMEOUT, "passback-timeout"}
, ,
{PROP_POSITIVE_ACCESS_RULES, "positive-access-rules"} {PROP_POSITIVE_ACCESS_RULES, "positive-access-rules"}
@@ -937,8 +935,6 @@ INDTEXT_DATA bacnet_property_names[] = {
, ,
{PROP_USES_REMAINING, "uses-remaining"} {PROP_USES_REMAINING, "uses-remaining"}
, ,
{PROP_VENDOR_FORMAT_IDENTIFIER, "vendor-format-identifier"}
,
{PROP_ZONE_FROM, "zone-from"} {PROP_ZONE_FROM, "zone-from"}
, ,
{PROP_ZONE_TO, "zone-to"} {PROP_ZONE_TO, "zone-to"}
@@ -948,7 +944,7 @@ INDTEXT_DATA bacnet_property_names[] = {
{PROP_BINARY_INACTIVE_VALUE, "binary-inactive-value"} {PROP_BINARY_INACTIVE_VALUE, "binary-inactive-value"}
, ,
/* enumeration 326 is used in Addendum j to ANSI/ASHRAE 135-2004 */ /* enumeration 326 is used in Addendum j to ANSI/ASHRAE 135-2004 */
{PROP_VERIFICATION-TIME, "verification-time"} {PROP_VERIFICATION_TIME, "verification-time"}
, ,
{PROP_BIT_MASK, "bit-mask"} {PROP_BIT_MASK, "bit-mask"}
, ,