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

Bugfix/print property name units lighting (#313)

Browse Source 
* Fix EPICS property name proprietary range

* Fix Lighting Command decode length

* add function to determine property name and units proprietary range

* improve test coverage for AI, AO, AV, BI, BO, BV, LO

* refactor common property encoding to proplist module

* add decoder for priority array

Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2022-07-29 17:11:38 -05:00
committed by GitHub
parent 731e951106
commit a945588340
18 changed files with 622 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/bactext.c
+29 -7
View File
@@ -748,12 +748,24 @@ INDTEXT_DATA bacnet_property_names[] = {
{ 0, NULL }
};
bool bactext_property_name_proprietary(unsigned index)
{
bool status = false;
if ((index >= PROP_PROPRIETARY_RANGE_MIN) &&
(index <= PROP_PROPRIETARY_RANGE_MAX)) {
status = true;
}
return status;
}
const char *bactext_property_name(unsigned index)
{
/* Enumerated values 0-511 are reserved for definition by ASHRAE.
Enumerated values 512-4194303 may be used by others subject to the
procedures and constraints described in Clause 23. */
if ((index >= 512) && (index <= 4194303)) {
if (bactext_property_name_proprietary(index)) {
return Vendor_Proprietary_String;
} else {
return indtext_by_index_default(
@@ -1018,18 +1030,28 @@ INDTEXT_DATA bacnet_engineering_unit_names[] = {
the procedures and constraints described in Clause 23. */
};
bool bactext_engineering_unit_name_proprietary(unsigned index)
{
bool status = false;
if ((index >= UNITS_PROPRIETARY_RANGE_MIN) &&
(index <= UNITS_PROPRIETARY_RANGE_MAX)) {
status = true;
} else if ((index >= UNITS_PROPRIETARY_RANGE_MIN2) &&
(index <= UNITS_PROPRIETARY_RANGE_MAX2)) {
status = true;
}
return status;
}
const char *bactext_engineering_unit_name(unsigned index)
{
if (index <= UNITS_RESERVED_RANGE_MAX) {
return indtext_by_index_default(
bacnet_engineering_unit_names, index, ASHRAE_Reserved_String);
} else if (index <= UNITS_PROPRIETARY_RANGE_MAX) {
if (bactext_engineering_unit_name_proprietary(index)) {
return Vendor_Proprietary_String;
} else if (index <= UNITS_RESERVED_RANGE_MAX2) {
return indtext_by_index_default(
bacnet_engineering_unit_names, index, ASHRAE_Reserved_String);
} else if (index <= UNITS_PROPRIETARY_RANGE_MAX2) {
return Vendor_Proprietary_String;
}
return ASHRAE_Reserved_String;